honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version Bump a few dependencies (#4191) 

* Version bumps

* Test fixes

* Test fix

* Test fix
This commit is contained in:
James Agnew 2022-10-24 18:20:39 -04:00 committed by GitHub
parent cbd65c794d
commit 5328951f15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_2_0/changes.yaml
View File

@ -6,9 +6,11 @@
<ul>
<li>Woodstox (Base): 6.2.5 -> 6.3.1</li>
<li>Spring (JPA): 5.3.20 -> 5.3.23</li>
<li>Hibernate-Core (JPA): 5.6.2 -> 5.6.12</li>
<li>Postgresql JDBC (JPA): 42.4.1 -> 42.5.0</li>
<li>H2 (JPA): 2.1.212 -> 2.1.214</li>
<li>Caffeine (JPA): 2.9.1 -> 3.1.1</li>
<li>Commons-Text (JPA and Testpage Overlay): 1.9.0 -> 1.10.0 (Addresses <a href=\"https://nvd.nist.gov/vuln/detail/CVE-2022-42889\">CVE-2022-42889</a>)</li>
<li>Spring Boot (Boot): 2.6.7 -> 2.7.4</li>
</ul>
"

5
hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplCurrentVersionR4Test.java
View File

@ -27,6 +27,7 @@ import org.hl7.fhir.r4.model.IdType;
import org.hl7.fhir.r4.model.StringType;
import org.hl7.fhir.r4.model.UriType;
import org.hl7.fhir.r4.model.ValueSet;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Answers;
@ -158,6 +159,10 @@ public class TerminologySvcImplCurrentVersionR4Test extends BaseJpaR4Test {
when(mockRequestDetails.getServer().getDefaultPageSize()).thenReturn(25);
}
@AfterEach
public void afterEach() {
myBatchJobHelper.awaitAllJobsOfJobDefinitionIdToComplete(TERM_CODE_SYSTEM_VERSION_DELETE_JOB_NAME);
}
/**
* For input version or for current (when input is null) validates search, expand, lookup and validateCode operations

6
hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/MandatoryTransactionListener.java
View File

@ -34,9 +34,11 @@ public class MandatoryTransactionListener implements ProxyDataSourceBuilder.Sing
if (!TransactionSynchronizationManager.isSynchronizationActive()) {
for (QueryInfo nextQuery : queryInfoList) {
String query = nextQuery.getQuery().toLowerCase(Locale.US);
if (query.contains("hfj_") || query.contains("trm_")) {
if (query.contains("hfj_") || query.contains("trm_") || query.contains("bt2_")) {
if (query.startsWith("select ") || query.startsWith("insert ") || query.startsWith("update ")) {
throw new IllegalStateException("No transaction active executing query: " + nextQuery.getQuery());
if (!query.contains("1=0")) {
throw new IllegalStateException("No transaction active executing query: " + nextQuery.getQuery());
}
}
}

8
pom.xml
View File

@ -795,7 +795,7 @@
<caffeine_version>3.1.1</caffeine_version>
<commons_codec_version>1.15</commons_codec_version>
<commons_compress_version>1.21</commons_compress_version>
<commons_text_version>1.9</commons_text_version>
<commons_text_version>1.10.0</commons_text_version>
<commons_io_version>2.11.0</commons_io_version>
<commons_lang3_version>3.12.0</commons_lang3_version>
<com_jamesmurty_utils_version>1.2</com_jamesmurty_utils_version>
@ -803,7 +803,7 @@
<derby_version>10.14.2.0</derby_version>
<!--<derby_version>10.15.1.3</derby_version>-->
<error_prone_core_version>2.10.0</error_prone_core_version>
<mockito_version>4.2.0</mockito_version>
<mockito_version>4.8.1</mockito_version>
<nullaway_version>0.7.9</nullaway_version>
<guava_version>31.0.1-jre</guava_version>
<gson_version>2.8.9</gson_version>
@ -818,7 +818,7 @@
<junit_version>5.9.1</junit_version>
<flexmark_version>0.50.40</flexmark_version>
<flyway_version>9.4.0</flyway_version>
<hibernate_version>5.6.2.Final</hibernate_version>
<hibernate_version>5.6.12.Final</hibernate_version>
<hibernate_search_version>6.1.6.Final</hibernate_search_version>
<!-- Update lucene version when you update hibernate-search version -->
<lucene_version>8.11.1</lucene_version>
@ -1411,7 +1411,7 @@
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.1.1</version>
<version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>