Merge branch 'main' into ilozano/spring-boot-3_0/pom-maven-compiler-p…

…roperties
openrewrite · Feb 25, 2024 · f290b9f · f290b9f
2 parents 263f4a4 + 9366e4b
commit f290b9f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/properties.yml b/.github/workflows/properties.yml
@@ -9,6 +9,7 @@ on:
 jobs:
   update-migrations:
     runs-on: ubuntu-latest
+    if: github.event_name != 'schedule' || github.repository_owner == 'openrewrite'
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/src/main/java/org/openrewrite/java/spring/boot3/ConfigurationOverEnableSecurity.java b/src/main/java/org/openrewrite/java/spring/boot3/ConfigurationOverEnableSecurity.java
@@ -46,7 +46,7 @@ public class ConfigurationOverEnableSecurity extends Recipe {
 
     private static final List<String> EXCLUSIONS = singletonList("org.springframework.security.config.annotation.rsocket.EnableRSocketSecurity");
 
-    private static final String ENABLE_SECURITY_ANNOTATION_PATTERN = "@org.springframework.security.config.annotation..*.Enable.*Security";
+    private static final String ENABLE_SECURITY_ANNOTATION_PATTERN = "@org.springframework.security.config.annotation..*.Enable*Security";
 
     private static final AnnotationMatcher SECURITY_ANNOTATION_MATCHER = new AnnotationMatcher(ENABLE_SECURITY_ANNOTATION_PATTERN, true);
 

diff --git a/src/main/resources/META-INF/rewrite/spring-boot-32-properties.yml b/src/main/resources/META-INF/rewrite/spring-boot-32-properties.yml
@@ -25,6 +25,9 @@ recipeList:
   - org.openrewrite.java.spring.ChangeSpringPropertyKey:
       oldPropertyKey: management.otlp.metrics.export.resource-attributes
       newPropertyKey: management.opentelemetry.resource-attributes
+  - org.openrewrite.java.spring.ChangeSpringPropertyKey:
+      oldPropertyKey: micrometer.observations.annotations.enabled
+      newPropertyKey: management.observations.annotations.enabled
   - org.openrewrite.java.spring.ChangeSpringPropertyKey:
       oldPropertyKey: server.max-http-header-size
       newPropertyKey: server.max-http-request-header-size

diff --git a/src/main/resources/META-INF/rewrite/spring-security-58.yml b/src/main/resources/META-INF/rewrite/spring-security-58.yml
@@ -79,8 +79,8 @@ recipeList:
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: org.openrewrite.java.spring.security5.RenameNimbusdsJsonObjectPackageName
-displayName: Rename the package name from `com.nimbusds.jose.shaded.json.JSONObject` to `net.minidev.json.JSONObject`
-description: Rename the package name from `com.nimbusds.jose.shaded.json.JSONObject` to `net.minidev.json.JSONObject`.
+displayName: Rename the package name from `com.nimbusds.jose.shaded.json` to `net.minidev.json`
+description: Rename the package name from `com.nimbusds.jose.shaded.json` to `net.minidev.json`.
 tags:
   - spring
   - security