From 600a1f78e85f76d1186b1b395f99ca5096ba9228 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 05:10:58 +0000 Subject: [PATCH 01/10] Bump de.lars-sh:parent from 0.9.14 to 0.9.16 Bumps de.lars-sh:parent from 0.9.14 to 0.9.16. --- updated-dependencies: - dependency-name: de.lars-sh:parent dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2bbc8941..2fdde5e4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ de.lars-sh parent - 0.9.14 + 0.9.16 From 0e440677d9b2d5a6b6ee7ff1defb6de1dacbafb0 Mon Sep 17 00:00:00 2001 From: Lars Knickrehm Date: Tue, 25 Jun 2024 00:45:17 +0200 Subject: [PATCH 02/10] Align code for latest Parent POM --- .github/workflows/push-and-pull_request.yml | 22 ++++++++++++--------- pom.xml | 4 ++-- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/push-and-pull_request.yml b/.github/workflows/push-and-pull_request.yml index f9790d09..de5deea4 100644 --- a/.github/workflows/push-and-pull_request.yml +++ b/.github/workflows/push-and-pull_request.yml @@ -1,7 +1,9 @@ name: Build on Push and Pull Request on: - - push - - pull_request + push: + branches: + - master + pull_request: jobs: build: @@ -9,25 +11,26 @@ jobs: strategy: fail-fast: false matrix: - # Supported versions as of https://en.wikipedia.org/wiki/Java_version_history + # Supported LTS versions as of https://en.wikipedia.org/wiki/Java_version_history java-version: - 8 - 11 - - 16 + - 17 + - 21 name: Build with JDK ${{ matrix.java-version }} steps: - name: Cache Dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: key: maven-dependencies path: ~/.m2/repository - name: Check out - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java-version }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: adopt + distribution: temurin java-version: ${{ matrix.java-version }} gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: GPG_PASSPHRASE @@ -38,6 +41,7 @@ jobs: set +o errexit +o pipefail - id: version name: Evaluate Version + shell: bash {0} run: | project_version=`mvn help:evaluate --quiet --define expression=project.version --define forceStdout` echo "Version: ${project_version}" @@ -95,7 +99,7 @@ jobs: fi - name: Deploy Site if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.java-version == 8 && steps.version.outputs.is-snapshot == 'true' }} - uses: peaceiris/actions-gh-pages@v3.8.0 + uses: peaceiris/actions-gh-pages@v4.0.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ./target/site diff --git a/pom.xml b/pom.xml index 2fdde5e4..64c3d158 100644 --- a/pom.xml +++ b/pom.xml @@ -118,9 +118,9 @@ - com.googlecode.jmockit + org.jmockit jmockit - 1.7 + 1.29 test From a76befa55e89f7b33e1e292c09f4273d32f1bd2e Mon Sep 17 00:00:00 2001 From: Lars Knickrehm Date: Tue, 25 Jun 2024 00:48:06 +0200 Subject: [PATCH 03/10] Reduce warnings --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 64c3d158..7882c28b 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ org.jmockit jmockit - 1.29 + 1.28 test From 2fd91c9e5aaaccff3ee7af521a04e2b85d3f0589 Mon Sep 17 00:00:00 2001 From: Lars Knickrehm Date: Tue, 25 Jun 2024 00:51:16 +0200 Subject: [PATCH 04/10] Next try --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7882c28b..27f9958e 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ org.jmockit jmockit - 1.28 + 1.25 test From 492f2719bc65c82bec25357d01c4a92aeb49ad49 Mon Sep 17 00:00:00 2001 From: Lars Knickrehm Date: Tue, 25 Jun 2024 00:55:49 +0200 Subject: [PATCH 05/10] . --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 27f9958e..95c91f1d 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ org.jmockit jmockit - 1.25 + 1.8 test From 948957159cda7087bfbf199b3cada924cb4aef92 Mon Sep 17 00:00:00 2001 From: Lars Knickrehm Date: Tue, 25 Jun 2024 00:58:22 +0200 Subject: [PATCH 06/10] jmockit 1.10 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 95c91f1d..a7d58a2d 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ org.jmockit jmockit - 1.8 + 1.10 test From a0cb287f14c3247c3d9422ee9f8ab3b67ce50627 Mon Sep 17 00:00:00 2001 From: Lars Knickrehm Date: Tue, 25 Jun 2024 01:01:06 +0200 Subject: [PATCH 07/10] Jmockit 1.20 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a7d58a2d..ac25267a 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ org.jmockit jmockit - 1.10 + 1.20 test From 89b558745407e3d182ed5b7c27165a730f32a9bf Mon Sep 17 00:00:00 2001 From: Lars Knickrehm Date: Tue, 25 Jun 2024 01:03:49 +0200 Subject: [PATCH 08/10] jmockit 1.23 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ac25267a..e4cd5465 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ org.jmockit jmockit - 1.20 + 1.23 test From ddf0159c6684dae3d92912329cdedccb1e124f52 Mon Sep 17 00:00:00 2001 From: Lars Knickrehm Date: Tue, 25 Jun 2024 01:06:42 +0200 Subject: [PATCH 09/10] jmockit 1.24 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e4cd5465..fc0777db 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ org.jmockit jmockit - 1.23 + 1.24 test From a351339755c25a4a3cee005e86ecdaf90a4338ad Mon Sep 17 00:00:00 2001 From: Lars Knickrehm Date: Tue, 25 Jun 2024 01:07:44 +0200 Subject: [PATCH 10/10] jmockit 1.23 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fc0777db..e4cd5465 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ org.jmockit jmockit - 1.24 + 1.23 test