Skip to content

Commit 7d6ddb2

Browse files
authored
Require Java 21 in plugin pom (#1286)
1 parent dff0756 commit 7d6ddb2

File tree

15 files changed

+20
-30
lines changed

15 files changed

+20
-30
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ It provides a common build configuration for all Jenkins plugins.
1010

1111
## Requirements
1212

13+
Since version 6.2105.v0879858b_48d2, the plugin parent POM requires Jenkins 2.516 or newer and JDK 21 or newer.
1314
Since version 5.0, the plugin parent POM requires Jenkins 2.479 or newer and JDK 17 or newer.
1415
Since version 4.52, the plugin parent POM requires Jenkins 2.361 or newer and JDK 11 or newer.
1516
Since version 4.40, the plugin parent POM supports Java 17.
@@ -35,7 +36,7 @@ Then override the needed properties, e.g.:
3536
Take a look the developer documentation for the baseline version to use
3637
https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/#currently-recommended-versions
3738
-->
38-
<jenkins.version>2.361.4</jenkins.version>
39+
<jenkins.version>2.516.3</jenkins.version>
3940
</properties>
4041
```
4142

pom.xml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@
5454
</distributionManagement>
5555

5656
<properties>
57-
<revision>5</revision>
57+
<revision>6</revision>
5858
<changelist>999999-SNAPSHOT</changelist>
5959
<gitHubRepo>jenkinsci/plugin-pom</gitHubRepo>
6060
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6161
<project.build.outputEncoding>UTF-8</project.build.outputEncoding>
6262
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6363

64-
<maven.compiler.release>17</maven.compiler.release>
64+
<maven.compiler.release>21</maven.compiler.release>
6565
<maven.compiler.testRelease>${maven.compiler.release}</maven.compiler.testRelease>
6666
<!-- Generate metadata for reflection on method parameters -->
6767
<maven.compiler.parameters>true</maven.compiler.parameters>
@@ -83,7 +83,7 @@
8383
<incrementals-plugin.version>1.13</incrementals-plugin.version>
8484
<flatten-maven-plugin.version>1.7.3</flatten-maven-plugin.version>
8585
<jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
86-
<jenkins.version>2.479</jenkins.version>
86+
<jenkins.version>2.516</jenkins.version>
8787
<jenkins-bom.version>${jenkins.version}</jenkins-bom.version>
8888
<jenkins-test-harness.version>2543.va_0f3a_a_fd575d</jenkins-test-harness.version>
8989
<junit.version>6.0.1</junit.version>
@@ -1663,17 +1663,6 @@
16631663
<yarn.lint.skip>true</yarn.lint.skip>
16641664
</properties>
16651665
</profile>
1666-
<profile>
1667-
<id>java-level-17</id>
1668-
<activation>
1669-
<file>
1670-
<exists>target/java-level/17</exists>
1671-
</file>
1672-
</activation>
1673-
<properties>
1674-
<maven.compiler.release>17</maven.compiler.release>
1675-
</properties>
1676-
</profile>
16771666
<profile>
16781667
<id>java-level-21</id>
16791668
<activation>

src/it/ban-junit4-fail/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<version>1.0-SNAPSHOT</version>
1313
<packaging>hpi</packaging>
1414
<properties>
15-
<jenkins.version>2.479.3</jenkins.version>
15+
<jenkins.version>2.516.3</jenkins.version>
1616
<ban-junit4-imports.skip>false</ban-junit4-imports.skip>
1717
</properties>
1818
<repositories>

src/it/ban-junit4-pass/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<version>1.0-SNAPSHOT</version>
1313
<packaging>hpi</packaging>
1414
<properties>
15-
<jenkins.version>2.479.3</jenkins.version>
15+
<jenkins.version>2.516.3</jenkins.version>
1616
<ban-junit4-imports.skip>false</ban-junit4-imports.skip>
1717
</properties>
1818
<repositories>

src/it/benchmark/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<version>1.0-SNAPSHOT</version>
1313
<packaging>jar</packaging>
1414
<properties>
15-
<jenkins.version>2.479.1</jenkins.version>
15+
<jenkins.version>2.516.3</jenkins.version>
1616
</properties>
1717
<repositories>
1818
<repository>

src/it/beta-fail/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<module>downstream</module>
1717
</modules>
1818
<properties>
19-
<jenkins.version>2.479.1</jenkins.version>
19+
<jenkins.version>2.516.3</jenkins.version>
2020
<spotless.check.skip>false</spotless.check.skip>
2121
<maven-hpi-plugin.disabledTestInjection>true</maven-hpi-plugin.disabledTestInjection>
2222
</properties>

src/it/beta-just-testing/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<module>downstream</module>
1717
</modules>
1818
<properties>
19-
<jenkins.version>2.479.1</jenkins.version>
19+
<jenkins.version>2.516.3</jenkins.version>
2020
<spotless.check.skip>false</spotless.check.skip>
2121
<maven-hpi-plugin.disabledTestInjection>true</maven-hpi-plugin.disabledTestInjection>
2222
</properties>

src/it/beta-pass/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<module>downstream</module>
1717
</modules>
1818
<properties>
19-
<jenkins.version>2.479.1</jenkins.version>
19+
<jenkins.version>2.516.3</jenkins.version>
2020
<spotless.check.skip>false</spotless.check.skip>
2121
<maven-hpi-plugin.disabledTestInjection>true</maven-hpi-plugin.disabledTestInjection>
2222
</properties>

src/it/cd-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<name>CD plugin</name>
1515
<description>CD description</description>
1616
<properties>
17-
<jenkins.version>2.479.1</jenkins.version>
17+
<jenkins.version>2.516.3</jenkins.version>
1818
<changelist>999999-SNAPSHOT</changelist>
1919
<spotless.check.skip>false</spotless.check.skip>
2020
</properties>

src/it/incrementals-and-plugin-bom/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
<properties>
1515
<revision>1.0</revision>
1616
<changelist>-SNAPSHOT</changelist>
17-
<jenkins.version>2.479.1</jenkins.version>
17+
<jenkins.version>2.516.3</jenkins.version>
1818
<spotless.check.skip>false</spotless.check.skip>
1919
</properties>
2020
<dependencyManagement>
2121
<dependencies>
2222
<dependency>
2323
<groupId>io.jenkins.tools.bom</groupId>
24-
<artifactId>bom-2.479.x</artifactId>
25-
<version>3559.vb_5b_81183b_d23</version>
24+
<artifactId>bom-2.516.x</artifactId>
25+
<version>5857.vb_f3dd0731f44</version>
2626
<type>pom</type>
2727
<scope>import</scope>
2828
</dependency>

0 commit comments

Comments
 (0)