Also replace Gradle dependencies (#123)

* Also replace Gradle dependencies * Test dependency on rewrite-maven * Remove duplicate org. * Load correct recipes from resource * Remove unused import
openrewrite · Nov 24, 2023 · e570007 · e570007
1 parent 1e0e621
commit e570007
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 31 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,12 +5,7 @@ plugins {
 group = "org.openrewrite.recipe"
 description = "Enforce logging best practices and migrate between logging frameworks. Automatically."
 
-val rewriteVersion = if (project.hasProperty("releasing")) {
-    "latest.release"
-} else {
-    "latest.integration"
-}
-
+val rewriteVersion = rewriteRecipe.rewriteVersion.get()
 dependencies {
     compileOnly("org.projectlombok:lombok:latest.release")
     annotationProcessor("org.projectlombok:lombok:latest.release")
@@ -19,13 +14,14 @@ dependencies {
 
     implementation(platform("org.openrewrite:rewrite-bom:${rewriteVersion}"))
     implementation("org.openrewrite:rewrite-java")
-    implementation("org.openrewrite:rewrite-maven")
+    implementation("org.openrewrite.recipe:rewrite-java-dependencies:${rewriteVersion}")
     runtimeOnly("org.openrewrite:rewrite-java-17")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:latest.release")
     testImplementation("org.junit.jupiter:junit-jupiter-params:latest.release")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:latest.release")
 
+    testImplementation("org.openrewrite:rewrite-maven")
     testImplementation("org.openrewrite:rewrite-test")
     testImplementation("org.openrewrite:rewrite-java-tck")
 

diff --git a/src/main/resources/META-INF/rewrite/log4j.yml b/src/main/resources/META-INF/rewrite/log4j.yml
@@ -77,40 +77,40 @@ recipeList:
       methodPattern: org.apache.logging.log4j.Category getEffectiveLevel()
       newMethodName: getLevel
   - org.openrewrite.java.logging.log4j.ParameterizedLogging
-  - org.openrewrite.maven.AddDependency:
+  - org.openrewrite.java.dependencies.AddDependency:
       groupId: org.apache.logging.log4j
       artifactId: log4j-api
       version: latest.release
       onlyIfUsing: org.apache.log4j.*
-  - org.openrewrite.maven.AddDependency:
+  - org.openrewrite.java.dependencies.AddDependency:
       groupId: org.apache.logging.log4j
       artifactId: log4j-core
       version: latest.release
       onlyIfUsing: org.apache.log4j.*
-  - org.openrewrite.maven.RemoveDependency:
+  - org.openrewrite.java.dependencies.RemoveDependency:
       groupId: log4j
       artifactId: log4j
-  - org.openrewrite.maven.RemoveDependency:
+  - org.openrewrite.java.dependencies.RemoveDependency:
       groupId: ch.qos.reload4j
       artifactId: reload4j
   ### Additional AddDependency's since "onlyIfUsing" may think it isn't using log4j 2.x if doing an upgrade chaining from log4j1 recipes todo
-  - org.openrewrite.maven.AddDependency:
+  - org.openrewrite.java.dependencies.AddDependency:
       groupId: org.apache.logging.log4j
       artifactId: log4j-api
       version: latest.release
       onlyIfUsing: org.apache.logging.log4j.*
-  - org.openrewrite.maven.AddDependency:
+  - org.openrewrite.java.dependencies.AddDependency:
       groupId: org.apache.logging.log4j
       artifactId: log4j-core
       version: latest.release
       onlyIfUsing: org.apache.logging.log4j.*
-  - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
+  - org.openrewrite.java.dependencies.ChangeDependency:
       oldGroupId: org.slf4j
       oldArtifactId: slf4j-log4j12
       newGroupId: org.apache.logging.log4j
       newArtifactId: log4j-slf4j-impl
       newVersion: latest.release
-  - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
+  - org.openrewrite.java.dependencies.ChangeDependency:
       oldGroupId: org.slf4j
       oldArtifactId: slf4j-reload4j
       newGroupId: org.apache.logging.log4j

diff --git a/src/main/resources/META-INF/rewrite/logback.yml b/src/main/resources/META-INF/rewrite/logback.yml
@@ -27,21 +27,21 @@ recipeList:
   - org.openrewrite.java.logging.slf4j.Log4jToSlf4j
   - org.openrewrite.java.logging.logback.Log4jAppenderToLogback
   - org.openrewrite.java.logging.logback.Log4jLayoutToLogback
-  - org.openrewrite.maven.AddDependency:
+  - org.openrewrite.java.dependencies.AddDependency:
       groupId: ch.qos.logback
       artifactId: logback-core
       version: latest.release
       onlyIfUsing: org.apache.logging.log4j.*
-  - org.openrewrite.maven.AddDependency:
+  - org.openrewrite.java.dependencies.AddDependency:
       groupId: ch.qos.logback
       artifactId: logback-classic
       version: latest.release
       onlyIfUsing: org.apache.logging.log4j.*
-  - org.openrewrite.maven.AddDependency:
+  - org.openrewrite.java.dependencies.AddDependency:
       groupId: org.slf4j
       artifactId: slf4j-api
       version: latest.release
       onlyIfUsing: org.apache.logging.log4j.*
-  - org.openrewrite.maven.RemoveDependency:
+  - org.openrewrite.java.dependencies.RemoveDependency:
       groupId: org.apache.logging.log4j
       artifactId: log4j-*
diff --git a/src/main/resources/META-INF/rewrite/slf4j.yml b/src/main/resources/META-INF/rewrite/slf4j.yml
@@ -27,36 +27,36 @@ recipeList:
   # and migrate it to the latest version of slf4j (1.x currently, but will be 2.x in the future)
   - org.openrewrite.java.logging.slf4j.Log4j1ToSlf4j1
   - org.openrewrite.java.logging.slf4j.LoggersNamedForEnclosingClass
-  - org.openrewrite.maven.RemoveDependency:
+  - org.openrewrite.java.dependencies.RemoveDependency:
       groupId: org.apache.logging.log4j
       artifactId: log4j-to-slf4j
-  - org.openrewrite.maven.UpgradeDependencyVersion:
+  - org.openrewrite.java.dependencies.UpgradeDependencyVersion:
       groupId: org.apache.logging.log4j
       artifactId: log4j-api
       newVersion: latest.release
       overrideManagedVersion: true
-  - org.openrewrite.maven.UpgradeDependencyVersion:
+  - org.openrewrite.java.dependencies.UpgradeDependencyVersion:
       groupId: org.apache.logging.log4j
       artifactId: log4j-core
       newVersion: latest.release
       overrideManagedVersion: true
-  - org.openrewrite.maven.AddDependency:
+  - org.openrewrite.java.dependencies.AddDependency:
       groupId: org.slf4j
       artifactId: slf4j-api
       version: latest.release
       onlyIfUsing: org.apache.logging.log4j.*
-  - org.openrewrite.maven.AddDependency:
+  - org.openrewrite.java.dependencies.AddDependency:
       groupId: org.apache.logging.log4j
       artifactId: log4j-slf4j-impl
       version: latest.release
       onlyIfUsing: org.apache.logging.log4j.*
   ### Additional AddDependency's since "onlyIfUsing" may think it isn't using log4j 2.x if doing an upgrade chaining from log4j1 recipes todo
-  - org.openrewrite.maven.AddDependency:
+  - org.openrewrite.java.dependencies.AddDependency:
       groupId: org.slf4j
       artifactId: slf4j-api
       version: latest.release
       onlyIfUsing: org.apache.log4j.*
-  - org.openrewrite.maven.AddDependency:
+  - org.openrewrite.java.dependencies.AddDependency:
       groupId: org.apache.logging.log4j
       artifactId: log4j-slf4j-impl
       version: latest.release

diff --git a/src/test/java/org/openrewrite/java/logging/log4j/Log4j1ToLog4j2Test.java b/src/test/java/org/openrewrite/java/logging/log4j/Log4j1ToLog4j2Test.java
@@ -17,7 +17,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.openrewrite.DocumentExample;
-import org.openrewrite.config.Environment;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
@@ -35,10 +34,7 @@ class Log4j1ToLog4j2Test implements RewriteTest {
 
     @Override
     public void defaults(RecipeSpec spec) {
-        spec.recipe(Environment.builder()
-            .scanRuntimeClasspath("org.openrewrite.java.logging")
-            .build()
-            .activateRecipes("org.openrewrite.java.logging.log4j.Log4j1ToLog4j2"))
+        spec.recipeFromResource("/META-INF/rewrite/log4j.yml","org.openrewrite.java.logging.log4j.Log4j1ToLog4j2")
           .parser(JavaParser.fromJavaVersion().classpath("log4j"));
     }