diff --git a/src/main/java/org/openrewrite/java/logging/AddLogger.java b/src/main/java/org/openrewrite/java/logging/AddLogger.java index a4659b3..3c05623 100644 --- a/src/main/java/org/openrewrite/java/logging/AddLogger.java +++ b/src/main/java/org/openrewrite/java/logging/AddLogger.java @@ -74,7 +74,7 @@ public static AddLogger addSlf4jLogger(J.ClassDeclaration scope, String loggerNa .contextSensitive() .imports("org.slf4j.Logger", "org.slf4j.LoggerFactory") .javaParser(JavaParser.fromJavaVersion() - .classpathFromResources(ctx, "slf4j-api-2.1.+")) + .classpathFromResources(ctx, "slf4j-api-2")) .build() ); } diff --git a/src/main/java/org/openrewrite/java/logging/LoggingFramework.java b/src/main/java/org/openrewrite/java/logging/LoggingFramework.java index 5a44e6c..69616fc 100644 --- a/src/main/java/org/openrewrite/java/logging/LoggingFramework.java +++ b/src/main/java/org/openrewrite/java/logging/LoggingFramework.java @@ -54,7 +54,7 @@ public JavaTemplate getErrorTemplate(String message, ExecutionContext ctx) { case SLF4J: return JavaTemplate .builder("#{any(org.slf4j.Logger)}.error(" + message + ", #{any(java.lang.Throwable)})") - .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "slf4j-api-2.1.+")) + .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "slf4j-api-2")) .build(); case Log4J1: return JavaTemplate diff --git a/src/main/java/org/openrewrite/java/logging/SystemErrToLogging.java b/src/main/java/org/openrewrite/java/logging/SystemErrToLogging.java index b300b85..cc24bbf 100644 --- a/src/main/java/org/openrewrite/java/logging/SystemErrToLogging.java +++ b/src/main/java/org/openrewrite/java/logging/SystemErrToLogging.java @@ -201,7 +201,7 @@ public JavaTemplate getErrorTemplateNoException(ExecutionContext ctx) { case SLF4J: return JavaTemplate .builder("#{any(org.slf4j.Logger)}.error(#{any(String)});") - .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "slf4j-api-2.1.+")) + .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "slf4j-api-2")) .build(); case Log4J1: return JavaTemplate diff --git a/src/main/java/org/openrewrite/java/logging/SystemOutToLogging.java b/src/main/java/org/openrewrite/java/logging/SystemOutToLogging.java index 569727e..9862a67 100644 --- a/src/main/java/org/openrewrite/java/logging/SystemOutToLogging.java +++ b/src/main/java/org/openrewrite/java/logging/SystemOutToLogging.java @@ -140,7 +140,7 @@ private JavaTemplate getInfoTemplate(ExecutionContext ctx) { return JavaTemplate .builder("#{any(org.slf4j.Logger)}." + levelOrDefault + "(#{any(String)})") .javaParser(JavaParser.fromJavaVersion() - .classpathFromResources(ctx, "slf4j-api-2.1.+")) + .classpathFromResources(ctx, "slf4j-api-2")) .build(); case Log4J1: return JavaTemplate diff --git a/src/test/java/org/openrewrite/java/logging/AddLoggerTest.java b/src/test/java/org/openrewrite/java/logging/AddLoggerTest.java index d23963b..4109ddf 100644 --- a/src/test/java/org/openrewrite/java/logging/AddLoggerTest.java +++ b/src/test/java/org/openrewrite/java/logging/AddLoggerTest.java @@ -33,7 +33,7 @@ class AddLoggerTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec.parser(JavaParser.fromJavaVersion() - .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2.1.+")); + .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/logging/ArgumentArrayToVarargsTest.java b/src/test/java/org/openrewrite/java/logging/ArgumentArrayToVarargsTest.java index 091ac2e..fc015e4 100644 --- a/src/test/java/org/openrewrite/java/logging/ArgumentArrayToVarargsTest.java +++ b/src/test/java/org/openrewrite/java/logging/ArgumentArrayToVarargsTest.java @@ -31,7 +31,7 @@ class ArgumentArrayToVarargsTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec.recipe(new ArgumentArrayToVarargs()) .parser(JavaParser.fromJavaVersion() - .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2.1.+")); + .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/logging/ChangeLoggersToPrivateTest.java b/src/test/java/org/openrewrite/java/logging/ChangeLoggersToPrivateTest.java index b2e907f..60301aa 100644 --- a/src/test/java/org/openrewrite/java/logging/ChangeLoggersToPrivateTest.java +++ b/src/test/java/org/openrewrite/java/logging/ChangeLoggersToPrivateTest.java @@ -29,7 +29,7 @@ class ChangeLoggersToPrivateTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec.recipe(new ChangeLoggersToPrivate()) - .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "log4j-1", "slf4j-api-2.1.+", "log4j-api-2.+")); + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "log4j-1", "slf4j-api-2", "log4j-api-2.+")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/logging/ParameterizedLoggingTest.java b/src/test/java/org/openrewrite/java/logging/ParameterizedLoggingTest.java index 4ebba3c..f96e9bd 100644 --- a/src/test/java/org/openrewrite/java/logging/ParameterizedLoggingTest.java +++ b/src/test/java/org/openrewrite/java/logging/ParameterizedLoggingTest.java @@ -37,7 +37,7 @@ class ParameterizedLoggingTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec.parser(JavaParser.fromJavaVersion() - .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2.1.+", "log4j-api-2.+", "log4j-core-2.+", "lombok")); + .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2", "log4j-api-2.+", "log4j-core-2.+", "lombok")); } @DocumentExample @@ -804,7 +804,7 @@ void kotlinStringTemplateSkipped() { rewriteRun( spec -> spec .recipe(new ParameterizedLogging("org.slf4j.Logger info(..)", false)) - .parser(KotlinParser.builder().classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2.1.+")), + .parser(KotlinParser.builder().classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2")), //language=kotlin kotlin( """ diff --git a/src/test/java/org/openrewrite/java/logging/PrintStackTraceToLogErrorTest.java b/src/test/java/org/openrewrite/java/logging/PrintStackTraceToLogErrorTest.java index 91e6630..8cd08e0 100644 --- a/src/test/java/org/openrewrite/java/logging/PrintStackTraceToLogErrorTest.java +++ b/src/test/java/org/openrewrite/java/logging/PrintStackTraceToLogErrorTest.java @@ -34,7 +34,7 @@ void useSlf4j() { rewriteRun( spec -> spec.recipe(new PrintStackTraceToLogError(null, "LOGGER", null)) .parser(JavaParser.fromJavaVersion() - .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2.1.+", "lombok-1.18.+")), + .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2", "lombok-1.18.+")), //language=java java( """ @@ -401,7 +401,7 @@ public void close() { void supportLombokLogAnnotations() { rewriteRun( spec -> spec.recipe(new PrintStackTraceToLogError(null, null, null)) - .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2.1.+", "lombok-1.18.+")) + .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2", "lombok-1.18.+")) .typeValidationOptions(TypeValidation.builder().identifiers(false).build()), //language=java java( diff --git a/src/test/java/org/openrewrite/java/logging/SystemErrToLoggingTest.java b/src/test/java/org/openrewrite/java/logging/SystemErrToLoggingTest.java index 2d945bb..840a4c1 100644 --- a/src/test/java/org/openrewrite/java/logging/SystemErrToLoggingTest.java +++ b/src/test/java/org/openrewrite/java/logging/SystemErrToLoggingTest.java @@ -34,7 +34,7 @@ class SystemErrToLoggingTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec.recipe(new Log4jAppenderToLogback()) .parser(JavaParser.fromJavaVersion() - .classpathFromResources(new InMemoryExecutionContext(), "log4j-1.2.+", "slf4j-api-2.1.+", "lombok-1.18.+")); + .classpathFromResources(new InMemoryExecutionContext(), "log4j-1.2.+", "slf4j-api-2", "lombok-1.18.+")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/logging/SystemOutToLoggingTest.java b/src/test/java/org/openrewrite/java/logging/SystemOutToLoggingTest.java index c34c206..3f1d16e 100644 --- a/src/test/java/org/openrewrite/java/logging/SystemOutToLoggingTest.java +++ b/src/test/java/org/openrewrite/java/logging/SystemOutToLoggingTest.java @@ -31,7 +31,7 @@ class SystemOutToLoggingTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec.parser(JavaParser.fromJavaVersion() - .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2.1.+", "lombok-1.18.+")); + .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2", "lombok-1.18.+")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/logging/log4j/Slf4jToLog4jTest.java b/src/test/java/org/openrewrite/java/logging/log4j/Slf4jToLog4jTest.java index f7f6e46..e14675d 100644 --- a/src/test/java/org/openrewrite/java/logging/log4j/Slf4jToLog4jTest.java +++ b/src/test/java/org/openrewrite/java/logging/log4j/Slf4jToLog4jTest.java @@ -40,7 +40,7 @@ class Slf4jToLog4jTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec.recipeFromResource("/META-INF/rewrite/log4j.yml", "org.openrewrite.java.logging.log4j.Slf4jToLog4j") .parser(JavaParser.fromJavaVersion() - .classpathFromResources(new InMemoryExecutionContext(), "log4j-1.2.+", "slf4j-api-2.1.+", "lombok-1.18.+")); + .classpathFromResources(new InMemoryExecutionContext(), "log4j-1.2.+", "slf4j-api-2", "lombok-1.18.+")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/logging/slf4j/ChangeLogLevelTest.java b/src/test/java/org/openrewrite/java/logging/slf4j/ChangeLogLevelTest.java index 12a4804..65eef05 100644 --- a/src/test/java/org/openrewrite/java/logging/slf4j/ChangeLogLevelTest.java +++ b/src/test/java/org/openrewrite/java/logging/slf4j/ChangeLogLevelTest.java @@ -30,7 +30,7 @@ class ChangeLogLevelTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec.recipe(new ChangeLogLevel(ChangeLogLevel.Level.INFO, ChangeLogLevel.Level.DEBUG, "LaunchDarkly")) .parser(JavaParser.fromJavaVersion() - .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2.1.+")); + .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/logging/slf4j/CommonsLoggingToSlf4j1Test.java b/src/test/java/org/openrewrite/java/logging/slf4j/CommonsLoggingToSlf4j1Test.java index 3070ed9..a9f17e5 100644 --- a/src/test/java/org/openrewrite/java/logging/slf4j/CommonsLoggingToSlf4j1Test.java +++ b/src/test/java/org/openrewrite/java/logging/slf4j/CommonsLoggingToSlf4j1Test.java @@ -36,7 +36,7 @@ public void defaults(RecipeSpec spec) { .build() .activateRecipes("org.openrewrite.java.logging.slf4j.CommonsLogging1ToSlf4j1")) .parser(JavaParser.fromJavaVersion() - .classpathFromResources(new InMemoryExecutionContext(), "commons-logging-1.3.+", "slf4j-api-2.1.+", "lombok-1.18.+")); + .classpathFromResources(new InMemoryExecutionContext(), "commons-logging-1.3.+", "slf4j-api-2", "lombok-1.18.+")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/logging/slf4j/CompleteExceptionLoggingTest.java b/src/test/java/org/openrewrite/java/logging/slf4j/CompleteExceptionLoggingTest.java index af2dd2c..09e4039 100644 --- a/src/test/java/org/openrewrite/java/logging/slf4j/CompleteExceptionLoggingTest.java +++ b/src/test/java/org/openrewrite/java/logging/slf4j/CompleteExceptionLoggingTest.java @@ -30,7 +30,7 @@ class CompleteExceptionLoggingTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec.recipe(new CompleteExceptionLogging()) .parser(JavaParser.fromJavaVersion() - .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2.1.+")); + .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/logging/slf4j/LoggersNamedForEnclosingClassTest.java b/src/test/java/org/openrewrite/java/logging/slf4j/LoggersNamedForEnclosingClassTest.java index edda258..0391276 100644 --- a/src/test/java/org/openrewrite/java/logging/slf4j/LoggersNamedForEnclosingClassTest.java +++ b/src/test/java/org/openrewrite/java/logging/slf4j/LoggersNamedForEnclosingClassTest.java @@ -32,7 +32,7 @@ class LoggersNamedForEnclosingClassTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec.recipe(new LoggersNamedForEnclosingClass()) .parser(JavaParser.fromJavaVersion() - .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2.1.+")); + .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/logging/slf4j/Slf4jBestPracticesTest.java b/src/test/java/org/openrewrite/java/logging/slf4j/Slf4jBestPracticesTest.java index 5e299b4..c946016 100644 --- a/src/test/java/org/openrewrite/java/logging/slf4j/Slf4jBestPracticesTest.java +++ b/src/test/java/org/openrewrite/java/logging/slf4j/Slf4jBestPracticesTest.java @@ -34,7 +34,7 @@ public void defaults(RecipeSpec spec) { .build() .activateRecipes("org.openrewrite.java.logging.slf4j.Slf4jBestPractices")) .parser(JavaParser.fromJavaVersion() - .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2.1.+")); + .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/logging/slf4j/Slf4jLogShouldBeConstantTest.java b/src/test/java/org/openrewrite/java/logging/slf4j/Slf4jLogShouldBeConstantTest.java index 3ae1c0b..2d9ddab 100644 --- a/src/test/java/org/openrewrite/java/logging/slf4j/Slf4jLogShouldBeConstantTest.java +++ b/src/test/java/org/openrewrite/java/logging/slf4j/Slf4jLogShouldBeConstantTest.java @@ -32,7 +32,7 @@ class Slf4jLogShouldBeConstantTest implements RewriteTest { public void defaults(RecipeSpec spec) { spec.recipe(new Slf4jLogShouldBeConstant()) .parser(JavaParser.fromJavaVersion() - .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2.1.+")); + .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2")); } @DocumentExample diff --git a/src/test/java/org/openrewrite/java/logging/slf4j/StripToStringFromArgumentsTest.java b/src/test/java/org/openrewrite/java/logging/slf4j/StripToStringFromArgumentsTest.java index c7f36a2..48f602d 100644 --- a/src/test/java/org/openrewrite/java/logging/slf4j/StripToStringFromArgumentsTest.java +++ b/src/test/java/org/openrewrite/java/logging/slf4j/StripToStringFromArgumentsTest.java @@ -71,7 +71,7 @@ record TestCase(String originalArgs, String expectedArgs) { @Override public void defaults(RecipeSpec spec) { - spec.recipe(new StripToStringFromArguments()).parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2.1.+")); + spec.recipe(new StripToStringFromArguments()).parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2")); } @MethodSource diff --git a/src/test/java/org/openrewrite/java/logging/slf4j/WrapExpensiveLogStatementsInConditionalsSlf4j2Test.java b/src/test/java/org/openrewrite/java/logging/slf4j/WrapExpensiveLogStatementsInConditionalsSlf4j2Test.java index 5d895d3..fcc0439 100644 --- a/src/test/java/org/openrewrite/java/logging/slf4j/WrapExpensiveLogStatementsInConditionalsSlf4j2Test.java +++ b/src/test/java/org/openrewrite/java/logging/slf4j/WrapExpensiveLogStatementsInConditionalsSlf4j2Test.java @@ -32,7 +32,7 @@ class WrapExpensiveLogStatementsInConditionalsSlf4j2Test implements RewriteTest public void defaults(RecipeSpec spec) { spec.recipe(new WrapExpensiveLogStatementsInConditionals()) .parser(JavaParser.fromJavaVersion() - .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2.1.+")); + .classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2")); } @DocumentExample