From 4d3b9d613dddda72af1b43aec6860cf4bc009289 Mon Sep 17 00:00:00 2001 From: Rune Flobakk Date: Thu, 4 Dec 2025 12:39:53 +0100 Subject: [PATCH 1/2] Upgrade to DropWizard 5.0.0 --- .github/workflows/build.yml | 17 +++++++---------- .java-version | 2 +- pom.xml | 16 ++++++++-------- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 35cc38d..4b44edd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,19 +4,16 @@ on: push jobs: build: - strategy: - matrix: - java: [ '11', '17' ] - name: Build on Java ${{ matrix.java }} + name: Build runs-on: ubuntu-latest env: MAVEN_ARGS: --show-version --no-transfer-progress steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0 with: distribution: temurin - java-version: ${{ matrix.java }} + java-version-file: '.java-version' cache: "maven" - name: Build with Maven run: mvn verify @@ -27,12 +24,12 @@ jobs: name: Publish ${{ github.ref_name }} runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 - name: Set up Java - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1 + uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0 with: distribution: temurin - java-version: '21' + java-version-file: '.java-version' cache: "maven" gpg-private-key: ${{ secrets.MAVEN_CENTRAL_SIGNING_KEY_PRIVATE }} server-id: central diff --git a/.java-version b/.java-version index 2dbc24b..98d9bcb 100644 --- a/.java-version +++ b/.java-version @@ -1 +1 @@ -11.0 +17 diff --git a/pom.xml b/pom.xml index c1f9a5d..a91bc9e 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ no.digipost digipost-open-super-pom - 14 + 15 typesafe-config-bundle @@ -31,14 +31,14 @@ Typesafe Config Bundle - 11 + 17 com.typesafe config - 1.4.2 + 1.4.5 org.slf4j @@ -109,7 +109,7 @@ org.hamcrest hamcrest - 2.2 + 3.0 test @@ -121,7 +121,7 @@ nl.jqno.equalsverifier equalsverifier - 3.15.1 + 4.2.5 test @@ -142,21 +142,21 @@ org.junit junit-bom - 5.10.0 + 6.1.0-M1 pom import io.dropwizard dropwizard-bom - 4.0.1 + 5.0.0 pom import io.dropwizard dropwizard-dependencies - 4.0.1 + 5.0.0 pom import From c7a62ebc3833f1769f5841a8246530fc8b3edc09 Mon Sep 17 00:00:00 2001 From: Rune Flobakk Date: Thu, 4 Dec 2025 12:41:58 +0100 Subject: [PATCH 2/2] Upgrade Maven plugins --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index a91bc9e..b60f67d 100644 --- a/pom.xml +++ b/pom.xml @@ -172,15 +172,15 @@ maven-resources-plugin - 3.3.1 + 3.4.0 maven-compiler-plugin - 3.14.0 + 3.14.1 maven-surefire-plugin - 3.5.3 + 3.5.4 maven-jar-plugin @@ -197,15 +197,15 @@ org.codehaus.mojo versions-maven-plugin - 2.18.0 + 2.20.1 maven-dependency-plugin - 3.8.1 + 3.9.0 maven-enforcer-plugin - 3.6.1 + 3.6.2