Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ PLUGINS=structs,mailer TEST=InjectedTest bash local-test.sh
optionally also passing either

```
LINE=2.516.x
LINE=2.528.x
```

or
Expand Down
3 changes: 2 additions & 1 deletion 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.baseline>2.516</jenkins.baseline>
<jenkins.baseline>2.528</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
```

Expand Down Expand Up @@ -105,6 +105,7 @@ When an older Jenkins version is used, then the matching older version of the pl
| 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 | |
| bom-2.516.x | 6210.v69ea_fd8a_f010 | |

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
82 changes: 0 additions & 82 deletions bom-2.516.x/pom.xml

This file was deleted.

13 changes: 1 addition & 12 deletions bom-2.541.x/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,11 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bom-weekly</artifactId>
<artifactId>bom-2.555.x</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<version>${workflow-job-plugin.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<version>${workflow-job-plugin.version}</version>
<classifier>tests</classifier>
</dependency>
Comment on lines -23 to -33

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are these lines removed?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because they have moved into the bom-2.555.x line. We don't want to duplicate the dependencies when we can inherit them.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see 👍🏼

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

</dependencies>
</dependencyManagement>
</project>
36 changes: 36 additions & 0 deletions bom-2.555.x/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?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.555.x</artifactId>
<packaging>pom</packaging>
<properties>
<workflow-job-plugin.version>1571.vb_423c255d6d9</workflow-job-plugin.version>
</properties>
Comment on lines +11 to +13

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure if we need this or just

  <properties />

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need because of the "normal" and tests classifiers.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need it because the workflow-job plugin is a special case. The most recent release requires Jenkins 2.556 or newer.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Now I see

<dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bom-weekly</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<version>${workflow-job-plugin.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<version>${workflow-job-plugin.version}</version>
<classifier>tests</classifier>
</dependency>
Comment on lines +23 to +33

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure we need these, and why is the same dependency duplicated?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are not the same. From Maven documentation:

: The classifier distinguishes artifacts that were built from the same POM but differ in content. It is some optional and arbitrary string that - if present - is appended to the artifact name just after the version number.

Technically, the tests classifier means that it's a JAR that contains the src/test/** content. This is useful when a you can mutualize the test setup for example.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need both because one is the production dependency and the other is the test dependency. The workflow-job plugin is an uncommon plugin (like the git plugin). It provides both a production jar and a test jar. Both the production jar and the test jar are used by other plugins

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Sorry I missed the tests part

</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.555.x</module>
<module>bom-2.541.x</module>
<module>bom-2.528.x</module>
<module>bom-2.516.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
2 changes: 1 addition & 1 deletion release-manager-scripts/bom-test-all-lines.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ if [[ $# -ne 1 ]]; then
fi

${HERE}/bom-line-test.sh weekly $1
${HERE}/bom-line-test.sh 2.551.x $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
15 changes: 8 additions & 7 deletions sample-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1697,6 +1697,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.555.x</id>
<properties>
<bom>2.555.x</bom>
<!-- TODO: Replace with 2.555.1 after release of 2.555.1 -->
<jenkins.version>2.555</jenkins.version>
</properties>
</profile>
<profile>
<id>2.541.x</id>
<properties>
Expand All @@ -1711,12 +1719,5 @@
<jenkins.version>2.528.3</jenkins.version>
</properties>
</profile>
<profile>
<id>2.516.x</id>
<properties>
<bom>2.516.x</bom>
<jenkins.version>2.516.3</jenkins.version>
</properties>
</profile>
</profiles>
</project>