Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test with Java 21 #102

Merged
merged 10 commits into from
Oct 14, 2023
Merged

Test with Java 21 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d07173d
Bump git-changelist-maven-extension from 1.4 to 1.6
dependabot[bot] Feb 20, 2023
7409b1c
use jsch plugin instead of version bundled in groovy-ssh library to s…
globalbus Sep 1, 2023
3d310fc
Require 2.361.4 and use bom-2.361.x
MarkEWaite Oct 14, 2023
3ce02a3
Use lombok 1.18.30 for Java 21 compatibility
MarkEWaite Oct 14, 2023
5a29e27
Use parent pom 4.74 for Java 21 compatibility
MarkEWaite Oct 14, 2023
a499388
Merge branch 'globalbus/master' into test-with-java-21
MarkEWaite Oct 14, 2023
6be15cb
Merge branch 'dependabot/maven/io.jenkins.tools.incrementals-git-chan…
MarkEWaite Oct 14, 2023
09db427
Use git changelist extension 1.7
MarkEWaite Oct 14, 2023
1bb6433
Test with Java 21
MarkEWaite Oct 14, 2023
f3e4961
Fix Jenkinsfile syntax error
MarkEWaite Oct 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading