Skip to content

Commit 991caac

Browse files
dependabot[bot]jonesbusy
dependabot[bot]
authored and
jonesbusy
committed
chore(deps): bump org.openrewrite.recipe:rewrite-recipe-bom (jenkins-infra#936)
Bumps [org.openrewrite.recipe:rewrite-recipe-bom](https://github.com/openrewrite/rewrite-recipe-bom) from 3.5.0 to 3.6.1. - [Release notes](https://github.com/openrewrite/rewrite-recipe-bom/releases) - [Commits](openrewrite/rewrite-recipe-bom@v3.5.0...v3.6.1) --- updated-dependencies: - dependency-name: org.openrewrite.recipe:rewrite-recipe-bom dependency-version: 3.6.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 12f7893 commit 991caac

6 files changed

Lines changed: 70 additions & 82 deletions

File tree

‎plugin-modernizer-core/src/main/resources/META-INF/rewrite/recipes.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,14 +156,14 @@ recipeList:
156156
---
157157
type: specs.openrewrite.org/v1beta/recipe
158158
name: io.jenkins.tools.pluginmodernizer.UpgradeParentVersion
159-
displayName: Upgrade parent version to latest available in the 4.x line
160-
description: Upgrade the parent version to latest available in the 4.x line.
159+
displayName: Upgrade parent version to latest available in the 5.x line
160+
description: Upgrade the parent version to latest available in the 5.x line.
161161
tags: ['dependencies']
162162
recipeList:
163163
- org.openrewrite.maven.UpgradeParentVersion:
164164
groupId: org.jenkins-ci.plugins
165165
artifactId: plugin
166-
newVersion: 4.X
166+
newVersion: 5.X
167167
- io.jenkins.tools.pluginmodernizer.RemoveDependencyVersionOverride
168168
---
169169
type: specs.openrewrite.org/v1beta/recipe

‎plugin-modernizer-core/src/main/resources/versions.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
openrewrite.maven.plugin.version = ${openrewrite.maven.plugin.version}
22
jenkins.parent.version = 5.10
33
bom.version = 4583.v0a_f4df179fa_b_
4-
bom.recommended.version = 4228.v0a_71308d905b_
4+
bom.recommended.version = 4583.v0a_f4df179fa_b_
55
remediation.jenkins.plugin.parent.version = 2.37
66
jenkins.core.minimum.version = ${jenkins.core.minimum.version}
77
asm-api.version = 9.8-135.vb_2239d08ee90

‎plugin-modernizer-core/src/test/java/io/jenkins/tools/pluginmodernizer/core/recipes/DeclarativeRecipesTest.java‎

Lines changed: 38 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ void upgradeParentpom() {
215215
<parent>
216216
<groupId>org.jenkins-ci.plugins</groupId>
217217
<artifactId>plugin</artifactId>
218-
<version>4.87</version>
218+
<version>5.1</version>
219219
<relativePath />
220220
</parent>
221221
<groupId>io.jenkins.plugins</groupId>
@@ -224,7 +224,7 @@ void upgradeParentpom() {
224224
<packaging>hpi</packaging>
225225
<name>Empty Plugin</name>
226226
<properties>
227-
<jenkins.version>2.440.3</jenkins.version>
227+
<jenkins.version>2.479.3</jenkins.version>
228228
</properties>
229229
<repositories>
230230
<repository>
@@ -247,7 +247,7 @@ void upgradeParentpom() {
247247
<parent>
248248
<groupId>org.jenkins-ci.plugins</groupId>
249249
<artifactId>plugin</artifactId>
250-
<version>4.88</version>
250+
<version>%s</version>
251251
<relativePath />
252252
</parent>
253253
<groupId>io.jenkins.plugins</groupId>
@@ -256,7 +256,7 @@ void upgradeParentpom() {
256256
<packaging>hpi</packaging>
257257
<name>Empty Plugin</name>
258258
<properties>
259-
<jenkins.version>2.440.3</jenkins.version>
259+
<jenkins.version>2.479.3</jenkins.version>
260260
</properties>
261261
<repositories>
262262
<repository>
@@ -271,7 +271,8 @@ void upgradeParentpom() {
271271
</pluginRepository>
272272
</pluginRepositories>
273273
</project>
274-
"""));
274+
"""
275+
.formatted(Settings.getJenkinsParentVersion())));
275276
}
276277

277278
@Test
@@ -677,7 +678,7 @@ void upgradeToRecommendCoreVersionTest() {
677678
<parent>
678679
<groupId>org.jenkins-ci.plugins</groupId>
679680
<artifactId>plugin</artifactId>
680-
<version>4.87</version>
681+
<version>5.1</version>
681682
</parent>
682683
<groupId>io.jenkins.plugins</groupId>
683684
<artifactId>empty</artifactId>
@@ -696,7 +697,7 @@ void upgradeToRecommendCoreVersionTest() {
696697
</scm>
697698
<properties>
698699
<jenkins-test-harness.version>2.41.1</jenkins-test-harness.version>
699-
<jenkins.version>2.440.3</jenkins.version>
700+
<jenkins.version>2.479.3</jenkins.version>
700701
</properties>
701702
<dependencies>
702703
<dependency>
@@ -731,7 +732,7 @@ void upgradeToRecommendCoreVersionTest() {
731732
<parent>
732733
<groupId>org.jenkins-ci.plugins</groupId>
733734
<artifactId>plugin</artifactId>
734-
<version>4.88</version>
735+
<version>%s</version>
735736
<relativePath/>
736737
</parent>
737738
<groupId>io.jenkins.plugins</groupId>
@@ -743,10 +744,10 @@ void upgradeToRecommendCoreVersionTest() {
743744
<connection>scm:git:https://github.com/jenkinsci/empty-plugin.git</connection>
744745
</scm>
745746
<properties>
746-
<jenkins-test-harness.version>2225.v04fa_3929c9b_5</jenkins-test-harness.version>
747+
<jenkins-test-harness.version>%s</jenkins-test-harness.version>
747748
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
748-
<jenkins.baseline>%s</jenkins.baseline>
749-
<jenkins.version>${jenkins.baseline}.%s</jenkins.version>
749+
<jenkins.baseline>2.479</jenkins.baseline>
750+
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
750751
</properties>
751752
<dependencyManagement>
752753
<dependencies>
@@ -784,8 +785,8 @@ void upgradeToRecommendCoreVersionTest() {
784785
</project>
785786
"""
786787
.formatted(
787-
Settings.getJenkinsMinimumBaseline(),
788-
Settings.getJenkinsMinimumPatchVersion(),
788+
Settings.getJenkinsParentVersion(),
789+
Settings.getJenkinsTestHarnessVersion(),
789790
Settings.getRecommendedBomVersion())));
790791
}
791792

@@ -859,7 +860,7 @@ void upgradeToRecommendCoreVersionTestWithoutPluginDependencies() {
859860
<parent>
860861
<groupId>org.jenkins-ci.plugins</groupId>
861862
<artifactId>plugin</artifactId>
862-
<version>4.88</version>
863+
<version>%s</version>
863864
<relativePath />
864865
</parent>
865866
<groupId>io.jenkins.plugins</groupId>
@@ -871,8 +872,8 @@ void upgradeToRecommendCoreVersionTestWithoutPluginDependencies() {
871872
<connection>scm:git:https://github.com/jenkinsci/empty-plugin.git</connection>
872873
</scm>
873874
<properties>
874-
<jenkins.version>%s</jenkins.version>
875-
<jenkins-test-harness.version>2225.v04fa_3929c9b_5</jenkins-test-harness.version>
875+
<jenkins.version>2.479.3</jenkins.version>
876+
<jenkins-test-harness.version>%s</jenkins-test-harness.version>
876877
</properties>
877878
<repositories>
878879
<repository>
@@ -888,7 +889,8 @@ void upgradeToRecommendCoreVersionTestWithoutPluginDependencies() {
888889
</pluginRepositories>
889890
</project>
890891
"""
891-
.formatted(Settings.getJenkinsMinimumVersion())));
892+
.formatted(
893+
Settings.getJenkinsParentVersion(), Settings.getJenkinsTestHarnessVersion())));
892894
}
893895

894896
@Test
@@ -974,7 +976,7 @@ void upgradeToRecommendCoreVersionTestWithBaseline() {
974976
<parent>
975977
<groupId>org.jenkins-ci.plugins</groupId>
976978
<artifactId>plugin</artifactId>
977-
<version>4.88</version>
979+
<version>%s</version>
978980
<relativePath />
979981
</parent>
980982
<groupId>io.jenkins.plugins</groupId>
@@ -983,10 +985,10 @@ void upgradeToRecommendCoreVersionTestWithBaseline() {
983985
<packaging>hpi</packaging>
984986
<name>Empty Plugin</name>
985987
<properties>
986-
<jenkins-test-harness.version>2225.v04fa_3929c9b_5</jenkins-test-harness.version>
988+
<jenkins-test-harness.version>%s</jenkins-test-harness.version>
987989
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
988-
<jenkins.baseline>%s</jenkins.baseline>
989-
<jenkins.version>${jenkins.baseline}.%s</jenkins.version>
990+
<jenkins.baseline>2.479</jenkins.baseline>
991+
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
990992
</properties>
991993
<dependencyManagement>
992994
<dependencies>
@@ -1020,8 +1022,8 @@ void upgradeToRecommendCoreVersionTestWithBaseline() {
10201022
</project>
10211023
"""
10221024
.formatted(
1023-
Settings.getJenkinsMinimumBaseline(),
1024-
Settings.getJenkinsMinimumPatchVersion(),
1025+
Settings.getJenkinsParentVersion(),
1026+
Settings.getJenkinsTestHarnessVersion(),
10251027
Settings.getRecommendedBomVersion())));
10261028
}
10271029

@@ -2493,6 +2495,7 @@ void addPluginBomTestAndRemoveProperties() {
24932495
void replaceLibrariesByApiPluginsSimple() throws IOException {
24942496

24952497
// Read API plugin version
2498+
String asmApiVersion = getApiPluginVersion("asm-api");
24962499
String jsonApiVersion = getApiPluginVersion("json-api");
24972500
String jsonPathApiVersion = getApiPluginVersion("json-path-api");
24982501
String gsonApiVersion = getApiPluginVersion("gson-api");
@@ -2515,7 +2518,7 @@ void replaceLibrariesByApiPluginsSimple() throws IOException {
25152518
<parent>
25162519
<groupId>org.jenkins-ci.plugins</groupId>
25172520
<artifactId>plugin</artifactId>
2518-
<version>4.88</version>
2521+
<version>5.10</version>
25192522
<relativePath />
25202523
</parent>
25212524
<groupId>io.jenkins.plugins</groupId>
@@ -2524,7 +2527,7 @@ void replaceLibrariesByApiPluginsSimple() throws IOException {
25242527
<packaging>hpi</packaging>
25252528
<name>Empty Plugin</name>
25262529
<properties>
2527-
<jenkins.version>2.462.3</jenkins.version>
2530+
<jenkins.version>2.479.3</jenkins.version>
25282531
</properties>
25292532
<dependencies>
25302533
<dependency>
@@ -2542,11 +2545,6 @@ void replaceLibrariesByApiPluginsSimple() throws IOException {
25422545
<artifactId>byte-buddy</artifactId>
25432546
<version>1.15.11</version>
25442547
</dependency>
2545-
<dependency>
2546-
<groupId>org.apache.commons</groupId>
2547-
<artifactId>commons-compress</artifactId>
2548-
<version>1.26.1</version>
2549-
</dependency>
25502548
<dependency>
25512549
<groupId>org.jsoup</groupId>
25522550
<artifactId>jsoup</artifactId>
@@ -2572,11 +2570,6 @@ void replaceLibrariesByApiPluginsSimple() throws IOException {
25722570
<artifactId>json-path</artifactId>
25732571
<version>2.9.0</version>
25742572
</dependency>
2575-
<dependency>
2576-
<groupId>org.ow2.asm</groupId>
2577-
<artifactId>asm</artifactId>
2578-
<version>9.7.1</version>
2579-
</dependency>
25802573
</dependencies>
25812574
<repositories>
25822575
<repository>
@@ -2599,7 +2592,7 @@ void replaceLibrariesByApiPluginsSimple() throws IOException {
25992592
<parent>
26002593
<groupId>org.jenkins-ci.plugins</groupId>
26012594
<artifactId>plugin</artifactId>
2602-
<version>4.88</version>
2595+
<version>5.10</version>
26032596
<relativePath />
26042597
</parent>
26052598
<groupId>io.jenkins.plugins</groupId>
@@ -2608,9 +2601,14 @@ void replaceLibrariesByApiPluginsSimple() throws IOException {
26082601
<packaging>hpi</packaging>
26092602
<name>Empty Plugin</name>
26102603
<properties>
2611-
<jenkins.version>2.462.3</jenkins.version>
2604+
<jenkins.version>2.479.3</jenkins.version>
26122605
</properties>
26132606
<dependencies>
2607+
<dependency>
2608+
<groupId>io.jenkins.plugins</groupId>
2609+
<artifactId>asm-api</artifactId>
2610+
<version>%s</version>
2611+
</dependency>
26142612
<dependency>
26152613
<groupId>io.jenkins.plugins</groupId>
26162614
<artifactId>byte-buddy-api</artifactId>
@@ -2636,11 +2634,6 @@ void replaceLibrariesByApiPluginsSimple() throws IOException {
26362634
<artifactId>joda-time-api</artifactId>
26372635
<version>%s</version>
26382636
</dependency>
2639-
<dependency>
2640-
<groupId>org.apache.commons</groupId>
2641-
<artifactId>commons-compress</artifactId>
2642-
<version>1.26.1</version>
2643-
</dependency>
26442637
<dependency>
26452638
<groupId>org.jenkins-ci.plugins</groupId>
26462639
<artifactId>jsoup</artifactId>
@@ -2656,11 +2649,6 @@ void replaceLibrariesByApiPluginsSimple() throws IOException {
26562649
<artifactId>json-path-api</artifactId>
26572650
<version>%s</version>
26582651
</dependency>
2659-
<dependency>
2660-
<groupId>org.ow2.asm</groupId>
2661-
<artifactId>asm</artifactId>
2662-
<version>9.7.1</version>
2663-
</dependency>
26642652
</dependencies>
26652653
<repositories>
26662654
<repository>
@@ -2677,6 +2665,7 @@ void replaceLibrariesByApiPluginsSimple() throws IOException {
26772665
</project>
26782666
"""
26792667
.formatted(
2668+
asmApiVersion,
26802669
byteBuddyApiVersion,
26812670
commonsLang3ApiVersion,
26822671
commonTextApiVersion,
@@ -2702,7 +2691,7 @@ void replaceLibrariesByApiPluginWithBom() {
27022691
<parent>
27032692
<groupId>org.jenkins-ci.plugins</groupId>
27042693
<artifactId>plugin</artifactId>
2705-
<version>4.88</version>
2694+
<version>5.1</version>
27062695
<relativePath />
27072696
</parent>
27082697
<artifactId>antexec</artifactId>
@@ -2760,7 +2749,7 @@ void replaceLibrariesByApiPluginWithBom() {
27602749
<parent>
27612750
<groupId>org.jenkins-ci.plugins</groupId>
27622751
<artifactId>plugin</artifactId>
2763-
<version>4.88</version>
2752+
<version>5.1</version>
27642753
<relativePath />
27652754
</parent>
27662755
<artifactId>antexec</artifactId>
@@ -2792,10 +2781,6 @@ void replaceLibrariesByApiPluginWithBom() {
27922781
<groupId>io.jenkins.plugins</groupId>
27932782
<artifactId>asm-api</artifactId>
27942783
</dependency>
2795-
<dependency>
2796-
<groupId>io.jenkins.plugins</groupId>
2797-
<artifactId>json-path-api</artifactId>
2798-
</dependency>
27992784
<dependency>
28002785
<groupId>org.jenkins-ci.plugins</groupId>
28012786
<artifactId>ant</artifactId>

0 commit comments

Comments
 (0)