From 19988c505d8b341d7dee0a838d643d141d992525 Mon Sep 17 00:00:00 2001 From: dotasek Date: Tue, 14 Feb 2023 12:47:32 -0500 Subject: [PATCH 1/4] Bump Hapi --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8eb0e00..c6f9baf 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ ca.uhn.hapi.fhir hapi-fhir - 6.3.13-SNAPSHOT + 6.4.0 hapi-fhir-jpaserver-starter From 9d126a4f563f60e05f29dd34a926fc5ccfe73627 Mon Sep 17 00:00:00 2001 From: dotasek Date: Tue, 14 Feb 2023 14:52:03 -0500 Subject: [PATCH 2/4] Fix Application error regarding multiple beans --- src/main/java/ca/uhn/fhir/jpa/starter/Application.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/Application.java b/src/main/java/ca/uhn/fhir/jpa/starter/Application.java index 8031c59..42faf1c 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/Application.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/Application.java @@ -15,6 +15,7 @@ import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration; +import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.boot.web.servlet.ServletRegistrationBean; @@ -26,7 +27,7 @@ import org.springframework.web.context.support.AnnotationConfigWebApplicationCon import org.springframework.web.servlet.DispatcherServlet; @ServletComponentScan(basePackageClasses = {RestfulServer.class}) -@SpringBootApplication(exclude = {ElasticsearchRestClientAutoConfiguration.class}) +@SpringBootApplication(exclude = {ElasticsearchRestClientAutoConfiguration.class, ThymeleafAutoConfiguration.class}) @Import({ SubscriptionSubmitterConfig.class, SubscriptionProcessorConfig.class, From afcd2fc13138c5f105d81932a473d9afbf2398fe Mon Sep 17 00:00:00 2001 From: dotasek Date: Tue, 14 Feb 2023 14:52:26 -0500 Subject: [PATCH 3/4] =?UTF-8?q?Add=C2=A0optional=20explicit=20ip=20config?= =?UTF-8?q?=20for=20smoke=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/smoketest/http-client.env.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/smoketest/http-client.env.json b/src/test/smoketest/http-client.env.json index 85b8ef4..f4a7afb 100644 --- a/src/test/smoketest/http-client.env.json +++ b/src/test/smoketest/http-client.env.json @@ -3,5 +3,10 @@ "host": "localhost:8080", "username": "username", "password": "password" + }, + "explicit-ip": { + "host": "0.0.0.0:8080", + "username": "username", + "password": "password" } } \ No newline at end of file From 20ed5d90ab6330617b6c64e832bde0c20af0d561 Mon Sep 17 00:00:00 2001 From: dotasek Date: Tue, 14 Feb 2023 14:52:26 -0500 Subject: [PATCH 4/4] =?UTF-8?q?Revert=20"Add=C2=A0optional=20explicit=20ip?= =?UTF-8?q?=20config=20for=20smoke=20tests"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit afcd2fc13138c5f105d81932a473d9afbf2398fe. --- src/test/smoketest/http-client.env.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/test/smoketest/http-client.env.json b/src/test/smoketest/http-client.env.json index f4a7afb..85b8ef4 100644 --- a/src/test/smoketest/http-client.env.json +++ b/src/test/smoketest/http-client.env.json @@ -3,10 +3,5 @@ "host": "localhost:8080", "username": "username", "password": "password" - }, - "explicit-ip": { - "host": "0.0.0.0:8080", - "username": "username", - "password": "password" } } \ No newline at end of file