diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 90cace5819..a1d00de09b 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -30,5 +30,3 @@ updates:
- dependency-name: javax.servlet:javax.servlet-api
versions:
- ">= 0"
- # TODO https://github.com/spotbugs/spotbugs/issues/1601#issuecomment-885341270
- - dependency-name: com.github.spotbugs:spotbugs-maven-plugin
diff --git a/README.md b/README.md
index 8fe7b74602..e3293a3631 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
This new parent POM is decoupled from the core Jenkins project, both from the Maven and repository perspectives.
-Since version 4.0 the plugin pom supports Jenkins 2.200 and higher and a select few older LTS lines ([full list](https://repo.jenkins-ci.org/releases/org/jenkins-ci/main/jenkins-bom/))
+Since version 4.52 the plugin parent POM supports Jenkins 2.361 and higher.
The main changes are:
* Reduced number of overridable properties. All references (e.g. dependencies and plugin versions) not
@@ -37,14 +37,18 @@ In order to use the new POM:
org.jenkins-ci.plugins
plugin
- 4.31
+ VERSION
```
* Override the needed properties, e.g.:
```xml
- 2.303.1
+
+ 2.361.4
```
@@ -56,10 +60,8 @@ If you had a `jar:test-jar` execution, delete it and add to `properties`:
## Java support
-The plugin POM is designed for plugin builds with JDK 8 or above.
-Starting from Plugin POM `3.44`, support of Java 7 targets in Plugin POM is deprecated and has been removed in `4.0`,
-`jenkins.version>2.249.1` is expected to be used for most plugins.
-
+The plugin POM is designed for plugin builds with JDK 11 or above.
+Starting from Plugin POM `4.40`, support of Java 17 was added.
## Incrementals
diff --git a/pom.xml b/pom.xml
index 998cae6300..fa763361d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.jenkins-ci.plugins
plugin
- 4.43.1
+ 4.55
pom
Jenkins Plugin Parent POM
@@ -37,7 +37,7 @@
scm:git:https://github.com/jenkinsci/plugin-pom.git
scm:git:git@github.com:jenkinsci/plugin-pom.git
- plugin-4.43.1
+ plugin-4.55
https://github.com/jenkinsci/plugin-pom
@@ -58,39 +58,72 @@
UTF-8
UTF-8
+ 11
+ 11
true
+
+ --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED
-Xms768M -Xmx768M -XX:+HeapDumpOnOutOfMemoryError -XX:+TieredCompilation -XX:TieredStopAtLevel=1 @{jenkins.addOpens} @{jenkins.insaneHook}
- 2.249
+ 1.30
+ 3.3.0
+ 1.12.1
+ 2.1.0
+ 3.38
+ 1.0-beta-4
+ 1.6
+ 0.8.8
+ 2.361
${jenkins.version}
+ 1938.ve4c94459431d
+ 1.0.0
+ 1.31
+ 3.1.0
+ 3.4.2
+ 3.2.0
+ 3.10.1
+ 3.5.0
+ 3.1.0
+ 2.10
+ 3.2.1
+ 3.3.0
+ 3.1.0
+ 3.3.0
+ 3.5.0
+ 1.15
+ 3.4.2
+ 3.0.0-M7
+ 3.3.0
+ 3.12.1
+ 3.2.1
+ 3.0.0-M9
+ 3.3.2
+ 5.1.1
+ 4.7.3.0
+ 1.22
- 1802.v9de0d87365d2
-
- 3.28
- 1.17
-
- Medium
-
- Default
+
+ FindReturnRef
true
true
- 4.0.0
- 2.13.1
- 0.23.0
- 1.12.1
+ you-must-override-the-node.version-property
+ you-must-override-the-npm.version-property
+ you-must-override-the-yarn.version-property
https://repo.jenkins-ci.org/nodejs-dist/
https://repo.jenkins-ci.org/npm-dist/
@@ -106,13 +139,8 @@
true
- 4.6.1
- 1.27
- 1.21
-
false
- https://repo.jenkins-ci.org/incrementals/
HEAD
${project.build.directory}/tmp
@@ -128,35 +156,19 @@
import
- org.jenkins-ci.main
- jenkins-core
- ${jenkins.version}
-
-
- javax.servlet
- servlet-api
-
-
-
-
- org.jenkins-ci.main
- jenkins-war
- ${jenkins.version}
- executable-war
- test
-
-
- javax.servlet
- servlet-api
-
-
+ org.junit
+ junit-bom
+ 5.9.2
+ pom
+ import
- org.jenkins-ci.main
- jenkins-test-harness
- ${jenkins-test-harness.version}
+ org.mockito
+ mockito-bom
+ ${mockito.version}
+ pom
+ import
-
javax.servlet
@@ -168,17 +180,6 @@
junit
4.13.2
-
- org.codehaus.mojo
- animal-sniffer-annotations
- ${animal.sniffer.version}
-
-
- org.codehaus.mojo.signature
- java18
- 1.0
- signature
-
org.hamcrest
hamcrest-core
@@ -190,19 +191,33 @@
1.4
- org.mockito
- mockito-core
- ${mockito.version}
+ org.jenkins-ci.main
+ jenkins-core
+ ${jenkins.version}
+
+
+ javax.servlet
+ servlet-api
+
+
- org.mockito
- mockito-inline
- ${mockito.version}
+ org.jenkins-ci.main
+ jenkins-test-harness
+ ${jenkins-test-harness.version}
- org.objenesis
- objenesis
- 3.2
+ org.jenkins-ci.main
+ jenkins-war
+ ${jenkins.version}
+ executable-war
+ test
+
+
+ javax.servlet
+ servlet-api
+
+
@@ -229,22 +244,6 @@
provided
-
-
- net.jcip
- jcip-annotations
- provided
- true
-
-
-
-
-
- org.codehaus.mojo
- animal-sniffer-annotations
- provided
- true
-
@@ -264,8 +263,13 @@
test
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
test
@@ -292,54 +296,92 @@
${project.artifactId}
+
+ com.cloudbees
+ maven-license-plugin
+ ${maven-license-plugin.version}
+
+
+ com.github.spotbugs
+ spotbugs-maven-plugin
+ ${spotbugs-maven-plugin.version}
+
+
+
+ io.jenkins.tools.incrementals
+ incrementals-maven-plugin
+ ${incrementals-plugin.version}
+
+
+ org.jenkins-ci.*
+ io.jenkins.*
+
+ false
+ false
+
+
maven-antrun-plugin
- 3.1.0
+ ${maven-antrun-plugin.version}
+
+
+ maven-assembly-plugin
+ ${maven-assembly-plugin.version}
maven-clean-plugin
- 3.2.0
+ ${maven-clean-plugin.version}
maven-compiler-plugin
- 3.10.1
+ ${maven-compiler-plugin.version}
maven-dependency-plugin
- 3.3.0
+ ${maven-dependency-plugin.version}
- maven-jar-plugin
- 3.2.2
+ maven-deploy-plugin
+ ${maven-deploy-plugin.version}
- maven-resources-plugin
- 3.2.0
+ maven-eclipse-plugin
+ ${maven-eclipse-plugin.version}
+
+
+ target/eclipse-classes
+
+
+ org.eclipse.jdt.groovy.core.groovyNature
+
+
- maven-surefire-plugin
- 3.0.0-M7
+ maven-enforcer-plugin
+ ${maven-enforcer-plugin.version}
maven-failsafe-plugin
- 3.0.0-M7
+ ${maven-surefire-plugin.version}
-
- maven-deploy-plugin
- 2.8.2
+ maven-help-plugin
+ ${maven-help-plugin.version}
- maven-enforcer-plugin
- 3.1.0
+ maven-install-plugin
+ ${maven-install-plugin.version}
- maven-install-plugin
- 3.0.0-M1
+ maven-jar-plugin
+ ${maven-jar-plugin.version}
maven-javadoc-plugin
- 3.4.0
+ ${maven-javadoc-plugin.version}
true
@@ -349,50 +391,43 @@
en_US
+
+ maven-project-info-reports-plugin
+ ${maven-project-info-reports-plugin.version}
+
maven-release-plugin
- 3.0.0-M6
+ ${maven-release-plugin.version}
- maven-site-plugin
- 3.12.0
+ maven-resources-plugin
+ ${maven-resources-plugin.version}
- maven-project-info-reports-plugin
- 3.3.0
+ maven-site-plugin
+ ${maven-site-plugin.version}
maven-source-plugin
- 3.2.1
+ ${maven-source-plugin.version}
- maven-war-plugin
- 3.3.2
+ maven-surefire-plugin
+ ${maven-surefire-plugin.version}
- maven-eclipse-plugin
- 2.10
-
-
- target/eclipse-classes
-
-
- org.eclipse.jdt.groovy.core.groovyNature
-
-
+ maven-war-plugin
+ ${maven-war-plugin.version}
org.codehaus.gmavenplus
gmavenplus-plugin
- 1.13.1
+ ${gmavenplus-plugin.version}
org.codehaus.mojo
build-helper-maven-plugin
- 3.3.0
+ ${build-helper-maven-plugin.version}
add-source
@@ -411,27 +446,17 @@
org.jacoco
jacoco-maven-plugin
- 0.8.8
-
-
- org.kohsuke.stapler
- maven-stapler-plugin
- ${stapler-plugin.version}
+ ${jacoco-maven-plugin.version}
org.jenkins-ci.tools
maven-hpi-plugin
${hpi-plugin.version}
-
- org.codehaus.mojo
- animal-sniffer-maven-plugin
- ${animal.sniffer.version}
-
org.jvnet.localizer
localizer-maven-plugin
- 1.31
+ ${localizer-maven-plugin.version}
org.kohsuke
@@ -439,28 +464,9 @@
${access-modifier-checker.version}
- com.cloudbees
- maven-license-plugin
- 1.10
-
-
-
- io.jenkins.tools.incrementals
- incrementals-maven-plugin
- 1.3
-
-
- org.jenkins-ci.*
- io.jenkins.*
-
- false
- false
-
-
-
- com.github.spotbugs
- spotbugs-maven-plugin
- 4.2.3
+ org.kohsuke.stapler
+ maven-stapler-plugin
+ ${stapler-plugin.version}
@@ -490,7 +496,7 @@
org.codehaus.mojo
extra-enforcer-rules
- 1.6.0
+ 1.6.1
@@ -508,7 +514,7 @@
3.8.1 required to no longer download dependencies via HTTP (use HTTPS instead).
- [1.8.0,)
+ [${maven.compiler.release},)
- 1.8
+ ${maven.compiler.release}
test
-
-
- org.jenkins-ci.main:jenkins-core
- org.jenkins-ci.main:cli
- org.jenkins-ci.main:jenkins-test-harness
- org.jenkins-ci.main:remoting
- org.kohsuke.stapler:stapler
- org.kohsuke.stapler:stapler-groovy
- org.kohsuke.stapler:stapler-jelly
- org.kohsuke.stapler:stapler-jrebel
- org.jenkins-ci:task-reactor
-
- com.google.code.findbugs:annotations
- com.github.spotbugs:spotbugs-annotations
-
-
+
true
false
- ${spotbugs.effort}
- ${spotbugs.threshold}
-
- org.codehaus.mojo
- animal-sniffer-maven-plugin
-
-
- org.codehaus.mojo.signature
- java18
-
-
-
-
- check
-
- check
-
- test
-
-
-
maven-eclipse-plugin
@@ -724,7 +694,6 @@
maven-hpi-plugin
true
- true
/jenkins
@@ -736,13 +705,11 @@
org.kohsuke.stapler
maven-stapler-plugin
- true
maven-release-plugin
forked-path
- false
clean install
deploy
${arguments}
@@ -820,6 +787,7 @@
-1
${surefireTempDir}
true
+ $${surefire.forkNumber}
alphabetical
false
@@ -883,7 +851,7 @@
org.codehaus.mojo
mrm-maven-plugin
- 1.4.1
+ 1.5.0
false
@@ -902,7 +870,7 @@
maven-invoker-plugin
- 3.3.0
+ 3.5.0
false
@@ -928,80 +896,6 @@
-
- jdk-8-and-below
-
- (,1.8]
-
-
- 1.8
- 1.8
- 1.8
- 1.8
-
-
-
-
-
- jdk-9-and-above
-
- [9,)
-
-
-
- 8
- 8
-
- true
-
- true
-
- --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED
-
-
-
-
-
- maven-enforcer-plugin
-
-
- display-info
-
-
-
- 11
-
-
-
-
-
-
-
-
-
jenkins-release
@@ -1064,7 +958,7 @@
org.eclipse.m2e
lifecycle-mapping
- 1.0.0
+ ${lifecycle-mapping.version}
@@ -1318,11 +1212,6 @@
yarn
initialize
-
-
-
- --mutex network
-
@@ -1367,7 +1256,6 @@
- org.apache.maven.plugins
maven-clean-plugin
@@ -1394,7 +1282,7 @@
false
incrementals
- ${incrementals.url}
+ https://repo.jenkins-ci.org/incrementals/
@@ -1403,7 +1291,7 @@
false
incrementals
- ${incrementals.url}
+ https://repo.jenkins-ci.org/incrementals/
@@ -1414,7 +1302,7 @@
org.codehaus.mojo
flatten-maven-plugin
- 1.2.7
+ 1.3.0
true
@@ -1439,7 +1327,7 @@
io.jenkins.tools.incrementals
incrementals-enforcer-rules
- 1.3
+ ${incrementals-plugin.version}
@@ -1447,9 +1335,9 @@
display-info
-
- [1.0-beta-4,)
-
+
+ [${incrementals-enforce-minimum.version},)
+
@@ -1475,7 +1363,7 @@
incrementals
- ${incrementals.url}
+ https://repo.jenkins-ci.org/incrementals/
@@ -1540,7 +1428,6 @@
- org.apache.maven.plugins
maven-surefire-plugin
@@ -1554,7 +1441,7 @@
-
+
quick-build
@@ -1562,10 +1449,10 @@
true
true
true
- true
true
true
true
+ true
diff --git a/src/it/benchmark/pom.xml b/src/it/benchmark/pom.xml
index d57c4ed650..29e42e148d 100644
--- a/src/it/benchmark/pom.xml
+++ b/src/it/benchmark/pom.xml
@@ -13,7 +13,7 @@
1.0-SNAPSHOT
jar
- 2.249
+ 2.361.4
diff --git a/src/it/beta-fail/pom.xml b/src/it/beta-fail/pom.xml
index a717e3df0f..ca0e2cbdb4 100644
--- a/src/it/beta-fail/pom.xml
+++ b/src/it/beta-fail/pom.xml
@@ -13,7 +13,7 @@
1.0-SNAPSHOT
pom
- 2.277.4
+ 2.361.4
true
diff --git a/src/it/beta-just-testing/pom.xml b/src/it/beta-just-testing/pom.xml
index d227e8e0db..c00be0c598 100644
--- a/src/it/beta-just-testing/pom.xml
+++ b/src/it/beta-just-testing/pom.xml
@@ -13,7 +13,7 @@
1.0-SNAPSHOT
pom
- 2.277.4
+ 2.361.4
true
diff --git a/src/it/beta-pass/pom.xml b/src/it/beta-pass/pom.xml
index ca71cc86ec..ca608bea28 100644
--- a/src/it/beta-pass/pom.xml
+++ b/src/it/beta-pass/pom.xml
@@ -13,7 +13,7 @@
1.0-SNAPSHOT
pom
- 2.277.4
+ 2.361.4
true
diff --git a/src/it/incrementals-and-plugin-bom/pom.xml b/src/it/incrementals-and-plugin-bom/pom.xml
index d0059d0bb3..692048a441 100644
--- a/src/it/incrementals-and-plugin-bom/pom.xml
+++ b/src/it/incrementals-and-plugin-bom/pom.xml
@@ -14,7 +14,7 @@
1.0
-SNAPSHOT
- 2.249
+ 2.361.4
@@ -33,8 +33,8 @@
io.jenkins.tools.bom
- bom-2.176.x
- 4
+ bom-2.361.x
+ 1580.v47b_429a_c853a
import
pom
diff --git a/src/it/localizer/pom.xml b/src/it/localizer/pom.xml
index b4c4a89dbc..3fef41c086 100644
--- a/src/it/localizer/pom.xml
+++ b/src/it/localizer/pom.xml
@@ -13,7 +13,7 @@
1.0-SNAPSHOT
hpi
- 2.277.4
+ 2.361.4
true
diff --git a/src/it/sample-plugin/pom.xml b/src/it/sample-plugin/pom.xml
index fe1f63f273..4f55b0b0a3 100644
--- a/src/it/sample-plugin/pom.xml
+++ b/src/it/sample-plugin/pom.xml
@@ -13,7 +13,7 @@
1.0-SNAPSHOT
hpi
- 2.249
+ 2.361.4