Fix mysql dependency in 2.5 already (#451)

openrewrite · Nov 25, 2023 · 5b1458f · 5b1458f
1 parent 4b09166
commit 5b1458f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/main/resources/META-INF/rewrite/spring-boot-25.yml b/src/main/resources/META-INF/rewrite/spring-boot-25.yml
@@ -44,6 +44,15 @@ recipeList:
       addIfMissing: false
   - org.openrewrite.java.spring.boot2.MigrateDatabaseCredentials
 
+  # Spring Boot 2.5 mismanages a pom-only redirect pom of mysql:mysql-connector-java:8.0.33
+  # From 2.6 onwards the managed dependency is com.mysql:mysql-connector-j:8.0.33
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: mysql
+      newGroupId: com.mysql
+      oldArtifactId: mysql-connector-java
+      newArtifactId: mysql-connector-j
+      newVersion: 8.0.x
+
   # Use recommended replacements for deprecated APIs
   - org.openrewrite.java.spring.boot2.MigrateActuatorMediaTypeToApiVersion
   - org.openrewrite.java.ChangeType:

diff --git a/src/main/resources/META-INF/rewrite/spring-boot-26.yml b/src/main/resources/META-INF/rewrite/spring-boot-26.yml
@@ -43,14 +43,6 @@ recipeList:
       pluginIdPattern: org.springframework.boot
       newVersion: 2.6.x
 
-  # From 2.6 onwards the managed dependency is com.mysql:mysql-connector-j:8.0.33
-  - org.openrewrite.java.dependencies.ChangeDependency:
-      oldGroupId: mysql
-      newGroupId: com.mysql
-      oldArtifactId: mysql-connector-java
-      newArtifactId: mysql-connector-j
-      newVersion: 8.0.x
-
   # Update properties
   - org.openrewrite.java.spring.boot2.SpringBootProperties_2_6
 

diff --git a/...oot2/UpdateMysqlDriverArtifactIdTest.java → ...oot2/UpdateMysqlDriverArtifactIdTest.java b/...oot2/UpdateMysqlDriverArtifactIdTest.java → ...oot2/UpdateMysqlDriverArtifactIdTest.java
@@ -33,13 +33,12 @@
 
 @Issue("https://github.com/openrewrite/rewrite-spring/issues/274")
 class UpdateMysqlDriverArtifactIdTest implements RewriteTest {
-
     @Override
     public void defaults(RecipeSpec spec) {
         spec.recipe(Environment.builder()
           .scanRuntimeClasspath("org.openrewrite.java.spring")
           .build()
-          .activateRecipes("org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_7"));
+          .activateRecipes("org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_5"));
     }
 
     @Nested
@@ -189,7 +188,7 @@ void doNotPinWhenNotVersioned() {
                 """
                   plugins {
                     id 'java'
-                    id 'org.springframework.boot' version '2.6.1'
+                    id 'org.springframework.boot' version '2.5.14'
                     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
                   }
                   
@@ -201,8 +200,8 @@ void doNotPinWhenNotVersioned() {
                       runtimeOnly 'mysql:mysql-connector-java'
                   }
                   """, spec -> spec.after(gradle -> {
-                    Matcher version = Pattern.compile("2\\.7\\.\\d+").matcher(gradle);
-                    assertThat(version.find()).describedAs("Expected 2.7.x in %s", gradle).isTrue();
+                    Matcher version = Pattern.compile("2\\.5\\.\\d+").matcher(gradle);
+                    assertThat(version.find()).describedAs("Expected 2.5.x in %s", gradle).isTrue();
                     //language=gradle
                     return """
                   plugins {