Rename Spring Web extensions

gsmet · Mar 11, 2024 · 813f8c5 · 813f8c5
1 parent 3922fa7
commit 813f8c5
Show file tree

Hide file tree

Showing 21 changed files with 158 additions and 36 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -2177,22 +2177,22 @@
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-spring-web-resteasy-classic</artifactId>
+                <artifactId>quarkus-spring-web-resteasy</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-spring-web-resteasy-classic-deployment</artifactId>
+                <artifactId>quarkus-spring-web-resteasy-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-spring-web-resteasy-reactive</artifactId>
+                <artifactId>quarkus-spring-web-rest</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-spring-web-resteasy-reactive-deployment</artifactId>
+                <artifactId>quarkus-spring-web-rest-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -6506,6 +6506,26 @@
                 <artifactId>quarkus-keycloak-admin-client-reactive-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-spring-web-resteasy-reactive</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-spring-web-resteasy-reactive-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-spring-web-resteasy-classic</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-spring-web-resteasy-classic-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <!-- End of Relocations, please put new extensions above this list -->
 
         </dependencies>

diff --git a/devtools/bom-descriptor-json/pom.xml b/devtools/bom-descriptor-json/pom.xml
@@ -2750,7 +2750,7 @@
                 </dependency>
                 <dependency>
                     <groupId>io.quarkus</groupId>
-                    <artifactId>quarkus-spring-web-resteasy-classic</artifactId>
+                    <artifactId>quarkus-spring-web-rest</artifactId>
                     <version>${project.version}</version>
                     <type>pom</type>
                     <scope>test</scope>
@@ -2763,7 +2763,7 @@
                 </dependency>
                 <dependency>
                     <groupId>io.quarkus</groupId>
-                    <artifactId>quarkus-spring-web-resteasy-reactive</artifactId>
+                    <artifactId>quarkus-spring-web-resteasy</artifactId>
                     <version>${project.version}</version>
                     <type>pom</type>
                     <scope>test</scope>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -2766,7 +2766,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-spring-web-resteasy-classic-deployment</artifactId>
+            <artifactId>quarkus-spring-web-rest-deployment</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
             <scope>test</scope>
@@ -2779,7 +2779,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-spring-web-resteasy-reactive-deployment</artifactId>
+            <artifactId>quarkus-spring-web-resteasy-deployment</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
             <scope>test</scope>

diff --git a/docs/src/main/asciidoc/spring-web.adoc b/docs/src/main/asciidoc/spring-web.adoc
@@ -202,7 +202,7 @@ public class GreetingControllerTest {
 }
 ----
 
-It should be noted that when using the Spring Web support in Quarkus, link:https://github.com/FasterXML/jackson[Jackson] is automatically added to the classpath and properly setup.
+It should be noted that when using the Spring Web support in Quarkus, link:https://github.com/FasterXML/jackson[Jackson] is automatically added to the classpath and properly set up.
 
 == Adding OpenAPI and Swagger-UI
 

diff --git a/extensions/spring-web/core/deployment/pom.xml b/extensions/spring-web/core/deployment/pom.xml
@@ -24,12 +24,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-spring-web-resteasy-classic-deployment</artifactId>
+            <artifactId>quarkus-spring-web-resteasy-deployment</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-spring-web-resteasy-reactive-deployment</artifactId>
+            <artifactId>quarkus-spring-web-rest-deployment</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>

diff --git a/...eb/core/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java b/...eb/core/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java
@@ -120,7 +120,7 @@ public void exceptionHandlingSupport(CombinedIndexBuildItem index,
 
         if (!isResteasyClassicAvailable && !isResteasyReactiveAvailable) {
             throw new IllegalStateException(
-                    "Spring Web can only work if 'quarkus-resteasy-jackson' or 'quarkus-resteasy-reactive-jackson' is present");
+                    "Spring Web can only work if 'quarkus-resteasy-jackson' or 'quarkus-rest-jackson' is present");
         }
 
         TypesUtil typesUtil = new TypesUtil(Thread.currentThread().getContextClassLoader());

diff --git a/extensions/spring-web/core/runtime/pom.xml b/extensions/spring-web/core/runtime/pom.xml
@@ -16,12 +16,12 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-spring-web-resteasy-classic</artifactId>
+            <artifactId>quarkus-spring-web-resteasy</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-spring-web-resteasy-reactive</artifactId>
+            <artifactId>quarkus-spring-web-rest</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>

