diff --git a/hapi-fhir-jacoco/pom.xml b/hapi-fhir-jacoco/pom.xml index 393098dad09..24532059c55 100644 --- a/hapi-fhir-jacoco/pom.xml +++ b/hapi-fhir-jacoco/pom.xml @@ -318,6 +318,7 @@ ${basedir}/.. + hapi-fhir-jpaserver-model/target/jacoco.exec hapi-fhir-jpaserver-searchparam/target/jacoco.exec hapi-fhir-jpaserver-subscription/target/jacoco.exec hapi-fhir-jpaserver-base/target/jacoco.exec + @@ -351,6 +355,7 @@ + org.codehaus.mojo build-helper-maven-plugin @@ -394,9 +400,11 @@ + ../hapi-fhir-jpaserver-model/src/main/java ../hapi-fhir-jpaserver-searchparam/src/main/java ../hapi-fhir-jpaserver-subscription/src/main/java @@ -424,9 +432,11 @@ + ../hapi-fhir-jpaserver-model/src/test/resources @@ -439,6 +449,7 @@ ../hapi-fhir-jpaserver-base/src/test/resources + diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml index dad80f5523a..7f717807d8d 100644 --- a/hapi-fhir-jpaserver-base/pom.xml +++ b/hapi-fhir-jpaserver-base/pom.xml @@ -660,14 +660,6 @@ org.jacoco jacoco-maven-plugin - - ${basedir}/target/classes - ${basedir}../hapi-fhir-base/target/classes - - - ${basedir}/src/main/java - ${basedir}/../hapi-fhir-base/src/main/java - true @@ -677,6 +669,17 @@ prepare-agent + + post-integration-test + install + + report + + + ${project.build.directory}/jacoco.exec + ${project.reporting.outputDirectory}/jacoco-report + + diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchPageExpiryTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchPageExpiryTest.java index c14e457e9d6..9f0435102e4 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchPageExpiryTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchPageExpiryTest.java @@ -324,7 +324,7 @@ public class FhirResourceDaoR4SearchPageExpiryTest extends BaseJpaR4Test { } }); - DatabaseSearchCacheSvcImpl.setNowForUnitTests(search3timestamp.get() + 1100); + DatabaseSearchCacheSvcImpl.setNowForUnitTests(search3timestamp.get() + 2100); myStaleSearchDeletingSvc.pollForStaleSearchesAndDeleteThem(); newTxTemplate().execute(new TransactionCallbackWithoutResult() { diff --git a/pom.xml b/pom.xml index ebb542bc664..55b1dd4ae39 100755 --- a/pom.xml +++ b/pom.xml @@ -607,7 +607,7 @@ 4.4.11 4.5.9 2.9.9 - 2.9.9.1 + 2.9.10 3.1.0 1.8 4.0.0.Beta3 diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 0e1bb4b885a..bb0164e3909 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -13,6 +13,7 @@
  • Hibernate Core (Core): 5.4.2.Final -> 5.4.4.Final
  • +
  • Jackson Databind (JPA): 2.9.9 -> 2.9.10 (CVE-2019-16335, CVE-2019-14540)
  • ]]>