Merge branch 'main' into refactor/migrate-to-j-specify

moderneinc · Aug 28, 2024 · c6c3b03 · c6c3b03
2 parents d9fefd8 + f43f6ee
commit c6c3b03
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/maven-versions-use-latest-releases.yml b/.github/workflows/maven-versions-use-latest-releases.yml
@@ -29,4 +29,4 @@ jobs:
       - name: maven-versions-use-latest-releases
         run: |
           mvn versions:use-latest-releases
-          git diff-index --quiet HEAD pom.xml || git commit -m "Use latest releases for Maven" pom.xml && git push origin main && rm -f pom.xml.versionsBackup
+          git diff-index --quiet HEAD pom.xml || (git commit -m "Use latest releases for Maven" pom.xml && git push origin main && rm -f pom.xml.versionsBackup)
diff --git a/.sdkmanrc b/.sdkmanrc
@@ -0,0 +1,3 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=17.0.12-tem
diff --git a/pom.xml b/pom.xml
@@ -84,7 +84,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>33.2.1-jre</version>
+            <version>33.3.0-jre</version>
             <scope>test</scope>
         </dependency>
 
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>6.1.11</version>
+            <version>6.1.12</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -205,15 +205,15 @@
             <plugin>
                 <groupId>org.openrewrite.maven</groupId>
                 <artifactId>rewrite-maven-plugin</artifactId>
-                <version>5.34.1</version>
+                <version>5.39.1</version>
                 <configuration>
                     <failOnDryRunResults>true</failOnDryRunResults>
                 </configuration>
                 <dependencies>
                     <dependency>
                         <groupId>org.openrewrite.recipe</groupId>
                         <artifactId>rewrite-recommendations</artifactId>
-                        <version>1.6.1</version>
+                        <version>1.8.4</version>
                     </dependency>
                 </dependencies>
             </plugin>