diff --git a/extensions/spring-web/resteasy-classic/deployment/pom.xml b/extensions/spring-web/resteasy-classic/deployment/pom.xml
@@ -3,14 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-spring-web-resteasy-classic-parent</artifactId>
+        <artifactId>quarkus-spring-web-resteasy-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-spring-web-resteasy-classic-deployment</artifactId>
+    <artifactId>quarkus-spring-web-resteasy-deployment</artifactId>
     <name>Quarkus - Spring Web - RESTEasy Classic - Deployment</name>
 
     <dependencies>
@@ -25,7 +25,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-spring-web-resteasy-classic</artifactId>
+            <artifactId>quarkus-spring-web-resteasy</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/extensions/spring-web/resteasy-classic/pom.xml b/extensions/spring-web/resteasy-classic/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-spring-web-resteasy-classic-parent</artifactId>
+    <artifactId>quarkus-spring-web-resteasy-parent</artifactId>
     <name>Quarkus - Spring Web - RESTEasy Classic - Parent</name>
     <packaging>pom</packaging>
     <modules>

diff --git a/extensions/spring-web/resteasy-classic/runtime/pom.xml b/extensions/spring-web/resteasy-classic/runtime/pom.xml
@@ -3,14 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-spring-web-resteasy-classic-parent</artifactId>
+        <artifactId>quarkus-spring-web-resteasy-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-spring-web-resteasy-classic</artifactId>
+    <artifactId>quarkus-spring-web-resteasy</artifactId>
     <name>Quarkus - Spring Web - RESTEasy Classic - Runtime</name>
 
     <dependencies>

diff --git a/extensions/spring-web/resteasy-classic/tests/pom.xml b/extensions/spring-web/resteasy-classic/tests/pom.xml
@@ -3,15 +3,15 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-spring-web-resteasy-classic-parent</artifactId>
+        <artifactId>quarkus-spring-web-resteasy-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <!-- We need this module to get around cyclic dependencies issues -->
-    <artifactId>quarkus-spring-web-resteasy-classic-tests</artifactId>
+    <artifactId>quarkus-spring-web-resteasy-tests</artifactId>
     <name>Quarkus - Spring Web - RESTEasy Classic - Tests</name>
 
     <properties>
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-spring-web-resteasy-classic-deployment</artifactId>
+            <artifactId>quarkus-spring-web-resteasy-deployment</artifactId>
         </dependency>
 
         <dependency>

diff --git a/extensions/spring-web/resteasy-reactive/deployment/pom.xml b/extensions/spring-web/resteasy-reactive/deployment/pom.xml
@@ -3,15 +3,15 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-spring-web-resteasy-reactive-parent</artifactId>
+        <artifactId>quarkus-spring-web-rest-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-spring-web-resteasy-reactive-deployment</artifactId>
-    <name>Quarkus - Spring Web - RESTEasy Reactive - Deployment</name>
+    <artifactId>quarkus-spring-web-rest-deployment</artifactId>
+    <name>Quarkus - Spring Web - REST - Deployment</name>
 
     <dependencies>
         <dependency>
@@ -25,7 +25,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-spring-web-resteasy-reactive</artifactId>
+            <artifactId>quarkus-spring-web-rest</artifactId>
         </dependency>
 
         <dependency>

diff --git a/extensions/spring-web/resteasy-reactive/pom.xml b/extensions/spring-web/resteasy-reactive/pom.xml
@@ -10,8 +10,8 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-spring-web-resteasy-reactive-parent</artifactId>
-    <name>Quarkus - Spring Web - RESTEasy Reactive - Parent</name>
+    <artifactId>quarkus-spring-web-rest-parent</artifactId>
+    <name>Quarkus - Spring Web - REST - Parent</name>
     <packaging>pom</packaging>
     <modules>
         <module>deployment</module>

diff --git a/extensions/spring-web/resteasy-reactive/runtime/pom.xml b/extensions/spring-web/resteasy-reactive/runtime/pom.xml
@@ -3,15 +3,15 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-spring-web-resteasy-reactive-parent</artifactId>
+        <artifactId>quarkus-spring-web-rest-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-spring-web-resteasy-reactive</artifactId>
-    <name>Quarkus - Spring Web - RESTEasy Reactive - Runtime</name>
+    <artifactId>quarkus-spring-web-rest</artifactId>
+    <name>Quarkus - Spring Web - REST - Runtime</name>
 
     <dependencies>
         <dependency>

