Skip to content

Commit

Permalink
Merge branch 'master' into feat_retry
Browse files Browse the repository at this point in the history
  • Loading branch information
jglick authored Mar 14, 2024
2 parents 99cce8e + 1b29584 commit dbee45a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<extension>
<groupId>io.jenkins.tools.incrementals</groupId>
<artifactId>git-changelist-maven-extension</artifactId>
<version>1.3</version>
<version>1.6</version>
</extension>
</extensions>
5 changes: 2 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
buildPlugin(useContainerAgent: true, configurations: [
[ platform: "linux", jdk: "8" ],
[ platform: "windows", jdk: "8" ],
[ platform: "linux", jdk: "11" ]
[platform: 'linux', jdk: 21],
[platform: 'windows', jdk: 17],
])
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.42</version>
<version>4.75</version>
<relativePath />
</parent>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand Down Expand Up @@ -39,16 +39,16 @@
</pluginRepositories>
<properties>
<changelist>999999-SNAPSHOT</changelist>
<jenkins.version>2.289.3</jenkins.version>
<jenkins.version>2.387.3</jenkins.version>
<svnkit.version>1.10.1</svnkit.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.289.x</artifactId>
<version>1466.v85a_616ea_b_87c</version>
<artifactId>bom-2.387.x</artifactId>
<version>2465.va_e76ed7b_3061</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down Expand Up @@ -153,7 +153,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>mercurial</artifactId>
<version>2.12</version>
<version>1260.vdfb_723cdcc81</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit dbee45a

Please sign in to comment.