Skip to content

Commit

Permalink
Merge pull request #480 from basil/cleanup
Browse files Browse the repository at this point in the history
Bump Jenkins version to 2.249; clean up plugin parent POM
  • Loading branch information
jglick committed Dec 28, 2021
2 parents cd17304 + 8347830 commit 05c9e09
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 31 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ If you had a `jar:test-jar` execution, delete it and add to `properties`:
The plugin POM is designed for plugin builds with JDK 8 or above,
but target `java.level` for a plugin may differ from a JDK version used for the build.
Starting from Plugin POM `3.44`, support of Java 7 targets in Plugin POM is deprecated and has been removed in `4.0`,
`java.level=8` and `jenkins.version>2.204.1` are expected to be used for most plugins.
`java.level=8` and `jenkins.version>2.249.1` are expected to be used for most plugins.


## Incrementals
Expand Down
27 changes: 1 addition & 26 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<arguments />
<argLine>-Xms768M -Xmx768M -XX:+HeapDumpOnOutOfMemoryError -XX:+TieredCompilation -XX:TieredStopAtLevel=1</argLine>

<jenkins.version>2.204</jenkins.version>
<jenkins.version>2.249</jenkins.version>
<jenkins-bom.version>${jenkins.version}</jenkins-bom.version>

<jenkins-test-harness.version>1674.v3b8b1441e939</jenkins-test-harness.version>
Expand Down Expand Up @@ -231,18 +231,6 @@
</dependency>

<!-- static analysis -->
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<scope>provided</scope>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
Expand All @@ -265,19 +253,6 @@
<artifactId>commons-logging</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>access-modifier-annotation</artifactId>
<scope>provided</scope>
<optional>true</optional>
<exclusions>
<exclusion>
<!-- provided by Jenkins core -->
<groupId>org.jenkins-ci</groupId>
<artifactId>annotation-indexer</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.jenkins-ci.main</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/it/benchmark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<jenkins.version>2.204</jenkins.version>
<jenkins.version>2.249</jenkins.version>
<java.level>8</java.level>
</properties>
<repositories>
Expand Down
2 changes: 1 addition & 1 deletion src/it/incrementals-and-plugin-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<properties>
<revision>1.0</revision>
<changelist>-SNAPSHOT</changelist>
<jenkins.version>2.204</jenkins.version>
<jenkins.version>2.249</jenkins.version>
<java.level>8</java.level>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion src/it/sample-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<version>1.0-SNAPSHOT</version>
<packaging>hpi</packaging>
<properties>
<jenkins.version>2.204</jenkins.version>
<jenkins.version>2.249</jenkins.version>
<java.level>8</java.level>
</properties>
<repositories>
Expand Down
2 changes: 1 addition & 1 deletion src/it/undefined-java-level/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<version>1.0-SNAPSHOT</version>
<packaging>hpi</packaging>
<properties>
<jenkins.version>2.204</jenkins.version>
<jenkins.version>2.249</jenkins.version>
</properties>
<repositories>
<repository>
Expand Down

0 comments on commit 05c9e09

Please sign in to comment.