Skip to content

Commit

Permalink
Test with Java 21 (#102)
Browse files Browse the repository at this point in the history
* Bump git-changelist-maven-extension from 1.4 to 1.6

Bumps [git-changelist-maven-extension](https://github.com/jenkinsci/incrementals-tools) from 1.4 to 1.6.
- [Release notes](https://github.com/jenkinsci/incrementals-tools/releases)
- [Commits](jenkinsci/incrementals-tools@parent-1.4...parent-1.6)

---
updated-dependencies:
- dependency-name: io.jenkins.tools.incrementals:git-changelist-maven-extension
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* use jsch plugin instead of version bundled in groovy-ssh library to support newer algorithms

* Require 2.361.4 and use bom-2.361.x

* Use lombok 1.18.30 for Java 21 compatibility

* Use parent pom 4.74 for Java 21 compatibility

* Use git changelist extension 1.7

* Test with Java 21

Java 21 was released Sep 19, 2023. We want to announce full support
for Java 21 in early October and would like the most used plugins to be
compiled and tested 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.

The change intentionally tests only two Java configurations, Java 17
and Java 21 because we believe that the risk of a regression that only
affects Java 11 is low. We generate Java 11 byte code with the Java 17
and the Java 21 builds, so we're already testing Java 11 byte code.

* Fix Jenkinsfile syntax error

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: globalbus <[email protected]>
  • Loading branch information
3 people authored Oct 14, 2023
1 parent 85560e4 commit ad21a12
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<extension>
<artifactId>git-changelist-maven-extension</artifactId>
<groupId>io.jenkins.tools.incrementals</groupId>
<version>1.4</version>
<version>1.7</version>
</extension>
</extensions>
3 changes: 2 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
buildPlugin(
useContainerAgent: true,
configurations: [
[platform: 'linux', jdk: 11]
[platform: 'linux', jdk: 21],
[platform: 'windows', jdk: 17],
])
30 changes: 14 additions & 16 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.54</version>
<version>4.74</version>
</parent>
<artifactId>ssh-steps</artifactId>
<version>${revision}.${changelist}</version>
Expand All @@ -16,11 +16,10 @@
<properties>
<revision>2.0</revision>
<changelist>999999-SNAPSHOT</changelist>
<java.level>8</java.level>
<jenkins.version>2.361.1</jenkins.version>
<jenkins.version>2.361.4</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<groovy.ssh.version>2.10.1</groovy.ssh.version>
<lombok.version>1.18.24</lombok.version>
<lombok.version>1.18.30</lombok.version>
<assertj-core.version>3.24.2</assertj-core.version>
</properties>
<licenses>
Expand Down Expand Up @@ -60,11 +59,11 @@
<dependencyManagement>
<dependencies>
<dependency>
<artifactId>bom-2.332.x</artifactId>
<artifactId>bom-2.361.x</artifactId>
<groupId>io.jenkins.tools.bom</groupId>
<scope>import</scope>
<type>pom</type>
<version>1763.v092b_8980a_f5e</version>
<version>2102.v854b_fec19c92</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand All @@ -74,6 +73,10 @@
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-step-api</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>jsch</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
Expand All @@ -85,20 +88,20 @@
<artifactId>groovy-ssh</artifactId>
<version>${groovy.ssh.version}</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>com.jcraft</groupId>
</exclusion>
<exclusion>
<artifactId>groovy-all</artifactId>
<groupId>org.codehaus.groovy</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<!-- Test Dependencies -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -107,11 +110,6 @@
<version>5.13.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
Expand Down

0 comments on commit ad21a12

Please sign in to comment.