From 630bb916b452025c31976ff6ca8852d53b8e1e7b Mon Sep 17 00:00:00 2001 From: Ken Stevens Date: Mon, 19 Aug 2019 12:15:14 -0400 Subject: [PATCH 1/5] awaitility version bump --- pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ea8ef24303c..e867b4eec09 100755 --- a/pom.xml +++ b/pom.xml @@ -1062,7 +1062,8 @@ org.awaitility awaitility - 3.1.6 + 4.0.0-rc1 + org.codehaus.plexus From a43f4ba967433c58f671b992eff26ddace4972fb Mon Sep 17 00:00:00 2001 From: Ken Stevens Date: Mon, 19 Aug 2019 22:28:33 -0400 Subject: [PATCH 2/5] should be test scope only --- hapi-fhir-test-utilities/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/hapi-fhir-test-utilities/pom.xml b/hapi-fhir-test-utilities/pom.xml index b22af2f86e8..3dfde10fae2 100644 --- a/hapi-fhir-test-utilities/pom.xml +++ b/hapi-fhir-test-utilities/pom.xml @@ -50,6 +50,7 @@ org.awaitility awaitility + test From 97e14711a2a0f6d3c9824800c938603000cbcbe3 Mon Sep 17 00:00:00 2001 From: Ken Stevens Date: Mon, 19 Aug 2019 22:31:52 -0400 Subject: [PATCH 3/5] add missing dep --- hapi-fhir-structures-dstu2/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hapi-fhir-structures-dstu2/pom.xml b/hapi-fhir-structures-dstu2/pom.xml index 0604b84fd02..b16cd0536cd 100644 --- a/hapi-fhir-structures-dstu2/pom.xml +++ b/hapi-fhir-structures-dstu2/pom.xml @@ -216,6 +216,11 @@ ${project.version} test + + org.awaitility + awaitility + test + From daf45db2bef27ac35c7ccb4fceb50267ab3bd42c Mon Sep 17 00:00:00 2001 From: Ken Stevens Date: Tue, 20 Aug 2019 09:14:21 -0400 Subject: [PATCH 4/5] fixed a test and removed awaitility excludes mvn install completed successfully --- hapi-fhir-jpaserver-base/pom.xml | 6 +++++- .../ca/uhn/fhir/parser/XmlParserDstu2Test.java | 4 ---- pom.xml | 16 ---------------- 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml index b6e36b529a3..951c0cbd193 100644 --- a/hapi-fhir-jpaserver-base/pom.xml +++ b/hapi-fhir-jpaserver-base/pom.xml @@ -146,7 +146,11 @@ logback-classic test - + + org.awaitility + awaitility + test + org.javassist javassist diff --git a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserDstu2Test.java b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserDstu2Test.java index f42ad461da9..7f6b0370b7a 100644 --- a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserDstu2Test.java +++ b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserDstu2Test.java @@ -802,7 +802,6 @@ public class XmlParserDstu2Test { //@formatter:off assertThat(enc, stringContainsInOrder("", - "", "", "", "", @@ -817,7 +816,6 @@ public class XmlParserDstu2Test { "", "", "", - "", "", "", "", @@ -856,7 +854,6 @@ public class XmlParserDstu2Test { //@formatter:off assertThat(enc, stringContainsInOrder("", - "", "", "", "", @@ -869,7 +866,6 @@ public class XmlParserDstu2Test { "", "", "", - "", "", "", "", diff --git a/pom.xml b/pom.xml index e867b4eec09..bf2f0eac0da 100755 --- a/pom.xml +++ b/pom.xml @@ -1063,22 +1063,6 @@ org.awaitility awaitility 4.0.0-rc1 - org.codehaus.plexus From df7469731ba2f25db78caf3a204bb2e13f708357 Mon Sep 17 00:00:00 2001 From: Ken Stevens Date: Tue, 20 Aug 2019 15:02:02 -0400 Subject: [PATCH 5/5] turn of sql queries --- .../src/test/java/ca/uhn/fhir/jpa/config/TestR4Config.java | 5 +++-- hapi-fhir-test-utilities/pom.xml | 6 ------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR4Config.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR4Config.java index a41355ef83f..7caa7447e24 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR4Config.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR4Config.java @@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; import javax.sql.DataSource; import java.sql.Connection; import java.util.Properties; +import java.util.concurrent.TimeUnit; import static org.junit.Assert.fail; @@ -110,8 +111,8 @@ public class TestR4Config extends BaseJavaConfigR4 { SLF4JLogLevel level = SLF4JLogLevel.INFO; DataSource dataSource = ProxyDataSourceBuilder .create(retVal) - .logQueryBySlf4j(level, "SQL") -// .logSlowQueryBySlf4j(10, TimeUnit.SECONDS) +// .logQueryBySlf4j(level, "SQL") + .logSlowQueryBySlf4j(10, TimeUnit.SECONDS) // .countQuery(new ThreadQueryCountHolder()) .beforeQuery(new BlockLargeNumbersOfParamsListener()) .afterQuery(captureQueriesListener()) diff --git a/hapi-fhir-test-utilities/pom.xml b/hapi-fhir-test-utilities/pom.xml index 3dfde10fae2..1a57db75e00 100644 --- a/hapi-fhir-test-utilities/pom.xml +++ b/hapi-fhir-test-utilities/pom.xml @@ -46,12 +46,6 @@ junit junit - - - org.awaitility - awaitility - test -