From 31aa397625f6c2b05b96f6b9570d167b23d0a628 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Sat, 27 Sep 2025 22:49:34 +0200 Subject: [PATCH 1/5] Create a simple test This new test exposes the problems on Java 25. --- .../forensics/reference/Java25ITest.java | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/test/java/io/jenkins/plugins/forensics/reference/Java25ITest.java diff --git a/src/test/java/io/jenkins/plugins/forensics/reference/Java25ITest.java b/src/test/java/io/jenkins/plugins/forensics/reference/Java25ITest.java new file mode 100644 index 00000000..4875c810 --- /dev/null +++ b/src/test/java/io/jenkins/plugins/forensics/reference/Java25ITest.java @@ -0,0 +1,35 @@ +package io.jenkins.plugins.forensics.reference; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junitpioneer.jupiter.Issue; +import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.junit.jupiter.WithJenkins; + +import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition; +import org.jenkinsci.plugins.workflow.job.WorkflowJob; + +@WithJenkins +class Java25ITest { + private JenkinsRule jenkins; + + @BeforeEach + @SuppressWarnings("checkstyle:HiddenField") + public void setUp(final JenkinsRule jenkins) { + this.jenkins = jenkins; + } + + @Test + @Issue("JENKINS-73380") + void shouldOverwriteReferenceBuild() throws Exception { + var reference = jenkins.createProject(WorkflowJob.class); + reference.setDefinition(new CpsFlowDefinition( + """ + node { + echo 'Hello Job'; + discoverGitReferenceBuild(); + } + """, true)); + jenkins.buildAndAssertSuccess(reference); + } +} From f841a6c99d8a3751ad56582018841278730ad4f3 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Sat, 27 Sep 2025 22:53:22 +0200 Subject: [PATCH 2/5] Create a simple test This new test exposes the problems on Java 25. --- .../io/jenkins/plugins/forensics/reference/Java25ITest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/test/java/io/jenkins/plugins/forensics/reference/Java25ITest.java b/src/test/java/io/jenkins/plugins/forensics/reference/Java25ITest.java index 4875c810..6522ab94 100644 --- a/src/test/java/io/jenkins/plugins/forensics/reference/Java25ITest.java +++ b/src/test/java/io/jenkins/plugins/forensics/reference/Java25ITest.java @@ -2,7 +2,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junitpioneer.jupiter.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.junit.jupiter.WithJenkins; @@ -20,14 +19,13 @@ public void setUp(final JenkinsRule jenkins) { } @Test - @Issue("JENKINS-73380") void shouldOverwriteReferenceBuild() throws Exception { var reference = jenkins.createProject(WorkflowJob.class); reference.setDefinition(new CpsFlowDefinition( """ node { echo 'Hello Job'; - discoverGitReferenceBuild(); + discoverReferenceBuild(); } """, true)); jenkins.buildAndAssertSuccess(reference); From 44c5f126ff94ec4157ad929007b63585f3f057fa Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Mon, 29 Sep 2025 10:53:13 +0200 Subject: [PATCH 3/5] Switch Java distribution in GitHub pipelines to Eclipse Temurin See https://adoptium.net/temurin/release-notes?version=25 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4580fee0..bfe76ab8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: - name: Set up JDK ${{ matrix.jdk }} uses: actions/setup-java@v5 with: - distribution: 'corretto' + distribution: 'temurin' java-version: '${{ matrix.jdk }}' check-latest: true cache: 'maven' From 025e5d9e97753cfcbc9100f092e7097f9df402d2 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Thu, 27 Nov 2025 11:25:06 +0100 Subject: [PATCH 4/5] Use Java 25 in builds --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bfe76ab8..cdaf2895 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: platform: [ubuntu-latest, macos-latest, windows-latest] - jdk: [21] + jdk: [21, 25] runs-on: ${{ matrix.platform }} name: on ${{ matrix.platform }} with JDK ${{ matrix.jdk }} From 22b53f364598f0e816aa3bfa16a662f7eb1d3525 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Fri, 28 Nov 2025 15:35:13 +0100 Subject: [PATCH 5/5] Use latest parent pom that fixes the javac compiler args --- pom.xml | 2 +- .../forensics/reference/Java25ITest.java | 33 ------------------- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 src/test/java/io/jenkins/plugins/forensics/reference/Java25ITest.java diff --git a/pom.xml b/pom.xml index 4a924cff..6d8ac6ad 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.jvnet.hudson.plugins analysis-pom - 11.2908.va_a_0dc7dddeb_1 + 11.2934.va_a_d795c46a_7b_ diff --git a/src/test/java/io/jenkins/plugins/forensics/reference/Java25ITest.java b/src/test/java/io/jenkins/plugins/forensics/reference/Java25ITest.java deleted file mode 100644 index 6522ab94..00000000 --- a/src/test/java/io/jenkins/plugins/forensics/reference/Java25ITest.java +++ /dev/null @@ -1,33 +0,0 @@ -package io.jenkins.plugins.forensics.reference; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.jvnet.hudson.test.JenkinsRule; -import org.jvnet.hudson.test.junit.jupiter.WithJenkins; - -import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition; -import org.jenkinsci.plugins.workflow.job.WorkflowJob; - -@WithJenkins -class Java25ITest { - private JenkinsRule jenkins; - - @BeforeEach - @SuppressWarnings("checkstyle:HiddenField") - public void setUp(final JenkinsRule jenkins) { - this.jenkins = jenkins; - } - - @Test - void shouldOverwriteReferenceBuild() throws Exception { - var reference = jenkins.createProject(WorkflowJob.class); - reference.setDefinition(new CpsFlowDefinition( - """ - node { - echo 'Hello Job'; - discoverReferenceBuild(); - } - """, true)); - jenkins.buildAndAssertSuccess(reference); - } -}