From 611fc827399ff094f1098ac9921dcd04ccdf273c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Sep 2023 09:27:22 +0000 Subject: [PATCH 1/5] build: bump org.jenkins-ci.plugins:plugin from 4.71 to 4.73 Bumps [org.jenkins-ci.plugins:plugin](https://github.com/jenkinsci/plugin-pom) from 4.71 to 4.73. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/plugin-pom/compare/plugin-4.71...plugin-4.73) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e0d26202..2812291f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.plugins plugin - 4.71 + 4.73 From d8e6d6e43b7625caad4359b25eb183cd6f620d78 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sun, 8 Oct 2023 06:07:09 -0600 Subject: [PATCH 2/5] Use parent pom 4.74 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2812291f..e6b6985d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.plugins plugin - 4.73 + 4.74 From b3b352fe13cc6d7925ccf1f13bbcae9179115383 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sun, 8 Oct 2023 06:08:28 -0600 Subject: [PATCH 3/5] Remove hamcrest dependency, declared in parent --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index e6b6985d..9b0474f5 100644 --- a/pom.xml +++ b/pom.xml @@ -124,11 +124,6 @@ org.jenkins-ci.plugins script-security - - org.hamcrest - hamcrest - test - org.jenkins-ci.plugins matrix-auth From 64760f35e0fe6c858b0d2db7f33f96203e30935b Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sun, 8 Oct 2023 06:11:08 -0600 Subject: [PATCH 4/5] Annotate deprecated method Deprecation of the method happened at the same time as the other deeprecations in the file, but the Deprecated annotation was missed on this method but included on the other methods. --- .../plugins/envinject/service/EnvInjectVariableGetter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/jenkinsci/plugins/envinject/service/EnvInjectVariableGetter.java b/src/main/java/org/jenkinsci/plugins/envinject/service/EnvInjectVariableGetter.java index 7a4d0511..6641416c 100644 --- a/src/main/java/org/jenkinsci/plugins/envinject/service/EnvInjectVariableGetter.java +++ b/src/main/java/org/jenkinsci/plugins/envinject/service/EnvInjectVariableGetter.java @@ -88,6 +88,7 @@ public static Map getJenkinsSystemEnvVars(boolean forceOnMaster) /** * @deprecated Use {@link RunHelper#getBuildVariables(hudson.model.Run, hudson.EnvVars)} */ + @Deprecated public Map getBuildVariables(@NonNull AbstractBuild build, @NonNull EnvInjectLogger logger) throws EnvInjectException { return RunHelper.getBuildVariables(build, logger); } From 48ff05dd1c6fc8df72a160e198e68f9ca6cff93f Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sun, 8 Oct 2023 06:16:04 -0600 Subject: [PATCH 5/5] Test with Java 21 Java 21 released Sep 19, 2023. We'd like to announce full support for Java 21 in early October and would like the most used plugins to be compiling and testing with Java 21. The acceptance test harness and plugin bill of materials tests are already passing with Java 21. This is a further step to improve plugin readiness for use with Java 21 and for development with Java 21. Java 11 will be unsupported by Eclipse Temurin and some other Java providers in October 2024. We'll need to move past Java 11 by that time. It does not change the supported Java version or the byte code that is being generated. This intentionally does not include Java 11 in the test configuration because Java 11 byte code is being generated by Java 17 and Java 21 compilation and tested in those configurations. Also improves test performance on ci.jenkins.io by running in parallel. --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8d38b971..8d889691 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -buildPlugin(useContainerAgent: true, configurations: [ - [platform: 'linux', jdk: 17], - [platform: 'windows', jdk: 11], +buildPlugin(useContainerAgent: true, forkCount: '1C', configurations: [ + [platform: 'linux', jdk: 21], + [platform: 'windows', jdk: 17], ])