diff --git a/pass-data-client/pom.xml b/pass-data-client/pom.xml index cccd7ff35..86f785fc1 100644 --- a/pass-data-client/pom.xml +++ b/pass-data-client/pom.xml @@ -14,16 +14,14 @@ - 4.12.0 - 4.12.0 1.1.0 - 2.0.16 - 1.5.16 - 3.18.0 - 5.10.5 - 5.11.0 - 1.19.8 - 3.9.9 + 2.0.17 + 1.5.32 + 3.20.0 + 5.14.3 + 5.22.0 + 1.21.4 + 3.9.13 @@ -53,8 +51,7 @@ com.squareup.okhttp3 - okhttp - ${okhttp.version} + okhttp-jvm diff --git a/pass-deposit-services/deposit-core/Dockerfile b/pass-deposit-services/deposit-core/Dockerfile index b4ae2e688..e89617268 100644 --- a/pass-deposit-services/deposit-core/Dockerfile +++ b/pass-deposit-services/deposit-core/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17.0.8_7-jre-jammy +FROM eclipse-temurin:17.0.18_8-jre-noble WORKDIR /app diff --git a/pass-deposit-services/deposit-core/pom.xml b/pass-deposit-services/deposit-core/pom.xml index c24e308b4..e0359aaf9 100644 --- a/pass-deposit-services/deposit-core/pom.xml +++ b/pass-deposit-services/deposit-core/pom.xml @@ -29,17 +29,16 @@ PASS Deposit Services Core - 2.1.3 - 4.4.0 + 2.1.4 + 4.5.0 2.14.0 - 1.18.1 - 4.12.0 - 2.1.0 + 1.22.1 + 2.1.8 2.0.1 - 3.9.9 - 1.17.2 - 2.9.0 - 3.9.1 + 3.9.13 + 1.24.0 + 2.10.0 + 3.13.2 @@ -92,8 +91,7 @@ com.squareup.okhttp3 - okhttp - ${okhttp.version} + okhttp-jvm diff --git a/pass-deposit-services/deposit-core/src/test/resources/test-application.properties b/pass-deposit-services/deposit-core/src/test/resources/test-application.properties index 68afec90b..4b8ba67f4 100644 --- a/pass-deposit-services/deposit-core/src/test/resources/test-application.properties +++ b/pass-deposit-services/deposit-core/src/test/resources/test-application.properties @@ -16,6 +16,7 @@ spring.jms.listener.auto-startup=false pass.deposit.jobs.disabled=true spring.cloud.aws.s3.enabled=false +spring.cloud.aws.parameterstore.enabled=false pass.client.url=http://localhost:8080/ pass.client.user=test diff --git a/pass-deposit-services/pom.xml b/pass-deposit-services/pom.xml index 5e3857e1c..e91ab9f30 100644 --- a/pass-deposit-services/pom.xml +++ b/pass-deposit-services/pom.xml @@ -38,21 +38,19 @@ - 3.4.2 - 3.2.1 - 1.27.1 - 2.17.0 - 3.18.0 - 4.12.0 - 2.10.0 - 1.17.1 - 1.3 - 3.2.2 - 2.11.0 - 2.13.0 + 3.5.11 + 3.4.2 + 1.28.0 + 2.21.0 + 3.20.0 + 2.11.0 + 1.21.0 + 3.2.3 + 2.13.2 + 2.14.1 1.3.9 - 2.4 - 2.5.2 + 2.5 + 2.6.0 @@ -148,18 +146,6 @@ ${tika.version} - - com.squareup.okhttp3 - okhttp - ${okhttp.version} - - - - com.squareup.okhttp3 - logging-interceptor - ${okhttp.version} - - javax.servlet servlet-api @@ -183,33 +169,19 @@ json-smart ${json-smart.version} + org.ow2.asm asm - 9.6 - - - org.jsoup - jsoup - 1.18.1 + 9.7.1 - - io.netty - netty-handler - 4.1.118.Final - - - io.netty - netty-common - 4.1.118.Final - org.apache.commons commons-lang3 @@ -394,7 +366,7 @@ org.apache.maven.plugins maven-help-plugin - 3.4.0 + 3.5.1 diff --git a/pass-grant-loader/Dockerfile b/pass-grant-loader/Dockerfile index 81e4b2ff5..c2b031510 100644 --- a/pass-grant-loader/Dockerfile +++ b/pass-grant-loader/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17.0.13_11-jre-jammy +FROM eclipse-temurin:17.0.18_8-jre-noble WORKDIR /app diff --git a/pass-grant-loader/pom.xml b/pass-grant-loader/pom.xml index f906d09ad..15cb41e2e 100644 --- a/pass-grant-loader/pom.xml +++ b/pass-grant-loader/pom.xml @@ -30,13 +30,13 @@ PASS Grant Data Loader - 3.4.2 - 3.2.1 + 3.5.11 + 3.4.2 2.37 - 1.12.0 - 9.4.0 - 3.9.9 - 3.18.0 + 1.14.1 + 9.6.0 + 3.9.13 + 3.20.0 @@ -59,16 +59,6 @@ - - io.netty - netty-handler - 4.1.118.Final - - - io.netty - netty-common - 4.1.118.Final - org.apache.commons commons-lang3 diff --git a/pass-grant-loader/src/test/resources/test-application.properties b/pass-grant-loader/src/test/resources/test-application.properties index 9058934b7..199227214 100644 --- a/pass-grant-loader/src/test/resources/test-application.properties +++ b/pass-grant-loader/src/test/resources/test-application.properties @@ -12,4 +12,6 @@ spring.datasource.password=sa grant.db.url=${spring.datasource.url} grant.db.username=sa -grant.db.password=sa \ No newline at end of file +grant.db.password=sa + +spring.cloud.aws.parameterstore.enabled=false \ No newline at end of file diff --git a/pass-journal-loader/pass-journal-loader-nih/Dockerfile b/pass-journal-loader/pass-journal-loader-nih/Dockerfile index 4349a0ffb..eec2c7687 100644 --- a/pass-journal-loader/pass-journal-loader-nih/Dockerfile +++ b/pass-journal-loader/pass-journal-loader-nih/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17.0.13_11-jre-jammy +FROM eclipse-temurin:17.0.18_8-jre-noble WORKDIR /app diff --git a/pass-journal-loader/pass-journal-loader-nih/pom.xml b/pass-journal-loader/pass-journal-loader-nih/pom.xml index 9fd386101..6d82c0a58 100644 --- a/pass-journal-loader/pass-journal-loader-nih/pom.xml +++ b/pass-journal-loader/pass-journal-loader-nih/pom.xml @@ -15,9 +15,9 @@ - 3.9.2 - 1.19.8 - 3.9.9 + 3.13.2 + 1.21.4 + 3.9.13 diff --git a/pass-journal-loader/pom.xml b/pass-journal-loader/pom.xml index 0a773341e..c85e5df69 100644 --- a/pass-journal-loader/pom.xml +++ b/pass-journal-loader/pom.xml @@ -19,13 +19,13 @@ - 3.3.5 + 3.5.11 1.12.0 3.18.0 - 2.0.16 - 1.5.16 - 5.10.5 - 5.11.0 + 2.0.17 + 1.5.32 + 5.14.3 + 5.22.0 @@ -137,7 +137,7 @@ org.apache.maven.plugins maven-help-plugin - 3.4.0 + 3.5.1 diff --git a/pass-nihms-loader/nihms-data-harvest/pom.xml b/pass-nihms-loader/nihms-data-harvest/pom.xml index 7776b3f94..43195e59f 100644 --- a/pass-nihms-loader/nihms-data-harvest/pom.xml +++ b/pass-nihms-loader/nihms-data-harvest/pom.xml @@ -35,12 +35,11 @@ commons-io commons-io - ${commons-io.version} com.squareup.okhttp3 - okhttp + okhttp-jvm diff --git a/pass-nihms-loader/nihms-data-harvest/src/test/resources/test-application.properties b/pass-nihms-loader/nihms-data-harvest/src/test/resources/test-application.properties index fed765582..1c4ba75b1 100644 --- a/pass-nihms-loader/nihms-data-harvest/src/test/resources/test-application.properties +++ b/pass-nihms-loader/nihms-data-harvest/src/test/resources/test-application.properties @@ -10,4 +10,6 @@ nihmsetl.api.url.param.api-token=test-token # By default this date will be set to the current month, one year ago nihmsetl.api.url.param.pdf=07/2018 # Date in MM/YYYY format that the PACM data should end at (leave blank to default to the current month) -nihmsetl.api.url.param.pdt=07/2019 \ No newline at end of file +nihmsetl.api.url.param.pdt=07/2019 + +spring.cloud.aws.parameterstore.enabled=false \ No newline at end of file diff --git a/pass-nihms-loader/nihms-data-transform-load/pom.xml b/pass-nihms-loader/nihms-data-transform-load/pom.xml index 806953bd7..bf1c59022 100644 --- a/pass-nihms-loader/nihms-data-transform-load/pom.xml +++ b/pass-nihms-loader/nihms-data-transform-load/pom.xml @@ -14,8 +14,8 @@ PASS NIHMS Transform/Load Data Loader - 3.9.2 - 3.9.9 + 3.13.2 + 3.9.13 @@ -38,7 +38,6 @@ commons-io commons-io - ${commons-io.version} @@ -97,7 +96,7 @@ com.squareup.okhttp3 - okhttp + okhttp-jvm diff --git a/pass-nihms-loader/nihms-data-transform-load/src/test/resources/test-application.properties b/pass-nihms-loader/nihms-data-transform-load/src/test/resources/test-application.properties index 645723c8d..59f253055 100644 --- a/pass-nihms-loader/nihms-data-transform-load/src/test/resources/test-application.properties +++ b/pass-nihms-loader/nihms-data-transform-load/src/test/resources/test-application.properties @@ -6,4 +6,6 @@ pmc.entrez.service.url=http://localhost:9911/entrez/eutils/esummary.fcgi?db=pubm # pass-core properties pass.client.url=http://localhost:8080/ pass.client.user=backend -pass.client.password=moo \ No newline at end of file +pass.client.password=moo + +spring.cloud.aws.parameterstore.enabled=false \ No newline at end of file diff --git a/pass-nihms-loader/nihms-docker/Dockerfile b/pass-nihms-loader/nihms-docker/Dockerfile index 0d053039f..b0b20151d 100644 --- a/pass-nihms-loader/nihms-docker/Dockerfile +++ b/pass-nihms-loader/nihms-docker/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17.0.13_11-jre-jammy +FROM eclipse-temurin:17.0.18_8-jre-noble WORKDIR /app diff --git a/pass-nihms-loader/nihms-docker/pom.xml b/pass-nihms-loader/nihms-docker/pom.xml index 904ab8dd7..1d564c788 100644 --- a/pass-nihms-loader/nihms-docker/pom.xml +++ b/pass-nihms-loader/nihms-docker/pom.xml @@ -17,7 +17,7 @@ maven-resources-plugin - 3.1.0 + 3.5.0 copy-jar-files-for-dockerfile diff --git a/pass-nihms-loader/pom.xml b/pass-nihms-loader/pom.xml index 445dfcfd1..c920d871b 100644 --- a/pass-nihms-loader/pom.xml +++ b/pass-nihms-loader/pom.xml @@ -23,17 +23,16 @@ - 3.4.2 - 3.2.1 - 20240303 - 1.12.0 + 3.5.11 + 3.4.2 + 20251224 + 1.14.1 2.37 2.1.8 - 2.17.0 - 4.12.0 - 4.4 - 2.13.0 - 3.18.0 + 2.21.0 + 4.5.0 + 2.14.1 + 3.20.0 @@ -50,6 +49,12 @@ ${commons.csv.version} + + commons-io + commons-io + ${commons-io.version} + + org.springframework.boot spring-boot-dependencies @@ -66,12 +71,6 @@ import - - com.squareup.okhttp3 - okhttp - ${okhttp.version} - - joda-time joda-time @@ -81,16 +80,6 @@ - - io.netty - netty-handler - 4.1.118.Final - - - io.netty - netty-common - 4.1.118.Final - org.apache.commons commons-lang3 @@ -197,7 +186,7 @@ org.apache.maven.plugins maven-help-plugin - 3.4.0 + 3.5.1 diff --git a/pass-notification-service/Dockerfile b/pass-notification-service/Dockerfile index 2bd61f352..bbf719dbe 100644 --- a/pass-notification-service/Dockerfile +++ b/pass-notification-service/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17.0.13_11-jre-jammy +FROM eclipse-temurin:17.0.18_8-jre-noble WORKDIR /app diff --git a/pass-notification-service/pom.xml b/pass-notification-service/pom.xml index 70c4da4bf..0832bb150 100644 --- a/pass-notification-service/pom.xml +++ b/pass-notification-service/pom.xml @@ -30,16 +30,16 @@ - 3.4.2 - 3.2.1 - 2.17.0 - 4.4.0 - 2.1.3 - 5.10.5 - 2.1.0 + 3.5.11 + 3.4.2 + 2.21.0 + 4.5.0 + 2.1.4 + 5.12.2 + 2.1.8 2.0.1 - 3.9.9 - 3.18.0 + 3.9.13 + 3.20.0 @@ -62,16 +62,6 @@ - - io.netty - netty-handler - 4.1.118.Final - - - io.netty - netty-common - 4.1.118.Final - org.apache.commons commons-lang3 @@ -188,7 +178,7 @@ org.junit.jupiter junit-jupiter-params - ${junit-jupiter.version} + ${junit-jupiter-params.version} test diff --git a/pass-notification-service/src/test/resources/test-application.properties b/pass-notification-service/src/test/resources/test-application.properties index 64bc0ae08..a309c55b3 100644 --- a/pass-notification-service/src/test/resources/test-application.properties +++ b/pass-notification-service/src/test/resources/test-application.properties @@ -18,6 +18,7 @@ # Test Spring Boot Configuration # spring.jms.listener.auto-startup=false +spring.cloud.aws.parameterstore.enabled=false pass.client.url=http://localhost:8080/ pass.client.user=backend diff --git a/pom.xml b/pom.xml index 51ecd2099..4a51c6d81 100644 --- a/pom.xml +++ b/pom.xml @@ -73,8 +73,9 @@ 3.8.1 - 0.8.12 + 0.8.14 1.9.25 + 5.3.2 pass-support eclipse-pass_pass-support ${maven.multiModuleProjectDirectory}/jacoco-aggregate-report-pass-support/target/site/jacoco-aggregate/jacoco.xml @@ -82,13 +83,37 @@ + + + com.squareup.okhttp3 + okhttp-bom + ${okhttp.version} + pom + import + + + + + + com.squareup.moshi + moshi + 1.15.2 + com.squareup.okio - okio - 3.6.0 + okio-jvm + 3.16.4 + + org.jetbrains.kotlin kotlin-stdlib @@ -136,6 +161,15 @@ + + + + software/amazon/awssdk/services/ssm/DefaultSsmClient + +