Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 2.462.x release line, remove 2.426.x #3374

Merged
merged 16 commits into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 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.426.3</jenkins.version>
<jenkins.version>2.440.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.426.x</artifactId>
<artifactId>bom-2.440.x</artifactId>
<version>…</version>
<scope>import</scope>
<type>pom</type>
Expand Down Expand Up @@ -97,6 +97,7 @@ When an older Jenkins version is used, then the matching older version of the pl
| bom-2.387.x | 2543.vfb_1a_5fb_9496d | |
| bom-2.401.x | 2745.vc7b_fe4c876fa_ | |
| bom-2.414.x | 2982.vdce2153031a_0 | |
| bom-2.426.x | 3193.v330d8248d39e | |

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 Expand Up @@ -182,7 +183,7 @@ PLUGINS=structs,mailer TEST=InjectedTest bash local-test.sh
optionally also passing either

```
LINE=2.426.x
LINE=2.440.x
```

or
Expand Down
115 changes: 0 additions & 115 deletions bom-2.426.x/pom.xml

This file was deleted.

2 changes: 1 addition & 1 deletion bom-2.452.x/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bom-weekly</artifactId>
<artifactId>bom-2.462.x</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
Expand Down
22 changes: 22 additions & 0 deletions bom-2.462.x/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?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.462.x</artifactId>
<packaging>pom</packaging>
<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>
10 changes: 0 additions & 10 deletions pct.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,6 @@ if ! [[ $PLUGINS =~ blueocean || $PLUGINS =~ lockable-resources || $PLUGINS =~ p
PCT_D_ARGS+='-DforkCount=.75C '
fi

#
# jenkinsci/workflow-cps-plugin#877 depends on jenkinsci/jenkins#9012, but only
# on Java 17 and newer. The 2.426.x line is the only remaining line to which
# jenkinsci/jenkins#9012 has not been backported. When we drop support for
# 2.426.x, this should be deleted.
#
if [[ $PLUGINS =~ pipeline-groovy-lib && $LINE == 2.426.x ]]; then
echo 'org.jenkinsci.plugins.workflow.libs.LibraryMemoryTest#loaderReleased' >>excludes.txt
fi

exec java \
-jar target/pct.jar \
test-plugins \
Expand Down
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.462.x</module>
<module>bom-2.452.x</module>
<module>bom-2.440.x</module>
<module>bom-2.426.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
17 changes: 9 additions & 8 deletions sample-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1089,11 +1089,19 @@
</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.462.x</id>
<properties>
<bom>2.462.x</bom>
<!-- TODO: Update to 2.462.1 after it is released. -->
<jenkins.version>2.462</jenkins.version>
</properties>
</profile>
<profile>
<id>2.452.x</id>
<properties>
<bom>2.452.x</bom>
<jenkins.version>2.452.1</jenkins.version>
<jenkins.version>2.452.3</jenkins.version>
</properties>
</profile>
<profile>
Expand All @@ -1103,12 +1111,5 @@
<jenkins.version>2.440.3</jenkins.version>
</properties>
</profile>
<profile>
<id>2.426.x</id>
<properties>
<bom>2.426.x</bom>
<jenkins.version>2.426.3</jenkins.version>
</properties>
</profile>
</profiles>
</project>