From 2360ed4abee78189c1b986f1f51814673489ae46 Mon Sep 17 00:00:00 2001 From: Ken Stevens Date: Thu, 21 May 2020 19:22:08 -0400 Subject: [PATCH] fix build (#1861) --- ...1853-make-interceptor-annotation-inheritable.yaml | 2 +- .../ca/uhn/hapi/fhir/docs/server_jpa/diff.md | 12 ++++++------ pom.xml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_1_0/1853-make-interceptor-annotation-inheritable.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_1_0/1853-make-interceptor-annotation-inheritable.yaml index faef342e738..38864e32279 100644 --- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_1_0/1853-make-interceptor-annotation-inheritable.yaml +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_1_0/1853-make-interceptor-annotation-inheritable.yaml @@ -1,5 +1,5 @@ --- type: fix issue: 1853 -issue: "The `@Interceptor` annotation was not marked as inheritable, meaning that the order attribute was lost when +title: "The `@Interceptor` annotation was not marked as inheritable, meaning that the order attribute was lost when using Spring proxies. Thanks to Tue Toft Nørgård for the pull request!" diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa/diff.md b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa/diff.md index 3cc64888298..c328be9c1fd 100644 --- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa/diff.md +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa/diff.md @@ -12,8 +12,8 @@ When the $diff operation is invoked at the instance level (meaning it is invoked ## Parameters -* `[[#{T(ca.uhn.fhir.jpa.model.util.ProviderConstants).DIFF_FROM_VERSION_PARAMETER}]]=[versionId]`: (*optional*) If specified, compare using this version as the source. If not specified, the immediately previous version will be compared. -* `[[#{T(ca.uhn.fhir.jpa.model.util.ProviderConstants).DIFF_INCLUDE_META_PARAMETER}]]=true`: (*optional*) If specified, changes to Resource.meta will be included in the diff. This element is omitted by default. +* `[[${T(ca.uhn.fhir.jpa.model.util.ProviderConstants).DIFF_FROM_VERSION_PARAMETER}]]=[versionId]`: (*optional*) If specified, compare using this version as the source. If not specified, the immediately previous version will be compared. +* `[[${T(ca.uhn.fhir.jpa.model.util.ProviderConstants).DIFF_INCLUDE_META_PARAMETER}]]=true`: (*optional*) If specified, changes to Resource.meta will be included in the diff. This element is omitted by default. To invoke: @@ -51,14 +51,14 @@ When the $diff operation is invoked at the instance level (meaning it is invoked ## Parameters -* `[[#{T(ca.uhn.fhir.jpa.model.util.ProviderConstants).DIFF_FROM_PARAMETER}]]=[reference]`: Specifies the source of the comparison. The value must include a resource type and a resource ID, and can optionally include a version, e.g. `Patient/123` or `Patient/123/_history/2`. -* `[[#{T(ca.uhn.fhir.jpa.model.util.ProviderConstants).DIFF_TO_PARAMETER}]]=[reference]`: Specifies the target of the comparison. The value must include a resource type and a resource ID, and can optionally include a version, e.g. `Patient/123` or `Patient/123/_history/2`. -* `[[#{T(ca.uhn.fhir.jpa.model.util.ProviderConstants).DIFF_INCLUDE_META_PARAMETER}]]=true`: (*optional*) If specified, changes to Resource.meta will be included in the diff. This element is omitted by default. +* `[[${T(ca.uhn.fhir.jpa.model.util.ProviderConstants).DIFF_FROM_PARAMETER}]]=[reference]`: Specifies the source of the comparison. The value must include a resource type and a resource ID, and can optionally include a version, e.g. `Patient/123` or `Patient/123/_history/2`. +* `[[${T(ca.uhn.fhir.jpa.model.util.ProviderConstants).DIFF_TO_PARAMETER}]]=[reference]`: Specifies the target of the comparison. The value must include a resource type and a resource ID, and can optionally include a version, e.g. `Patient/123` or `Patient/123/_history/2`. +* `[[${T(ca.uhn.fhir.jpa.model.util.ProviderConstants).DIFF_INCLUDE_META_PARAMETER}]]=true`: (*optional*) If specified, changes to Resource.meta will be included in the diff. This element is omitted by default. To invoke: ```http -GET http://fhir.example.com/baseR4/$diff?[[#{T(ca.uhn.fhir.jpa.model.util.ProviderConstants).DIFF_FROM_PARAMETER}]]=Patient/1&[[#{T(ca.uhn.fhir.jpa.model.util.ProviderConstants).DIFF_TO_PARAMETER}]]=Patient/2 +GET http://fhir.example.com/baseR4/$diff?[[${T(ca.uhn.fhir.jpa.model.util.ProviderConstants).DIFF_FROM_PARAMETER}]]=Patient/1&[[${T(ca.uhn.fhir.jpa.model.util.ProviderConstants).DIFF_TO_PARAMETER}]]=Patient/2 ``` The server will produce a response resembling the following: diff --git a/pom.xml b/pom.xml index 1391acdd9cc..93ebb134c79 100644 --- a/pom.xml +++ b/pom.xml @@ -644,7 +644,7 @@ - 5.0.1-SNAPSHOT + 5.0.0 1.0.2 -Dfile.encoding=UTF-8 -Xmx2048m