Skip to content

Commit

Permalink
Test with Java 21, dependencies clean-up and modernization. (#173)
Browse files Browse the repository at this point in the history
* fix(maven): Dependency clean-up

* fix(maven): Dependency clean-up

* fix(jenkins): No more JDK11

* fix(jenkins): No more JDK11

* fix(maven): Dependency clean-up

* fix(maven): Dependency clean-up

* fix(maven): Dependency clean-up

* fix(maven): Dependency clean-up

* fix(maven): Dependency clean-up
  • Loading branch information
gounthar authored Oct 5, 2023
1 parent b32d07a commit 5701b45
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 40 deletions.
18 changes: 10 additions & 8 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#!/usr/bin/env groovy

/* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
buildPlugin(useContainerAgent: true, configurations: [
[platform: 'linux', jdk: 21], // Linux first for coverage report on ci.jenkins.io
[platform: 'linux', jdk: 17],
[platform: 'windows', jdk: 11],
])
/*
See the documentation for more options:
https://github.com/jenkins-infra/pipeline-library/
*/
buildPlugin(
useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
configurations: [
[platform: 'linux', jdk: 21],
[platform: 'windows', jdk: 17],
])
33 changes: 1 addition & 32 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<properties>
<revision>3.1.5</revision>
<changelist>999999-SNAPSHOT</changelist>
<jenkins.version>2.410</jenkins.version>
<jenkins.version>2.401.3</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
</properties>

Expand Down Expand Up @@ -83,37 +83,6 @@
<version>3.24.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>pipeline-stage-step</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-durable-task-step</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-basic-steps</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<scm>
Expand Down

0 comments on commit 5701b45

Please sign in to comment.