Rename oidc-token-propagation to resteasy-client-oidc-token-propagation

gsmet · Mar 11, 2024 · 4d2a7aa · 4d2a7aa
1 parent 8b2e441
commit 4d2a7aa
Show file tree

Hide file tree

Showing 13 changed files with 82 additions and 22 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -907,12 +907,12 @@
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-oidc-token-propagation</artifactId>
+                <artifactId>quarkus-resteasy-client-oidc-token-propagation</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-oidc-token-propagation-deployment</artifactId>
+                <artifactId>quarkus-resteasy-client-oidc-token-propagation-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -6456,6 +6456,16 @@
                 <artifactId>quarkus-oidc-token-propagation-reactive-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-oidc-token-propagation</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-oidc-token-propagation-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
@@ -1619,7 +1619,7 @@
                 </dependency>
                 <dependency>
                     <groupId>io.quarkus</groupId>
-                    <artifactId>quarkus-oidc-token-propagation</artifactId>
+                    <artifactId>quarkus-resteasy-client-oidc-token-propagation</artifactId>
                     <version>${project.version}</version>
                     <type>pom</type>
                     <scope>test</scope>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -1635,7 +1635,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-oidc-token-propagation-deployment</artifactId>
+            <artifactId>quarkus-resteasy-client-oidc-token-propagation-deployment</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
             <scope>test</scope>

diff --git a/extensions/oidc-token-propagation/deployment/pom.xml b/extensions/oidc-token-propagation/deployment/pom.xml
@@ -3,20 +3,20 @@
          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-oidc-token-propagation-parent</artifactId>
+        <artifactId>quarkus-resteasy-client-oidc-token-propagation-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-oidc-token-propagation-deployment</artifactId>
-    <name>Quarkus - OpenID Connect Token Propagation - Deployment</name>
+    <artifactId>quarkus-resteasy-client-oidc-token-propagation-deployment</artifactId>
+    <name>Quarkus - RESTEasy Client - OpenID Connect Token Propagation - Deployment</name>
 
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-oidc-token-propagation</artifactId>
+            <artifactId>quarkus-resteasy-client-oidc-token-propagation</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/extensions/oidc-token-propagation/pom.xml b/extensions/oidc-token-propagation/pom.xml
@@ -10,8 +10,8 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-oidc-token-propagation-parent</artifactId>
-    <name>Quarkus - OpenID Connect Token Propagation</name>
+    <artifactId>quarkus-resteasy-client-oidc-token-propagation-parent</artifactId>
+    <name>Quarkus - RESTEasy Client - OpenID Connect Token Propagation</name>
     <packaging>pom</packaging>
     <modules>
         <module>deployment</module>

diff --git a/extensions/oidc-token-propagation/runtime/pom.xml b/extensions/oidc-token-propagation/runtime/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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-oidc-token-propagation-parent</artifactId>
+        <artifactId>quarkus-resteasy-client-oidc-token-propagation-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-oidc-token-propagation</artifactId>
-    <name>Quarkus - OpenID Connect Token Propagation - Runtime</name>
-    <description>Use Jakarta REST Client filter to propagate the incoming Bearer access token or token acquired from Authorization Code Flow as HTTP Authorization Bearer token</description>
+    <artifactId>quarkus-resteasy-client-oidc-token-propagation</artifactId>
+    <name>Quarkus - RESTEasy Client - OpenID Connect Token Propagation - Runtime</name>
+    <description>Use RESTEasy Client filter to propagate the incoming Bearer access token or token acquired from Authorization Code Flow as HTTP Authorization Bearer token</description>
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/extensions/oidc-token-propagation/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/oidc-token-propagation/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,6 +1,6 @@
 ---
 artifact: ${project.groupId}:${project.artifactId}:${project.version}
-name: "OpenID Connect Token Propagation"
+name: "RESTEasy Client - OpenID Connect Token Propagation"
 metadata:
   keywords:
   - "oauth2"

diff --git a/integration-tests/oidc-token-propagation/pom.xml b/integration-tests/oidc-token-propagation/pom.xml
@@ -10,9 +10,8 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-integration-test-oidc-token-propagation</artifactId>
-    <name>Quarkus - Integration Tests - OpenID Connect Token Propagation</name>
-    <description>Module that contains OpenID Connect Token Propagation tests</description>
+    <artifactId>quarkus-integration-test-resteasy-client-oidc-token-propagation</artifactId>
+    <name>Quarkus - Integration Tests - RESTEasy Client OpenID Connect Token Propagation</name>
 
     <dependencies>
         <dependency>
@@ -67,11 +66,11 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-oidc-token-propagation</artifactId>
+            <artifactId>quarkus-resteasy-client-oidc-token-propagation</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-oidc-token-propagation-deployment</artifactId>
+            <artifactId>quarkus-resteasy-client-oidc-token-propagation-deployment</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
             <scope>test</scope>

diff --git a/integration-tests/smallrye-jwt-token-propagation/pom.xml b/integration-tests/smallrye-jwt-token-propagation/pom.xml
@@ -93,11 +93,11 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-oidc-token-propagation</artifactId>
+            <artifactId>quarkus-resteasy-client-oidc-token-propagation</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-oidc-token-propagation-deployment</artifactId>
+            <artifactId>quarkus-resteasy-client-oidc-token-propagation-deployment</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
             <scope>test</scope>

diff --git a/relocations/generaterelocations.java b/relocations/generaterelocations.java
@@ -91,6 +91,11 @@ public class generaterelocations implements Runnable {
         "https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.9");
         RELOCATIONS.put("quarkus-oidc-token-propagation-reactive", oidcTokenPropagationReactiveRelocation);
         RELOCATIONS.put("quarkus-oidc-token-propagation-reactive-deployment", oidcTokenPropagationReactiveRelocation);
+
+        Function<String, Relocation>  oidcTokenPropagationRelocation = a -> Relocation.ofArtifactId(a.replace("oidc-token-propagation", "resteasy-client-oidc-token-propagation"),
+        "https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.9");
+        RELOCATIONS.put("quarkus-oidc-token-propagation", oidcTokenPropagationRelocation);
+        RELOCATIONS.put("quarkus-oidc-token-propagation-deployment", oidcTokenPropagationRelocation);
     }
 
     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
@@ -73,6 +73,8 @@
         <module>quarkus-csrf-reactive-deployment</module>
         <module>quarkus-oidc-token-propagation-reactive</module>
         <module>quarkus-oidc-token-propagation-reactive-deployment</module>
+        <module>quarkus-oidc-token-propagation</module>
+        <module>quarkus-oidc-token-propagation-deployment</module>
     </modules>
 
 </project>
diff --git a/relocations/quarkus-oidc-token-propagation-deployment/pom.xml b/relocations/quarkus-oidc-token-propagation-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-oidc-token-propagation-deployment</artifactId>
+
+    <distributionManagement>
+        <relocation>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-client-oidc-token-propagation-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-oidc-token-propagation/pom.xml b/relocations/quarkus-oidc-token-propagation/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-oidc-token-propagation</artifactId>
+
+    <distributionManagement>
+        <relocation>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-client-oidc-token-propagation</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>