Skip to content

Commit a20a1a5

Browse files
authored
Merge pull request #344 from MarkEWaite/octopus
Compile and test with Java 25
2 parents a086426 + 234e578 commit a20a1a5

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

.mvn/extensions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<extension>
33
<groupId>io.jenkins.tools.incrementals</groupId>
44
<artifactId>git-changelist-maven-extension</artifactId>
5-
<version>1.10</version>
5+
<version>1.13</version>
66
</extension>
77
</extensions>

Jenkinsfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
buildPlugin(useContainerAgent: true, configurations: [
22
[platform: 'linux', jdk: 21],
33
[platform: 'windows', jdk: 17],
4+
[platform: 'linux', jdk: 25],
45
])

pom.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<groupId>org.jenkins-ci.plugins</groupId>
3030
<artifactId>plugin</artifactId>
31-
<version>5.24</version>
31+
<version>5.26</version>
3232
<relativePath />
3333
</parent>
3434
<groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -64,10 +64,12 @@
6464
<properties>
6565
<changelist>999999-SNAPSHOT</changelist>
6666
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
67-
<jenkins.baseline>2.479</jenkins.baseline>
67+
<jenkins.baseline>2.504</jenkins.baseline>
6868
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
6969
<no-test-jar>false</no-test-jar>
7070
<useBeta>true</useBeta>
71+
<hpi.bundledArtifacts>jboss-marshalling,jboss-marshalling-river</hpi.bundledArtifacts>
72+
<hpi.strictBundledArtifacts>true</hpi.strictBundledArtifacts>
7173
<hpi.compatibleSinceVersion>3.0</hpi.compatibleSinceVersion>
7274
<hpi.strictBundledArtifacts>true</hpi.strictBundledArtifacts>
7375
<hpi.bundledArtifacts>jboss-marshalling,jboss-marshalling-river</hpi.bundledArtifacts>
@@ -78,7 +80,7 @@
7880
<dependency>
7981
<groupId>io.jenkins.tools.bom</groupId>
8082
<artifactId>bom-${jenkins.baseline}.x</artifactId>
81-
<version>5015.vb_52d36583443</version>
83+
<version>5388.v3ea_2e00a_719a_</version>
8284
<scope>import</scope>
8385
<type>pom</type>
8486
</dependency>

0 commit comments

Comments
 (0)