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
22 changes: 22 additions & 0 deletions bom-2.235.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>${revision}${changelist}</version>
</parent>
<artifactId>bom-2.235.x</artifactId>
<packaging>pom</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bom-2.249.x</artifactId>
<version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>
</project>
8 changes: 4 additions & 4 deletions bom-latest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<artifactId>parent</artifactId>
<version>${revision}${changelist}</version>
</parent>
<artifactId>bom-2.235.x</artifactId>
<artifactId>bom-2.249.x</artifactId>
<packaging>pom</packaging>
<properties>
<configuration-as-code-plugin.version>1.43</configuration-as-code-plugin.version>
<git-plugin.version>4.3.0</git-plugin.version>
<scm-api-plugin.version>2.6.3</scm-api-plugin.version>
<structs-plugin.version>1.20</structs-plugin.version>
<workflow-api-plugin.version>2.40</workflow-api-plugin.version>
<workflow-cps-plugin.version>2.82</workflow-cps-plugin.version>
<workflow-cps-plugin.version>2.83</workflow-cps-plugin.version>
<workflow-job-plugin.version>2.39</workflow-job-plugin.version>
<workflow-step-api-plugin.version>2.22</workflow-step-api-plugin.version>
<workflow-support-plugin.version>3.5</workflow-support-plugin.version>
Expand Down Expand Up @@ -226,12 +226,12 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>pipeline-build-step</artifactId>
<version>2.12</version>
<version>2.13</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>pipeline-input-step</artifactId>
<version>2.11</version>
<version>2.12</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down
4 changes: 4 additions & 0 deletions pct.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ fi

# TODO rather than removing all these, have a text file of known failures and just convert them to “skipped”
# or add surefire.excludesFile to MAVEN_PROPERTIES so we do not waste time even running these
# TODO this should probably now read `= 2.176.x`, though CommandLauncher2Test now fails with a new error
if [ "$LINE" != 2.190.x ]
then
# TODO https://github.com/jenkinsci/jenkins/pull/4120 problems with workflow-cps → jquery-detached:
Expand Down Expand Up @@ -123,4 +124,7 @@ rm -fv pct-work/workflow-basic-steps/target/surefire-reports/TEST-org.jenkinsci.
# TODO cryptic PCT-only errors: https://github.com/jenkinsci/bom/pull/251#issuecomment-645012427
rm -fv pct-work/matrix-project/target/surefire-reports/TEST-hudson.matrix.AxisTest.xml

# TODO https://github.com/jenkinsci/branch-api-plugin/pull/211
rm -fv pct-work/branch-api/target/surefire-reports/TEST-jenkins.branch.RateLimitBranchPropertyTest.xml

# produces: **/target/surefire-reports/TEST-*.xml
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
</scm>
<modules>
<module>bom-latest</module>
<module>bom-2.235.x</module>
<module>bom-2.222.x</module>
<module>bom-2.204.x</module>
<module>bom-2.190.x</module>
Expand Down
7 changes: 3 additions & 4 deletions prep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,9 @@ do
done

# TODO find a way to encode this in some POM so that it can be managed by Dependabot
version=0.5.1
timestamp=20200512.100129-2 # https://github.com/jenkinsci/plugin-compat-tester/pull/239
pct=$HOME/.m2/repository/org/jenkins-ci/tests/plugins-compat-tester-cli/${version}-SNAPSHOT/plugins-compat-tester-cli-${version}-${timestamp}.jar
[ -f $pct ] || $MVN dependency:get -Dartifact=org.jenkins-ci.tests:plugins-compat-tester-cli:${version}-${timestamp}:jar -DremoteRepositories=https://repo.jenkins-ci.org/public/ -Dtransitive=false
version=0.5.1-rc1021.e0af2a047ff6 # TODO https://github.com/jenkinsci/plugin-compat-tester/pull/256
pct=$HOME/.m2/repository/org/jenkins-ci/tests/plugins-compat-tester-cli/${version}/plugins-compat-tester-cli-${version}.jar
[ -f $pct ] || $MVN dependency:get -Dartifact=org.jenkins-ci.tests:plugins-compat-tester-cli:${version}:jar -DremoteRepositories=https://repo.jenkins-ci.org/public/,https://repo.jenkins-ci.org/incrementals/ -Dtransitive=false
cp $pct target/pct.jar

# produces: target/{megawar-*.war,pct.jar,plugins.txt,lines.txt}
11 changes: 9 additions & 2 deletions sample-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<properties>
<revision>12</revision>
<changelist>-SNAPSHOT</changelist>
<bom>2.235.x</bom>
<jenkins.version>2.235.1</jenkins.version>
<bom>2.249.x</bom>
<jenkins.version>2.249.1</jenkins.version>
<java.level>8</java.level>
</properties>
<repositories>
Expand Down Expand Up @@ -265,6 +265,13 @@
</plugins>
</build>
<profiles>
<profile>
<id>2.235.x</id>
<properties>
<bom>2.235.x</bom>
<jenkins.version>2.235.5</jenkins.version>
</properties>
</profile>
<profile>
<id>2.222.x</id>
<properties>
Expand Down