From 77676a305b837fc20a2adf9c9b6cb7be61060095 Mon Sep 17 00:00:00 2001 From: David Berry Date: Tue, 23 Jun 2026 11:41:38 -0400 Subject: [PATCH 1/4] feat: QPPA-11804 jdk version 21.0.11 --- Dockerfile | 2 +- DockerfileTest | 2 +- README.md | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1c7a4e14b..5fe5ae2c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,7 +44,7 @@ RUN mvn -B -ntp \ # Uses a pinned Alpine-based Java 21 JRE image. # This avoids the Ubuntu-based OS package vulnerabilities reported by Snyk # while keeping the runtime image smaller and more reproducible. -FROM eclipse-temurin:21.0.10_7-jre-alpine-3.23 +FROM eclipse-temurin:21.0.11_7-jre-alpine-3.23 # Set the directory where the application will run. WORKDIR /usr/src/run/ diff --git a/DockerfileTest b/DockerfileTest index 2713d897a..3c64f3108 100644 --- a/DockerfileTest +++ b/DockerfileTest @@ -26,7 +26,7 @@ RUN mvn -B -ntp install \ # ----------------------------- # Uses a smaller Alpine-based Eclipse Temurin Java 21 JRE image. # This avoids the Ubuntu-based OS package vulnerabilities reported by Snyk. -FROM eclipse-temurin:21.0.10_7-jre-alpine-3.23 +FROM eclipse-temurin:21.0.11_7-jre-alpine-3.23 # Set the runtime directory. WORKDIR /usr/src/run/ diff --git a/README.md b/README.md index 030397988..b53df6c28 100644 --- a/README.md +++ b/README.md @@ -16,14 +16,14 @@ Before you can use the qpp-conversion-tool application, you must install and con [GitHub's Guide to Installing Git](https://help.github.com/articles/set-up-git) is a good source of information. -* [Java Runtime](https://java.com/download) (version `21`). +* [Java Runtime](https://java.com/download) (version `21.0.11` or later). It is important that you have the right version of `java` on your path. ```shell - # When you run 'java -version', you should get 21. For example: + # When you run 'java -version', you should get 21.0.11 or later. For example: java -version - java version "21" + java version "21.0.11" ... ``` From 83cb245b6fa61231a5f7ea2ff5f6ec00ff3fde63 Mon Sep 17 00:00:00 2001 From: Chetan Munegowda Date: Thu, 25 Jun 2026 11:06:35 -0400 Subject: [PATCH 2/4] QPPA-11824: fix jackson dep snyk issue --- acceptance-tests/pom.xml | 2 +- commandline/pom.xml | 2 +- converter/pom.xml | 2 +- generate-race-cpcplus/pom.xml | 2 +- generate/pom.xml | 2 +- pom.xml | 10 +++++----- qrda3-update-measures/pom.xml | 2 +- test-commons/pom.xml | 2 +- test-coverage/pom.xml | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/acceptance-tests/pom.xml b/acceptance-tests/pom.xml index 9bde5de34..cc3fe9c68 100644 --- a/acceptance-tests/pom.xml +++ b/acceptance-tests/pom.xml @@ -16,7 +16,7 @@ com.fasterxml.jackson.core jackson-core - 2.21.2 + 2.21.4 diff --git a/commandline/pom.xml b/commandline/pom.xml index ee4de971a..5a0172ed8 100644 --- a/commandline/pom.xml +++ b/commandline/pom.xml @@ -71,7 +71,7 @@ com.fasterxml.jackson.core jackson-core - 2.21.2 + 2.21.4 diff --git a/converter/pom.xml b/converter/pom.xml index 61ac0f1e7..82ac08ed2 100644 --- a/converter/pom.xml +++ b/converter/pom.xml @@ -72,7 +72,7 @@ com.fasterxml.jackson.core jackson-core - 2.21.2 + 2.21.4 diff --git a/generate-race-cpcplus/pom.xml b/generate-race-cpcplus/pom.xml index 62b7b507a..c0211f84a 100644 --- a/generate-race-cpcplus/pom.xml +++ b/generate-race-cpcplus/pom.xml @@ -59,7 +59,7 @@ com.fasterxml.jackson.core jackson-core - 2.21.2 + 2.21.4 org.jdom diff --git a/generate/pom.xml b/generate/pom.xml index 166cbf000..ffdd197c9 100644 --- a/generate/pom.xml +++ b/generate/pom.xml @@ -60,7 +60,7 @@ com.fasterxml.jackson.core jackson-core - 2.21.2 + 2.21.4 diff --git a/pom.xml b/pom.xml index f7c53d265..a5b27259f 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ 21 - 1.12.787 + 1.12.797 5.11.4 1.11.4 0.10.7 @@ -237,7 +237,7 @@ com.fasterxml.jackson.core jackson-core - 2.21.2 + 2.21.4 @@ -249,13 +249,13 @@ com.fasterxml.jackson.core jackson-databind - 2.21.2 + 2.21.4 com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.21.2 + 2.21.4 @@ -543,7 +543,7 @@ com.fasterxml.jackson.module jackson-module-jaxb-annotations - 2.21.2 + 2.21.4 diff --git a/qrda3-update-measures/pom.xml b/qrda3-update-measures/pom.xml index 563adc043..62590283c 100644 --- a/qrda3-update-measures/pom.xml +++ b/qrda3-update-measures/pom.xml @@ -40,7 +40,7 @@ com.fasterxml.jackson.core jackson-core - 2.21.2 + 2.21.4 org.jdom diff --git a/test-commons/pom.xml b/test-commons/pom.xml index b90df39e0..380dd7e8a 100644 --- a/test-commons/pom.xml +++ b/test-commons/pom.xml @@ -43,7 +43,7 @@ com.fasterxml.jackson.core jackson-core - 2.21.2 + 2.21.4 diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml index ade48b8c1..e259dec0c 100644 --- a/test-coverage/pom.xml +++ b/test-coverage/pom.xml @@ -22,7 +22,7 @@ com.fasterxml.jackson.core jackson-core - 2.21.2 + 2.21.4 From 435fe002160c07f8ef5815c2d93a736e6e9ce421 Mon Sep 17 00:00:00 2001 From: Chetan Munegowda Date: Thu, 25 Jun 2026 12:32:17 -0400 Subject: [PATCH 3/4] QPPA-11824: fix docker --- Dockerfile | 2 +- DockerfileTest | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1c7a4e14b..cf2e1e96f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,7 +44,7 @@ RUN mvn -B -ntp \ # Uses a pinned Alpine-based Java 21 JRE image. # This avoids the Ubuntu-based OS package vulnerabilities reported by Snyk # while keeping the runtime image smaller and more reproducible. -FROM eclipse-temurin:21.0.10_7-jre-alpine-3.23 +FROM eclipse-temurin:21.0.11_10-jre-alpine-3.23 # Set the directory where the application will run. WORKDIR /usr/src/run/ diff --git a/DockerfileTest b/DockerfileTest index 28b446748..115cd6190 100644 --- a/DockerfileTest +++ b/DockerfileTest @@ -26,7 +26,7 @@ RUN mvn -B -ntp install \ # ----------------------------- # Uses a smaller Alpine-based Eclipse Temurin Java 21 JRE image. # This avoids the Ubuntu-based OS package vulnerabilities reported by Snyk. -FROM eclipse-temurin:21.0.10_7-jre-alpine-3.23 +FROM eclipse-temurin:21.0.11_10-jre-alpine-3.23 # Set the runtime directory. WORKDIR /usr/src/run/ From 7dcd246c757f714f2db6e3daa3bd7858ed80b402 Mon Sep 17 00:00:00 2001 From: GitHub actions Date: Thu, 25 Jun 2026 18:10:12 +0000 Subject: [PATCH 4/4] Prepare release v2026.06.25.01 --- acceptance-tests/pom.xml | 2 +- commandline/pom.xml | 2 +- commons/pom.xml | 2 +- converter/pom.xml | 2 +- generate-race-cpcplus/pom.xml | 2 +- generate/pom.xml | 2 +- pom.xml | 2 +- qrda3-update-measures/pom.xml | 2 +- rest-api/pom.xml | 2 +- test-commons/pom.xml | 2 +- test-coverage/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/acceptance-tests/pom.xml b/acceptance-tests/pom.xml index 97ab502ed..2409f92a8 100644 --- a/acceptance-tests/pom.xml +++ b/acceptance-tests/pom.xml @@ -3,7 +3,7 @@ 4.0.0 acceptance-tests gov.cms.qpp.conversion - 2026.06.15.01-RELEASE + 2026.06.25.01-RELEASE conversion-tests jar diff --git a/commandline/pom.xml b/commandline/pom.xml index 72821aadf..57016eb63 100644 --- a/commandline/pom.xml +++ b/commandline/pom.xml @@ -6,7 +6,7 @@ gov.cms.qpp.conversion qpp-conversion-tool-parent - 2026.06.15.01-RELEASE + 2026.06.25.01-RELEASE ../pom.xml diff --git a/commons/pom.xml b/commons/pom.xml index 95cb6ac61..e4fbe4457 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -6,7 +6,7 @@ gov.cms.qpp.conversion qpp-conversion-tool-parent - 2026.06.15.01-RELEASE + 2026.06.25.01-RELEASE ../pom.xml diff --git a/converter/pom.xml b/converter/pom.xml index 551e3b0e9..24fa2efed 100644 --- a/converter/pom.xml +++ b/converter/pom.xml @@ -6,7 +6,7 @@ gov.cms.qpp.conversion qpp-conversion-tool-parent - 2026.06.15.01-RELEASE + 2026.06.25.01-RELEASE ../pom.xml diff --git a/generate-race-cpcplus/pom.xml b/generate-race-cpcplus/pom.xml index c3b21b558..904e8ac4b 100644 --- a/generate-race-cpcplus/pom.xml +++ b/generate-race-cpcplus/pom.xml @@ -6,7 +6,7 @@ gov.cms.qpp.conversion generateRaceCpcPlus - 2026.06.15.01-RELEASE + 2026.06.25.01-RELEASE generate-race-cpcplus jar diff --git a/generate/pom.xml b/generate/pom.xml index 26e21e8fd..0c60d5ab1 100644 --- a/generate/pom.xml +++ b/generate/pom.xml @@ -5,7 +5,7 @@ qpp-conversion-tool-parent gov.cms.qpp.conversion - 2026.06.15.01-RELEASE + 2026.06.25.01-RELEASE ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 24132e9b0..fedbc8795 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ gov.cms.qpp.conversion qpp-conversion-tool-parent pom - 2026.06.15.01-RELEASE + 2026.06.25.01-RELEASE QPP Conversion Tool diff --git a/qrda3-update-measures/pom.xml b/qrda3-update-measures/pom.xml index 9ec9e931b..1b0de90f2 100644 --- a/qrda3-update-measures/pom.xml +++ b/qrda3-update-measures/pom.xml @@ -4,7 +4,7 @@ gov.cms.qpp.conversion qpp-update-measures - 2026.06.15.01-RELEASE + 2026.06.25.01-RELEASE qrda3-update-measures jar diff --git a/rest-api/pom.xml b/rest-api/pom.xml index c150567f6..837b66fdc 100644 --- a/rest-api/pom.xml +++ b/rest-api/pom.xml @@ -19,7 +19,7 @@ gov.cms.qpp.conversion qpp-conversion-tool-parent - 2026.06.15.01-RELEASE + 2026.06.25.01-RELEASE ../pom.xml diff --git a/test-commons/pom.xml b/test-commons/pom.xml index 2900a6526..e5c3be54f 100644 --- a/test-commons/pom.xml +++ b/test-commons/pom.xml @@ -6,7 +6,7 @@ gov.cms.qpp.conversion qpp-conversion-tool-parent - 2026.06.15.01-RELEASE + 2026.06.25.01-RELEASE ../pom.xml diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml index c17ed353a..b3e93cbc9 100644 --- a/test-coverage/pom.xml +++ b/test-coverage/pom.xml @@ -6,7 +6,7 @@ gov.cms.qpp.conversion qpp-conversion-tool-parent - 2026.06.15.01-RELEASE + 2026.06.25.01-RELEASE ../pom.xml