Fixes piranhacloud#4075 - Update to Weld 6.0.0.Beta4 (piranhacloud#4076)

mnriem · Oct 20, 2024 · 20bcd73 · 20bcd73
1 parent cc566fd
commit 20bcd73
Show file tree

Hide file tree

Showing 34 changed files with 26 additions and 25 deletions.
diff --git a/VERSIONS.md b/VERSIONS.md
@@ -25,11 +25,12 @@ used by Piranha to deliver various bits and pieces of functionality.
 | Eclipse Yasson            | 3.0.4         |
 | EclipseLink               | 5.0.0-B02     |
 | Hazelcast                 | 5.4.0         |
+| Jakarta CDI               | 4.1.0         |
 | Netty                     | 4.1.112.Final |
 | OmniFaces Services        | 0.4           |
 | OmniFish OmniBeans        | 0.3           |
 | OmniFish Transact         | 1.0.1         |
 | Project CRaC              | 0.1.3         |
 | Spring Boot               | 3.3.0         |
 | Undertow                  | 2.3.14.Final  |
-| Weld                      | 6.0.0.Beta1   |
+| Weld                      | 6.0.0.Beta4   |
diff --git a/docs/src/site/markdown/servlet/create_a_faces_application.md b/docs/src/site/markdown/servlet/create_a_faces_application.md
@@ -36,7 +36,7 @@ create the ```pom.xml``` file with the content as below.
         <!-- dependencies -->
         <junit.version>5.11.0</junit.version>
         <mojarra.version>4.0.7</mojarra.version>
-        <weld.version>5.1.3.Final</weld.version>
+        <weld.version>6.0.0.Beta4</weld.version>
         <!-- other -->
         <java.version>21</java.version>
         <piranha.distribution>servlet</piranha.distribution>
@@ -63,7 +63,7 @@ create the ```pom.xml``` file with the content as below.
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-redhat-weld</artifactId>
+            <artifactId>piranha-extension-weld</artifactId>
             <version>${piranha.version}</version>
             <scope>runtime</scope>
         </dependency>

diff --git a/docs/src/site/markdown/servlet/run_a_web_application_on_crac.md b/docs/src/site/markdown/servlet/run_a_web_application_on_crac.md
@@ -41,7 +41,7 @@ create the ```pom.xml``` file with the content as below.
         <junit.version>5.11.0-M1</junit.version>
         <mojarra.version>4.0.6</mojarra.version>
         <piranha.version>24.4.0</piranha.version>
-        <weld.version>5.1.2.Final</weld.version>
+        <weld.version>6.0.0.Beta4</weld.version>
         <!-- other -->
         <java.version>21</java.version>
         <piranha.distribution>servlet</piranha.distribution>
@@ -68,7 +68,7 @@ create the ```pom.xml``` file with the content as below.
         <!-- runtime -->
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-redhat-weld</artifactId>
+            <artifactId>piranha-extension-weld</artifactId>
             <version>${piranha.version}</version>
             <scope>runtime</scope>
         </dependency>

diff --git a/extension/coreprofile/pom.xml b/extension/coreprofile/pom.xml
@@ -63,7 +63,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-redhat-weld</artifactId>
+            <artifactId>piranha-extension-weld</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

diff --git a/extension/micro/pom.xml b/extension/micro/pom.xml
@@ -163,7 +163,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-redhat-weld</artifactId>
+            <artifactId>piranha-extension-weld</artifactId>
             <version>${project.version}</version>
             <scope>runtime</scope>
         </dependency>

diff --git a/extension/microprofile/pom.xml b/extension/microprofile/pom.xml
@@ -57,7 +57,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-redhat-weld</artifactId>
+            <artifactId>piranha-extension-weld</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

diff --git a/extension/platform/pom.xml b/extension/platform/pom.xml
@@ -70,7 +70,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-redhat-weld</artifactId>
+            <artifactId>piranha-extension-weld</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

diff --git a/extension/pom.xml b/extension/pom.xml
@@ -53,7 +53,6 @@
         <module>platform</module>
         <module>policy</module>
         <module>redhat-hibernate-validator</module>
-        <module>redhat-weld</module>
         <module>scinitializer</module>
         <module>security-servlet</module>
         <module>security-jakarta</module>
@@ -63,6 +62,7 @@
         <module>webprofile</module>
         <module>webxml</module>
         <module>welcomefile</module>
+        <module>weld</module>
     </modules>
 
     <dependencyManagement>

diff --git a/extension/security-jakarta/pom.xml b/extension/security-jakarta/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-redhat-weld</artifactId>
+            <artifactId>piranha-extension-weld</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>

diff --git a/extension/webprofile/pom.xml b/extension/webprofile/pom.xml
@@ -154,7 +154,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-redhat-weld</artifactId>
+            <artifactId>piranha-extension-weld</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

diff --git a/extension/redhat-weld/pom.xml → extension/weld/pom.xml b/extension/redhat-weld/pom.xml → extension/weld/pom.xml
@@ -7,10 +7,10 @@
         <artifactId>project</artifactId>
         <version>24.11.0-SNAPSHOT</version>
     </parent>
-    <artifactId>piranha-extension-redhat-weld</artifactId>
+    <artifactId>piranha-extension-weld</artifactId>
     <packaging>jar</packaging>
 
