Skip to content

Commit

Permalink
Add 2.492.x release line, remove 2.452.x release line (#4231)
Browse files Browse the repository at this point in the history
* Add 2.492.x release line, remove 2.452.x release line

Add 2.492.x release line
Remove 2.452.x line
Replace 2.452 with 2.462 in documentation
Document the (almost) final 2.452.x BOM version

Testing done

Confirmed that mvn clean verify and
PLUGINS=structs,mailer TEST=InjectedTest bash local-test.sh pass.

* Update final release of 2.452.x line

---------

Co-authored-by: Mark Waite <[email protected]>
  • Loading branch information
jplayout and MarkEWaite authored Jan 19, 2025
1 parent b9cd422 commit c252176
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 183 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ PLUGINS=structs,mailer TEST=InjectedTest bash local-test.sh
optionally also passing either

```
LINE=2.452.x
LINE=2.462.x
```

or
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ If you are interested in a Bill of Materials for Jenkins core components, see [t
After [selecting your plugin’s LTS baseline](https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/):

```xml
<jenkins.version>2.452.4</jenkins.version>
<jenkins.version>2.462.3</jenkins.version>
```

just import the [latest BOM](https://repo.jenkins-ci.org/public/io/jenkins/tools/bom) from that line:
Expand All @@ -24,7 +24,7 @@ just import the [latest BOM](https://repo.jenkins-ci.org/public/io/jenkins/tools
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.452.x</artifactId>
<artifactId>bom-2.462.x</artifactId>
<version>…</version>
<scope>import</scope>
<type>pom</type>
Expand Down Expand Up @@ -99,6 +99,7 @@ When an older Jenkins version is used, then the matching older version of the pl
| bom-2.414.x | 2982.vdce2153031a_0 | |
| bom-2.426.x | 3208.vb_21177d4b_cd9 | |
| bom-2.440.x | 3435.v238d66a_043fb_ | |
| bom-2.452.x | 3944.v1a_e4f8b_452db_ | |

The latest versions of all BOM lines are available from the [Jenkins artifact repository](https://repo.jenkins-ci.org/public/io/jenkins/tools/bom).

Expand Down
159 changes: 0 additions & 159 deletions bom-2.452.x/pom.xml

This file was deleted.

2 changes: 1 addition & 1 deletion bom-2.479.x/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bom-weekly</artifactId>
<artifactId>bom-2.492.x</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
Expand Down
23 changes: 23 additions & 0 deletions bom-2.492.x/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>parent</artifactId>
<version>${changelist}</version>
</parent>
<artifactId>bom-2.492.x</artifactId>
<packaging>pom</packaging>
<properties />
<dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bom-weekly</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
</project>
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
</licenses>
<modules>
<module>bom-weekly</module>
<module>bom-2.492.x</module>
<module>bom-2.479.x</module>
<module>bom-2.462.x</module>
<module>bom-2.452.x</module>
<module>sample-plugin</module>
</modules>
<scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
Expand Down
27 changes: 8 additions & 19 deletions sample-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1520,6 +1520,14 @@
</build>
<profiles>
<!-- Use .1 of most recent active line, and .3 (or later) of previous lines: https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/#choosing-a-version -->
<profile>
<id>2.492.x</id>
<properties>
<bom>2.492.x</bom>
<!-- TODO: Replace with 2.492.1 after release of 2.492.1 -->
<jenkins.version>2.492</jenkins.version>
</properties>
</profile>
<profile>
<id>2.479.x</id>
<properties>
Expand All @@ -1537,24 +1545,5 @@
<maven.compiler.release>11</maven.compiler.release>
</properties>
</profile>
<profile>
<id>2.452.x</id>
<properties>
<bom>2.452.x</bom>
<hpi-plugin.version>3.57</hpi-plugin.version>
<jenkins.version>2.452.4</jenkins.version>
<jenkins-test-harness.version>2225.2230.v6210cb_b_827f9</jenkins-test-harness.version>
<maven.compiler.release>11</maven.compiler.release>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>4.0.4</version>
</dependency>
</dependencies>
</dependencyManagement>
</profile>
</profiles>
</project>

0 comments on commit c252176

Please sign in to comment.