Skip to content

Commit

Permalink
Merge pull request #67 from MarkEWaite/dependabot/maven/org.jenkins-c…
Browse files Browse the repository at this point in the history
…i.plugins-plugin-4.74

Test with Java 21
  • Loading branch information
gmcdonald authored Nov 11, 2023
2 parents 9e48cd6 + c25daa4 commit 7b3a1d2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 36 deletions.
6 changes: 3 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildPlugin(
useContainerAgent: true,
configurations: [
[platform: 'linux', jdk: 17],
[platform: 'windows', jdk: 11],
[platform: 'linux', jdk: 21],
[platform: 'windows', jdk: 17],
]
)
)
34 changes: 1 addition & 33 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.70</version>
<version>4.74</version>
<relativePath />
</parent>

Expand All @@ -39,7 +39,6 @@
<version>0.23-SNAPSHOT</version>

<properties>
<java.level>11</java.level>
<java.net.id>bap</java.net.id>
<jenkins.version>2.361.4</jenkins.version>
</properties>
Expand All @@ -60,28 +59,10 @@
</developers>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
Expand All @@ -104,19 +85,6 @@
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<!-- upgrade to satisfy enforcer.
see https://wiki.jenkins.io/display/JENKINS/How+to+fix+RequireUpperBoundDeps#HowtofixRequireUpperBoundDeps-Howtofixrequireupperbounddependencieserror -->
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>symbol-annotation</artifactId>
<version>1.19</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

<scm>
<connection>scm:git:https://github.com/jenkinsci/publish-over-plugin.git</connection>
<developerConnection>scm:git:[email protected]:jenkinsci/publish-over-plugin.git</developerConnection>
Expand Down

0 comments on commit 7b3a1d2

Please sign in to comment.