-    <name>Piranha - Extension - RedHat Weld</name>
+    <name>Piranha - Extension - Weld</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/...ld/RealtimeHttpServletRequestWrapper.java → ...ld/RealtimeHttpServletRequestWrapper.java b/...ld/RealtimeHttpServletRequestWrapper.java → ...ld/RealtimeHttpServletRequestWrapper.java
diff --git a/...cloud/piranha/extension/weld/WeldCDI.java → ...cloud/piranha/extension/weld/WeldCDI.java b/...cloud/piranha/extension/weld/WeldCDI.java → ...cloud/piranha/extension/weld/WeldCDI.java
diff --git a/...piranha/extension/weld/WeldContainer.java → ...piranha/extension/weld/WeldContainer.java b/...piranha/extension/weld/WeldContainer.java → ...piranha/extension/weld/WeldContainer.java
diff --git a/...piranha/extension/weld/WeldExtension.java → ...piranha/extension/weld/WeldExtension.java b/...piranha/extension/weld/WeldExtension.java → ...piranha/extension/weld/WeldExtension.java
diff --git a/...xtension/weld/WeldHttpServletRequest.java → ...xtension/weld/WeldHttpServletRequest.java b/...xtension/weld/WeldHttpServletRequest.java → ...xtension/weld/WeldHttpServletRequest.java
diff --git a/...anha/extension/weld/WeldInitListener.java → ...anha/extension/weld/WeldInitListener.java b/...anha/extension/weld/WeldInitListener.java → ...anha/extension/weld/WeldInitListener.java
diff --git a/...ranha/extension/weld/WeldInitializer.java → ...ranha/extension/weld/WeldInitializer.java b/...ranha/extension/weld/WeldInitializer.java → ...ranha/extension/weld/WeldInitializer.java
diff --git a/...nsion/weld/WeldObjectInstanceManager.java → ...nsion/weld/WeldObjectInstanceManager.java b/...nsion/weld/WeldObjectInstanceManager.java → ...nsion/weld/WeldObjectInstanceManager.java
diff --git a/.../piranha/extension/weld/WeldProvider.java → .../piranha/extension/weld/WeldProvider.java b/.../piranha/extension/weld/WeldProvider.java → .../piranha/extension/weld/WeldProvider.java
diff --git a/...a/extension/weld/WeldSecurityService.java → ...a/extension/weld/WeldSecurityService.java b/...a/extension/weld/WeldSecurityService.java → ...a/extension/weld/WeldSecurityService.java
diff --git a/...edhat-weld/src/main/java/module-info.java → ...nsion/weld/src/main/java/module-info.java b/...edhat-weld/src/main/java/module-info.java → ...nsion/weld/src/main/java/module-info.java
diff --git a/...ices/org.jboss.weld.bootstrap.api.Service → ...ices/org.jboss.weld.bootstrap.api.Service b/...ices/org.jboss.weld.bootstrap.api.Service → ...ices/org.jboss.weld.bootstrap.api.Service
diff --git a/....jboss.weld.environment.servlet.Container → ....jboss.weld.environment.servlet.Container b/....jboss.weld.environment.servlet.Container → ....jboss.weld.environment.servlet.Container
diff --git a/external/coreprofile-tck/pom.xml b/external/coreprofile-tck/pom.xml
@@ -36,7 +36,7 @@
         <rest.tck.version>3.1.5</rest.tck.version>
         <!-- Implementation versions -->
         <parsson.version>1.1.7</parsson.version>
-        <weld.version>5.1.3.Final</weld.version>
+        <weld.version>6.0.0.Beta4</weld.version>
         <yasson.version>3.0.4</yasson.version>
     </properties>
 </project>
diff --git a/micro/core/pom.xml b/micro/core/pom.xml
@@ -102,7 +102,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-redhat-weld</artifactId>
+            <artifactId>piranha-extension-weld</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>

diff --git a/test/debug/pom.xml b/test/debug/pom.xml
@@ -173,7 +173,7 @@
 
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-redhat-weld</artifactId>
+            <artifactId>piranha-extension-weld</artifactId>
             <version>${project.version}</version>
         </dependency>
 

diff --git a/test/embedded/eclipselink/pom.xml b/test/embedded/eclipselink/pom.xml
@@ -93,7 +93,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-redhat-weld</artifactId>
+            <artifactId>piranha-extension-weld</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>

diff --git a/test/embedded/hazelcast/pom.xml b/test/embedded/hazelcast/pom.xml
@@ -81,7 +81,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-redhat-weld</artifactId>
+            <artifactId>piranha-extension-weld</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>

diff --git a/test/embedded/jersey/pom.xml b/test/embedded/jersey/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-redhat-weld</artifactId>
+            <artifactId>piranha-extension-weld</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>

diff --git a/test/embedded/soteria-basic/pom.xml b/test/embedded/soteria-basic/pom.xml
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-redhat-weld</artifactId>
+            <artifactId>piranha-extension-weld</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>

diff --git a/test/embedded/soteria-form/pom.xml b/test/embedded/soteria-form/pom.xml
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-redhat-weld</artifactId>
+            <artifactId>piranha-extension-weld</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>

diff --git a/test/embedded/weld/pom.xml b/test/embedded/weld/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-redhat-weld</artifactId>
+            <artifactId>piranha-extension-weld</artifactId>
             <version>${project.version}</version>
             <scope>runtime</scope>
         </dependency>

diff --git a/test/servlet/faces/pom.xml b/test/servlet/faces/pom.xml
@@ -32,7 +32,7 @@
         <!-- dependencies -->
         <junit.version>5.11.2</junit.version>
         <mojarra.version>4.0.8</mojarra.version>
-        <weld.version>5.1.3.Final</weld.version>
+        <weld.version>6.0.0.Beta4</weld.version>
         <!-- other -->
         <java.version>21</java.version>
         <piranha.distribution>servlet</piranha.distribution>
@@ -59,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-redhat-weld</artifactId>
+            <artifactId>piranha-extension-weld</artifactId>
             <version>${piranha.version}</version>
             <scope>runtime</scope>
         </dependency>