Switch to UpgradeDependencyVersion

For openrewrite/rewrite-java-dependencies#55
openrewrite · Jan 5, 2024 · a267823 · a267823
1 parent f541bf1
commit a267823
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 57 deletions.
diff --git a/src/main/resources/META-INF/rewrite/okhttp-4.yml b/src/main/resources/META-INF/rewrite/okhttp-4.yml
@@ -30,7 +30,7 @@ name: org.openrewrite.okhttp.UpgradeOkHttp4Dependencies
 displayName: Migrate OkHttp dependencies to 4.x
 description: Migrate OkHttp dependencies to 4.x.
 recipeList:
-  - org.openrewrite.java.dependencies.ChangeDependency:
-      oldGroupId: com.squareup.okhttp3
-      oldArtifactId: okhttp
+  - org.openrewrite.java.dependencies.UpgradeDependencyVersion:
+      groupId: com.squareup.okhttp3
+      artifactId: okhttp
       newVersion: 4.x
diff --git a/src/main/resources/META-INF/rewrite/okhttp-5.yml b/src/main/resources/META-INF/rewrite/okhttp-5.yml
@@ -31,10 +31,10 @@ name: org.openrewrite.okhttp.UpgradeOkHttp5Dependencies
 displayName: Migrate OkHttp dependencies to 5.x
 description: Migrate OkHttp dependencies to 5.x.
 recipeList:
-  - org.openrewrite.java.dependencies.ChangeDependency:
-      oldGroupId: com.squareup.okhttp3
-      oldArtifactId: okhttp
-      newVersion: 5.0.0-alpha.11
+  - org.openrewrite.java.dependencies.UpgradeDependencyVersion:
+      groupId: com.squareup.okhttp3
+      artifactId: okhttp
+      newVersion: 5.0.0-alpha.12
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: org.openrewrite.okhttp.ReorderRequestBodyCreateArguments

diff --git a/src/main/resources/META-INF/rewrite/okio-3.yml b/src/main/resources/META-INF/rewrite/okio-3.yml
@@ -34,8 +34,7 @@ recipeList:
       oldArtifactId: okio-multiplatform
       newArtifactId: okio
       newVersion: 3.x
-  - org.openrewrite.java.dependencies.ChangeDependency:
-      oldGroupId: com.squareup.okio
-      oldArtifactId: okio
-      newArtifactId: okio
+  - org.openrewrite.java.dependencies.UpgradeDependencyVersion:
+      groupId: com.squareup.okio
+      artifactId: okio
       newVersion: 3.x
diff --git a/src/test/java/org/openrewrite/okhttp/MigrateToOkHttp4Test.java b/src/test/java/org/openrewrite/okhttp/MigrateToOkHttp4Test.java
@@ -21,10 +21,8 @@
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
 
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.openrewrite.maven.Assertions.pomXml;
 
 class MigrateToOkHttp4Test implements RewriteTest {
@@ -58,27 +56,23 @@ void mavenDependency4x() {
                     </dependencies>
                   </project>
                   """,
-                spec -> spec.after(actual -> {
-                      Matcher matcher = Pattern.compile("<version>(4\\.\\d+\\.\\d+(-(alpha|beta)\\.\\d+)?)</version>").matcher(actual);
-                      assertTrue(matcher.find(), actual);
-                      return """
-                        <?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-                          <modelVersion>4.0.0</modelVersion>
-                          <groupId>com.example</groupId>
-                          <artifactId>demo</artifactId>
-                          <version>0.0.1-SNAPSHOT</version>
-                          <dependencies>
-                            <dependency>
-                              <groupId>com.squareup.okhttp3</groupId>
-                              <artifactId>okhttp</artifactId>
-                              <version>%s</version>
-                            </dependency>
-                          </dependencies>
-                        </project>
-                        """.formatted(matcher.group(1));
-                  }
+                spec -> spec.after(actual -> """
+                  <?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+                    <modelVersion>4.0.0</modelVersion>
+                    <groupId>com.example</groupId>
+                    <artifactId>demo</artifactId>
+                    <version>0.0.1-SNAPSHOT</version>
+                    <dependencies>
+                      <dependency>
+                        <groupId>com.squareup.okhttp3</groupId>
+                        <artifactId>okhttp</artifactId>
+                        <version>%s</version>
+                      </dependency>
+                    </dependencies>
+                  </project>
+                  """.formatted(Pattern.compile("<version>(4\\..*)</version>").matcher(actual).results().findFirst().orElseThrow().group(1))
                 )
               )
             );

diff --git a/src/test/java/org/openrewrite/okhttp/MigrateToOkHttp5Test.java b/src/test/java/org/openrewrite/okhttp/MigrateToOkHttp5Test.java
@@ -21,10 +21,8 @@
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
 
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.openrewrite.maven.Assertions.pomXml;
 
 class MigrateToOkHttp5Test implements RewriteTest {
@@ -58,27 +56,23 @@ void mavenDependency5x() {
                     </dependencies>
                   </project>
                   """,
-                spec -> spec.after(actual -> {
-                      Matcher matcher = Pattern.compile("<version>(5\\.0\\.\\d+(-(alpha|beta)\\.\\d+)?)</version>").matcher(actual);
-                      assertTrue(matcher.find(), actual);
-                      return """
-                        <?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-                          <modelVersion>4.0.0</modelVersion>
-                          <groupId>com.example</groupId>
-                          <artifactId>demo</artifactId>
-                          <version>0.0.1-SNAPSHOT</version>
-                          <dependencies>
-                            <dependency>
-                              <groupId>com.squareup.okhttp3</groupId>
-                              <artifactId>okhttp</artifactId>
-                              <version>%s</version>
-                            </dependency>
-                          </dependencies>
-                        </project>
-                        """.formatted(matcher.group(1));
-                  }
+                spec -> spec.after(actual -> """
+                  <?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+                    <modelVersion>4.0.0</modelVersion>
+                    <groupId>com.example</groupId>
+                    <artifactId>demo</artifactId>
+                    <version>0.0.1-SNAPSHOT</version>
+                    <dependencies>
+                      <dependency>
+                        <groupId>com.squareup.okhttp3</groupId>
+                        <artifactId>okhttp</artifactId>
+                        <version>%s</version>
+                      </dependency>
+                    </dependencies>
+                  </project>
+                  """.formatted(Pattern.compile("<version>(5\\..*)</version>").matcher(actual).results().findFirst().orElseThrow().group(1))
                 )
               )
             );