Merge branch 'main' into patch-2

Author: timtebeek

.sdkmanrc

@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=21.0.7-tem
+java=21.0.8-tem

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionSha256Sum=df67a32e86e3276d011735facb1535f64d0d88df84fa87521e90becc2d735444
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -202,7 +202,7 @@ fi
 
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=
 
 # Collect all arguments for the java command:
 #   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,

gradlew

@@ -36,7 +36,7 @@ set APP_HOME=%DIRNAME%
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

gradlew.bat

@@ -33,7 +33,7 @@ recipeList:
       newGroupId: jakarta.annotation
       newArtifactId: jakarta.annotation-api
       newVersion: 1.3.x
-      # set explicitly even if  managed, as higher versions do not have the javax namespace
+      # Set explicitly even if managed, as higher versions do not have the javax namespace
       overrideManagedVersion: true
       changeManagedDependency: false
   # Jakarta EE recommends `provided` scope

src/main/resources/META-INF/rewrite/add-common-annotations-dependencies.yml

@@ -140,9 +140,9 @@ recipeList:
       newVersion: 2.3.x
   # Add the jakarta JAXB artifact if it is missing but a project uses types in either javax.jws or javax.xml.ws
   - org.openrewrite.java.dependencies.AddDependency:
-      groupId: jakarta.xml.ws
-      artifactId: jakarta.xml.ws-api
-      version: 2.3.x
+      groupId: jakarta.jws
+      artifactId: jakarta.jws-api
+      version: 2.1.x
       onlyIfUsing: javax.jws..*
       acceptTransitive: true
   - org.openrewrite.java.dependencies.AddDependency:

src/main/resources/META-INF/rewrite/java-version-11.yml

@@ -72,8 +72,6 @@ recipeList:
       artifactId: mapstruct*
       newVersion: 1.6.x
   - org.openrewrite.java.migrate.AddLombokMapstructBinding
-  - org.openrewrite.java.migrate.UpdateJakartaAnnotationsIfForJavax
-  - org.openrewrite.java.migrate.UpdateJakartaAnnotationsIfExistsForJakarta
 
 ---
 type: specs.openrewrite.org/v1beta/recipe
@@ -338,28 +336,4 @@ recipeList:
       groupId: org.projectlombok
       artifactId: lombok-mapstruct-binding
       version: 0.2.0
----
-# The scanning phase comes before the editing phase, therefor we check if a javax.annotation dependency is on the classpath (with whatever version)
-type: specs.openrewrite.org/v1beta/recipe
-name: org.openrewrite.java.migrate.UpdateJakartaAnnotationsIfForJavax
-displayName: Update `jakarta.annotation-api` dependency if it exists
-description: Counteract the `jakarta.annotation-api` by updating to `jakarta` namespace
-preconditions:
-  - org.openrewrite.java.dependencies.search.ModuleHasDependency:
-      groupIdPattern: javax.annotation
-      artifactIdPattern: javax.annotation-api
-recipeList:
-  - org.openrewrite.java.migrate.jakarta.JavaxAnnotationMigrationToJakartaAnnotation
 
----
-type: specs.openrewrite.org/v1beta/recipe
-name: org.openrewrite.java.migrate.UpdateJakartaAnnotationsIfExistsForJakarta
-displayName: Update `jakarta.annotation-api` dependency if it exists
-description: Counteract the `jakarta.annotation-api` by updating to `jakarta` namespace
-preconditions:
-  - org.openrewrite.java.dependencies.search.ModuleHasDependency:
-      groupIdPattern: jakarta.annotation
-      artifactIdPattern: jakarta.annotation-api
-      version: 1.3.x
-recipeList:
-  - org.openrewrite.java.migrate.jakarta.JavaxAnnotationMigrationToJakartaAnnotation

src/main/resources/META-INF/rewrite/java-version-17.yml

@@ -25,6 +25,8 @@ tags:
   - java8
 recipeList:
   - org.openrewrite.java.migrate.UpgradeToJava7
+  - org.openrewrite.java.migrate.UpgradeJavaVersion:
+      version: 8
   - org.openrewrite.java.migrate.MXBeanRule
   - org.openrewrite.java.migrate.BounceCastleFromJdk15OntoJdk18On
   - org.openrewrite.java.RemoveMethodInvocations:

src/main/resources/META-INF/rewrite/java-version-8.yml

@@ -504,76 +504,6 @@ void test() throws Exception {
         );
     }
 
-    @Issue("https://github.com/openrewrite/rewrite-migrate-java/pull/816")
-    @Test
-    void javaxAnnotationApiToJakarta() {
-        rewriteRun(
-          spec -> spec.parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "javax.annotation-api-1.3.2")),
-          version(
-            mavenProject("project",
-              //language=xml
-              pomXml(
-                """
-                  <project>
-                    <modelVersion>4.0.0</modelVersion>
-                    <groupId>com.mycompany.app</groupId>
-                    <artifactId>my-app</artifactId>
-                    <version>1</version>
-                    <dependencies>
-                      <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>javax.annotation-api</artifactId>
-                        <version>1.3.2</version>
-                      </dependency>
-                    </dependencies>
-                  </project>
-                  """,
-                """
-                  <project>
-                    <modelVersion>4.0.0</modelVersion>
-                    <groupId>com.mycompany.app</groupId>
-                    <artifactId>my-app</artifactId>
-                    <version>1</version>
-                    <properties>
-                      <maven.compiler.release>17</maven.compiler.release>
-                    </properties>
-                    <dependencies>
-                      <dependency>
-                        <groupId>jakarta.annotation</groupId>
-                        <artifactId>jakarta.annotation-api</artifactId>
-                        <version>2.0.0</version>
-                        <scope>provided</scope>
-                      </dependency>
-                    </dependencies>
-                  </project>
-                  """
-              ),
-              //language=java
-              srcMainJava(
-                java(
-                  """
-                    import javax.annotation.PostConstruct;
-
-                    class A {
-                       @PostConstruct
-                       void init() {}
-                    }
-                    """,
-                  """
-                    import jakarta.annotation.PostConstruct;
-
-                    class A {
-                       @PostConstruct
-                       void init() {}
-                    }
-                    """
-                )
-              )
-            ),
-            8)
-        );
-    }
-
     @Test
     void upgradeSpotbugsPluginVersion() {
         rewriteRun(