From 7213deaf81765e4d81da8d78f378b3679eb6db88 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Wed, 23 Oct 2024 20:02:22 +0200 Subject: [PATCH 1/4] Do not remove log4j-to-slf4j as part of Log4jToSlf4j Fixes https://github.com/openrewrite/rewrite-logging-frameworks/issues/182 --- src/main/resources/META-INF/rewrite/slf4j.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/resources/META-INF/rewrite/slf4j.yml b/src/main/resources/META-INF/rewrite/slf4j.yml index b99ea359..b2417257 100644 --- a/src/main/resources/META-INF/rewrite/slf4j.yml +++ b/src/main/resources/META-INF/rewrite/slf4j.yml @@ -27,9 +27,6 @@ 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.java.dependencies.RemoveDependency: - groupId: org.apache.logging.log4j - artifactId: log4j-to-slf4j - org.openrewrite.java.dependencies.UpgradeDependencyVersion: groupId: org.apache.logging.log4j artifactId: log4j-api From 71ac5c422ce2f5e1bbd920fec04c79673c27ea90 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Wed, 23 Oct 2024 19:31:42 +0000 Subject: [PATCH 2/4] refactor: Kill your Zombie code Use this link to re-run the recipe: https://app.moderne.io/builder/mybR2aHWC?organizationId=T3BlblJld3JpdGU%3D Co-authored-by: Moderne --- .../openrewrite/java/logging/slf4j/CompleteExceptionLogging.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/openrewrite/java/logging/slf4j/CompleteExceptionLogging.java b/src/main/java/org/openrewrite/java/logging/slf4j/CompleteExceptionLogging.java index b6e9a4e8..625f8865 100644 --- a/src/main/java/org/openrewrite/java/logging/slf4j/CompleteExceptionLogging.java +++ b/src/main/java/org/openrewrite/java/logging/slf4j/CompleteExceptionLogging.java @@ -134,7 +134,6 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation m, if (lastParameter instanceof J.MethodInvocation && (THROWABLE_GET_MESSAGE.matches(lastParameter) || THROWABLE_GET_LOCALIZED_MESSAGE.matches(lastParameter))) { - J.MethodInvocation getMessageCall = (J.MethodInvocation) lastParameter; Expression firstParameter = method.getArguments().get(0); if (isStringLiteral(firstParameter)) { From 0db8477fcf8069db128fdc2c33869c3c184fadac Mon Sep 17 00:00:00 2001 From: Nate Danner Date: Fri, 1 Nov 2024 21:07:35 +0000 Subject: [PATCH 3/4] refactor: Standardize `.editorconfig` Use this link to re-run the recipe: https://app.moderne.io/builder/N3MJaFjMF?organizationId=T3BlblJld3JpdGU%3D Co-authored-by: Moderne --- .editorconfig | 9 +++++++++ src/test/java/.editorconfig | 5 ----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 .editorconfig delete mode 100644 src/test/java/.editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..7a7ad4c7 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +insert_final_newline = true +trim_trailing_whitespace = true + +[src/test*/java/**.java] +indent_size = 4 +ij_continuation_indent_size = 2 diff --git a/src/test/java/.editorconfig b/src/test/java/.editorconfig deleted file mode 100644 index a4824935..00000000 --- a/src/test/java/.editorconfig +++ /dev/null @@ -1,5 +0,0 @@ -root = true - -[*.java] -indent_size = 4 -ij_continuation_indent_size = 2 From f27eb4b068614fcf232d4913933feb92d632ce2d Mon Sep 17 00:00:00 2001 From: Shannon Pamperl Date: Mon, 11 Nov 2024 16:19:42 +0000 Subject: [PATCH 4/4] refactor: Update Gradle wrapper Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.gradle.UpdateGradleWrapper?organizationId=T3BlblJld3JpdGU%3D#defaults=W3sibmFtZSI6ImFkZElmTWlzc2luZyIsInZhbHVlIjoiRmFsc2UifV0= Co-authored-by: Moderne --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 74632bf7..061748a5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26 +distributionSha256Sum=57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9