Add 2.541.x line and remove 2.504.x

CONTRIBUTING.md

@@ -84,7 +84,7 @@ PLUGINS=structs,mailer TEST=InjectedTest bash local-test.sh
 optionally also passing either
 
 ```
-LINE=2.504.x
+LINE=2.516.x
 ```
 
 or

README.md

@@ -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.baseline>2.504</jenkins.baseline>
+<jenkins.baseline>2.516</jenkins.baseline>
 <jenkins.version>${jenkins.baseline}.3</jenkins.version>
 ```
 
@@ -104,6 +104,7 @@ When an older Jenkins version is used, then the matching older version of the pl
 | bom-2.462.x | 4228.v0a_71308d905b_  | Last LTS to support Java 11  |
 | bom-2.479.x | 5054.v620b_5d2b_d5e6  | First LTS to require Java 17 |
 | bom-2.492.x | 5473.vb_9533d9e5d88   |                              |
+| bom-2.504.x | 5983.v443959746f1f    |                              |
 
 The latest versions of all BOM lines are available from the [Jenkins artifact repository](https://repo.jenkins-ci.org/public/io/jenkins/tools/bom).
 

bom-2.528.x/pom.xml

@@ -16,7 +16,7 @@
     <dependencies>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>bom-weekly</artifactId>
+        <artifactId>bom-2.541.x</artifactId>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>

bom-2.541.x/pom.xml

@@ -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.541.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>

excludes.txt

@@ -17,9 +17,3 @@ org.jenkinsci.plugins.pipeline.modeldefinition.TriggersTest
 
 # TODO Blue Ocean Bitbucket test fails for Wiremock mismatch: https://github.com/jenkinsci/blueocean-plugin/pull/2654
 io.jenkins.blueocean.blueocean_bitbucket_pipeline.server.BitbucketPipelineCreateRequestTest
-
-# TODO Remove when 2.504.x line is dropped https://github.com/jenkinsci/bom/pull/5751#issuecomment-3338544666
-# CasC output updated in new release but the ldap and azure-vm-agents releases with the updated test require 2.516.x or newer
-com.microsoft.azure.vmagent.test.jcasc.AdvancedConfigAsCodeTest#exportExportConfiguration
-com.microsoft.azure.vmagent.test.jcasc.BasicConfigAsCodeTest#exportBasicConfiguration
-jenkins.security.plugins.ldap.CascSecurityRealmTest#export_ldap_no_secret

pom.xml

@@ -20,9 +20,9 @@
   </licenses>
   <modules>
     <module>bom-weekly</module>
+    <module>bom-2.541.x</module>
     <module>bom-2.528.x</module>
     <module>bom-2.516.x</module>
-    <module>bom-2.504.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">

release-manager-scripts/bom-test-all-lines.sh

@@ -9,6 +9,6 @@ if [[ $# -ne 1 ]]; then
 fi
 
 ${HERE}/bom-line-test.sh weekly $1
+${HERE}/bom-line-test.sh 2.541.x $1
 ${HERE}/bom-line-test.sh 2.528.x $1
 ${HERE}/bom-line-test.sh 2.516.x $1
-${HERE}/bom-line-test.sh 2.504.x $1

sample-plugin/pom.xml

@@ -1757,6 +1757,13 @@
   </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.541.x</id>
+      <properties>
+        <bom>2.541.x</bom>
+        <jenkins.version>2.541.1-rc37778.ff54607d5228</jenkins.version>
+      </properties>
+    </profile>
     <profile>
       <id>2.528.x</id>
       <properties>
@@ -1771,12 +1778,5 @@
         <jenkins.version>2.516.3</jenkins.version>
       </properties>
     </profile>
-    <profile>
-      <id>2.504.x</id>
-      <properties>
-        <bom>2.504.x</bom>
-        <jenkins.version>2.504.3</jenkins.version>
-      </properties>
-    </profile>
   </profiles>
 </project>