Merge branch 'master' into 2069-message-retry-attributes

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/atlas/points.json

@@ -243,10 +243,10 @@
 			"description": "With the ACS App, Community Health Agents (CHA) work gets faster and faster, and they can take better care of their community. Best of all, it is 100% free to the Health Agent.",
 			"link": "http://ephealth.com.br/?lang=en",
 			"contactName": "Alan Lescano",
-			"contactEmail": "alan@ephealth.com.br",
+			"contactEmail": "alan.lesc1@gmail.com",
 			"city": "Sao Paulo, Brazil",
-			"lat": -6.6167,
+			"lat": -23.533773,
-			"lon": -38.1500,
+			"lon": -46.625290,
 			"added": "2019-09-29"
 		},
 		{

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_2_0/changes.yaml

@@ -4,5 +4,11 @@
     title: "The version of a few dependencies have been bumped to the latest versions
     (dependent HAPI modules listed in brackets):
     <ul>
-        <li>Flyway (JPA): 6.4.1-&gt; 6.5.4</li>
+        <li>Jackson (Base): 2.10.0 -&gt; 2.11.2</li>
+        <li>Flyway (JPA): 6.4.1 -&gt; 6.5.4</li>
+        <li>UCUM (JPA): 1.0.2 -&gt; 1.0.3</li>
+        <li>JQuery (Testpage Overlay): 3.3.1 -&gt; 3.5.1</li>
+        <li>Awesome Bootstrap Checkbos (Testpage Overlay): 1.0.1 -&gt; 1.0.2</li>
+        <li>MomentJS (Testpage Overlay): 2.15.1 -&gt; 2.27.0</li>
+        <li>Select2 (Testpage Overlay): 4.0.3 -&gt; 4.0.13</li>
     </ul>"

hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/ITestDataBuilder.java

@@ -106,6 +106,13 @@ public interface ITestDataBuilder {
 		};
 	}
 
+	/**
+	 * Set Organization.name
+	 */
+	default Consumer<IBaseResource> withName(String theStatus) {
+		return t -> __setPrimitiveChild(getFhirContext(), t, "name", "string", theStatus);
+	}
+
 	default Consumer<IBaseResource> withId(String theId) {
 		return t -> {
 			assertThat(theId, matchesPattern("[a-zA-Z0-9]+"));
@@ -129,6 +136,10 @@ public interface ITestDataBuilder {
 		return createResource("Patient", theModifiers);
 	}
 
+	default IIdType createOrganization(Consumer<IBaseResource>... theModifiers) {
+		return createResource("Organization", theModifiers);
+	}
+
 	default IIdType createResource(String theResourceType, Consumer<IBaseResource>[] theModifiers) {
 		IBaseResource resource = getFhirContext().getResourceDefinition(theResourceType).newInstance();
 		for (Consumer<IBaseResource> next : theModifiers) {
@@ -155,6 +166,30 @@ public interface ITestDataBuilder {
 		};
 	}
 
+	default  Consumer<IBaseResource> withObservationHasMember(@Nullable IIdType theHasMember) {
+		return t -> {
+			if (theHasMember != null) {
+				IBaseReference reference = (IBaseReference) getFhirContext().getElementDefinition("Reference").newInstance();
+				reference.setReference(theHasMember.getValue());
+
+				RuntimeResourceDefinition resourceDef = getFhirContext().getResourceDefinition(t.getClass());
+				resourceDef.getChildByName("hasMember").getMutator().addValue(t, reference);
+			}
+		};
+	}
+
+	default  Consumer<IBaseResource> withOrganization(@Nullable IIdType theHasMember) {
+		return t -> {
+			if (theHasMember != null) {
+				IBaseReference reference = (IBaseReference) getFhirContext().getElementDefinition("Reference").newInstance();
+				reference.setReference(theHasMember.getValue());
+
+				RuntimeResourceDefinition resourceDef = getFhirContext().getResourceDefinition(t.getClass());
+				resourceDef.getChildByName("managingOrganization").getMutator().addValue(t, reference);
+			}
+		};
+	}
+
 	/**
 	 * Users of this API must implement this method
 	 */

hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/tmpl-head.html

@@ -29,8 +29,8 @@
    <script th:src="@{/resources/moment/min/moment-with-locales.min.js}"></script>
    <link th:href="@{/resources/Eonasdan-bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css}" rel="stylesheet" />
    <script th:src="@{/resources/Eonasdan-bootstrap-datetimepicker/js/bootstrap-datetimepicker.js}"></script>
-   <link th:href="@{/resources/select2/dist/css/select2.css}" rel="stylesheet"/>
+   <link th:href="@{/resources/select2/css/select2.css}" rel="stylesheet"/>
-   <script th:src="@{/resources/select2/dist/js/select2.min.js}"></script>
+   <script th:src="@{/resources/select2/js/select2.min.js}"></script>
 
 
    <script src="js/RestfulTester.js" type="text/javascript"></script>

pom.xml

@@ -679,7 +679,7 @@
 	<properties>
 
 		<fhir_core_version>5.1.0</fhir_core_version>
-		<ucum_version>1.0.2</ucum_version>
+		<ucum_version>1.0.3</ucum_version>
 
 		<surefire_jvm_args>-Dfile.encoding=UTF-8 -Xmx2048m</surefire_jvm_args>
 
@@ -726,8 +726,8 @@
 		<hibernate_validator_version>6.1.3.Final</hibernate_validator_version>
 		<httpcore_version>4.4.13</httpcore_version>
 		<httpclient_version>4.5.12</httpclient_version>
-		<jackson_version>2.10.0</jackson_version>
+		<jackson_version>2.11.2</jackson_version>
-		<jackson_databind_version>2.10.0</jackson_databind_version>
+		<jackson_databind_version>2.11.2</jackson_databind_version>
 		<maven_assembly_plugin_version>3.1.0</maven_assembly_plugin_version>
 		<maven_license_plugin_version>1.8</maven_license_plugin_version>
 		<resteasy_version>4.0.0.Beta3</resteasy_version>
@@ -1572,6 +1572,12 @@
 				<groupId>org.webjars</groupId>
 				<artifactId>bootstrap</artifactId>
 				<version>3.3.7</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.webjars</groupId>
+						<artifactId>jquery</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.webjars</groupId>
@@ -1586,7 +1592,7 @@
 			<dependency>
 				<groupId>org.webjars.bower</groupId>
 				<artifactId>awesome-bootstrap-checkbox</artifactId>
-				<version>1.0.1</version>
+				<version>1.0.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.webjars</groupId>
@@ -1596,17 +1602,23 @@
 			<dependency>
 				<groupId>org.webjars</groupId>
 				<artifactId>select2</artifactId>
-				<version>4.0.3</version>
+				<version>4.0.13</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.webjars</groupId>
+						<artifactId>jquery</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.webjars.bower</groupId>
 				<artifactId>jquery</artifactId>
-				<version>3.3.1</version>
+				<version>3.5.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.webjars.bower</groupId>
 				<artifactId>moment</artifactId>
-				<version>2.15.1</version>
+				<version>2.27.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.xmlunit</groupId>