Fix last few type attribution errors in tests

openrewrite · Oct 31, 2023 · 5f178fa · 5f178fa
1 parent e9ccdaa
commit 5f178fa
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -91,6 +91,7 @@ recipeDependencies {
 
     parserClasspath("org.springframework.security:spring-security-config:5.8.+")
     parserClasspath("org.springframework.security:spring-security-crypto:5.8.+")
+    parserClasspath("org.springframework.security:spring-security-oauth2-client:5.8.+")
     parserClasspath("org.springframework.security:spring-security-web:5.8.+")
 
     parserClasspath("org.springframework.security:spring-security-config:6.0.+")
@@ -103,7 +104,7 @@ recipeDependencies {
 //    parserClasspath("org.springframework.cloud:spring-cloud-sleuth-brave:3.1.+")
 
     parserClasspath("com.nimbusds:nimbus-jose-jwt:9.13")
-    parserClasspath("net.minidev:json-smart")
+    parserClasspath("net.minidev:json-smart:2.4.+")
 }
 
 val rewriteVersion = rewriteRecipe.rewriteVersion.get()
@@ -237,8 +238,9 @@ dependencies {
     "testWithSpringSecurity_5_8RuntimeOnly"("org.springframework:spring-webflux:5.3.+")
     "testWithSpringSecurity_5_8RuntimeOnly"("org.springframework.security:spring-security-core:5.8.+")
     "testWithSpringSecurity_5_8RuntimeOnly"("org.springframework.security:spring-security-config:5.8.+")
-    "testWithSpringSecurity_5_8RuntimeOnly"("org.springframework.security:spring-security-web:5.8.+")
+    "testWithSpringSecurity_5_8RuntimeOnly"("org.springframework.security:spring-security-oauth2-client:5.8.+")
     "testWithSpringSecurity_5_8RuntimeOnly"("org.springframework.security:spring-security-ldap:5.8.+")
+    "testWithSpringSecurity_5_8RuntimeOnly"("org.springframework.security:spring-security-web:5.8.+")
     "testWithSpringSecurity_5_8RuntimeOnly"("org.apache.tomcat.embed:tomcat-embed-core:9.0.+")
     "testWithSpringSecurity_5_8RuntimeOnly"("com.nimbusds:nimbus-jose-jwt:9.13")
     "testWithSpringSecurity_5_8RuntimeOnly"("net.minidev:json-smart")

diff --git a/...lasspath/spring-security-config-5.8.3.jar → ...lasspath/spring-security-config-5.8.8.jar b/...lasspath/spring-security-config-5.8.3.jar → ...lasspath/spring-security-config-5.8.8.jar
diff --git a/...lasspath/spring-security-crypto-5.8.3.jar → ...lasspath/spring-security-crypto-5.8.8.jar b/...lasspath/spring-security-crypto-5.8.3.jar → ...lasspath/spring-security-crypto-5.8.8.jar
diff --git a/src/main/resources/META-INF/rewrite/classpath/spring-security-oauth2-client-5.8.8.jar b/src/main/resources/META-INF/rewrite/classpath/spring-security-oauth2-client-5.8.8.jar
diff --git a/...e/classpath/spring-security-web-5.8.3.jar → ...e/classpath/spring-security-web-5.8.8.jar b/...e/classpath/spring-security-web-5.8.3.jar → ...e/classpath/spring-security-web-5.8.8.jar
diff --git a/...SpringSecurity_5_8/java/org/openrewrite/spring/security5/RemoveOauth2LoginConfigTest.java b/...SpringSecurity_5_8/java/org/openrewrite/spring/security5/RemoveOauth2LoginConfigTest.java
@@ -31,7 +31,7 @@ public void defaults(RecipeSpec spec) {
         spec.recipe(new RemoveOauth2LoginConfig())
           .parser(JavaParser.fromJavaVersion()
             .logCompilationWarningsAndErrors(true)
-            .classpathFromResources(new InMemoryExecutionContext(), "spring-context-5.3.+", "spring-beans-5.3.+", "spring-web-5.3.+", "spring-security-web-5.8.+", "spring-security-config-5.8.+"));
+            .classpathFromResources(new InMemoryExecutionContext(), "spring-context-5.3.+", "spring-beans-5.3.+", "spring-web-5.3.+", "spring-security-web-5.8.+", "spring-security-config-5.8.+", "spring-security-oauth2-client-5.8.+"));
     }
 
     @DocumentExample