diff --git a/extensions/spring-web/resteasy-reactive/tests/pom.xml b/extensions/spring-web/resteasy-reactive/tests/pom.xml
@@ -3,16 +3,16 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-spring-web-resteasy-reactive-parent</artifactId>
+        <artifactId>quarkus-spring-web-rest-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <!-- We need this module to get around cyclic dependencies issues -->
-    <artifactId>quarkus-spring-web-resteasy-reactive-tests</artifactId>
-    <name>Quarkus - Spring Web - RESTEasy Reactive - Tests</name>
+    <artifactId>quarkus-spring-web-rest-tests</artifactId>
+    <name>Quarkus - Spring Web - REST - Tests</name>
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-spring-web-resteasy-reactive-deployment</artifactId>
+            <artifactId>quarkus-spring-web-rest-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/relocations/generaterelocations.java b/relocations/generaterelocations.java
@@ -118,6 +118,16 @@ public class generaterelocations implements Runnable {
                 "https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.9");
         RELOCATIONS.put("quarkus-keycloak-admin-client-reactive", keycloakAdminClientReactiveRelocation);
         RELOCATIONS.put("quarkus-keycloak-admin-client-reactive-deployment", keycloakAdminClientReactiveRelocation);
+
+        Function<String, Relocation>  springWebRESTEasyReactiveRelocation = a -> Relocation.ofArtifactId(a.replace("spring-web-resteasy-reactive", "spring-web-rest"),
+                "https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.9");
+        RELOCATIONS.put("quarkus-spring-web-resteasy-reactive", springWebRESTEasyReactiveRelocation);
+        RELOCATIONS.put("quarkus-spring-web-resteasy-reactive-deployment", springWebRESTEasyReactiveRelocation);
+
+        Function<String, Relocation>  springWebRESTEasyClassicRelocation = a -> Relocation.ofArtifactId(a.replace("spring-web-resteasy-classic", "spring-web-resteasy"),
+                "https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.9");
+        RELOCATIONS.put("quarkus-spring-web-resteasy-classic", springWebRESTEasyClassicRelocation);
+        RELOCATIONS.put("quarkus-spring-web-resteasy-classic-deployment", springWebRESTEasyClassicRelocation);
     }
 
     private static final String RELOCATION_POM_TEMPLATE = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + //

diff --git a/relocations/pom.xml b/relocations/pom.xml
@@ -83,6 +83,10 @@
         <module>quarkus-keycloak-admin-client-deployment</module>
         <module>quarkus-keycloak-admin-client-reactive</module>
         <module>quarkus-keycloak-admin-client-reactive-deployment</module>
+        <module>quarkus-spring-web-resteasy-reactive</module>
+        <module>quarkus-spring-web-resteasy-reactive-deployment</module>
+        <module>quarkus-spring-web-resteasy-classic</module>
+        <module>quarkus-spring-web-resteasy-classic-deployment</module>
     </modules>
 
 </project>
diff --git a/relocations/quarkus-spring-web-resteasy-classic-deployment/pom.xml b/relocations/quarkus-spring-web-resteasy-classic-deployment/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-relocations-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-spring-web-resteasy-classic-deployment</artifactId>
+
+    <distributionManagement>
+        <relocation>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-web-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <message>Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.9 for more information.</message>
+        </relocation>
+    </distributionManagement>
+</project>
diff --git a/relocations/quarkus-spring-web-resteasy-classic/pom.xml b/relocations/quarkus-spring-web-resteasy-classic/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-relocations-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-spring-web-resteasy-classic</artifactId>
+
+    <distributionManagement>
+        <relocation>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-web-resteasy</artifactId>
+            <version>${project.version}</version>
+            <message>Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.9 for more information.</message>
+        </relocation>
+    </distributionManagement>
+</project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -202,7 +202,7 @@ public class GreetingControllerTest { @@
     }
     ----
-    It should be noted that when using the Spring Web support in Quarkus, link:https://github.com/FasterXML/jackson[Jackson] is automatically added to the classpath and properly setup.
+    It should be noted that when using the Spring Web support in Quarkus, link:https://github.com/FasterXML/jackson[Jackson] is automatically added to the classpath and properly set up.
     == Adding OpenAPI and Swagger-UI
@@ Expand Down @@