From f84fc04eac1a572e20586f9617821d593ffc7316 Mon Sep 17 00:00:00 2001
From: Maxim Nesen <maxim.nesen@oracle.com>
Date: Tue, 20 Oct 2020 11:55:51 +0200
Subject: [PATCH] Weld integration

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
---
 examples/cdi-webapp/pom.xml      | 21 ---------------------
 examples/helloworld-weld/pom.xml | 17 -----------------
 pom.xml                          |  2 +-
 3 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/examples/cdi-webapp/pom.xml b/examples/cdi-webapp/pom.xml
index 9af9aefa36..70257808dc 100644
--- a/examples/cdi-webapp/pom.xml
+++ b/examples/cdi-webapp/pom.xml
@@ -175,23 +175,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <id>jakartification_exclude_tests</id> <!-- TODO remove after jakartification -->
-            <activation>
-                <jdk>[1.8,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 
     <build>
@@ -210,10 +193,6 @@
                 <configuration>
                     <forkMode>always</forkMode>
                     <enableAssertions>false</enableAssertions>
-                    <!-- TODO remove after jakartification -->
-                    <excludes>
-                        <exclude>org/glassfish/jersey/examples/cdi/resources/EchoParamBeanTest.java</exclude>
-                    </excludes>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/examples/helloworld-weld/pom.xml b/examples/helloworld-weld/pom.xml
index 3e39038e7f..d3824a9f25 100644
--- a/examples/helloworld-weld/pom.xml
+++ b/examples/helloworld-weld/pom.xml
@@ -124,23 +124,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>jakartification_exclude_tests</id> <!-- TODO remove after jakartification -->
-            <activation>
-                <jdk>[1.8,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 
 </project>
diff --git a/pom.xml b/pom.xml
index 71f2ef968a..a88e49c6f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2113,8 +2113,8 @@
         <spring5.version>5.1.5.RELEASE</spring5.version>
         <surefire.version>3.0.0-M3</surefire.version>
 
-        <weld.version>4.0.0.Beta1</weld.version> <!-- 2.4.1 doesn't work - bv tests -->
         <!-- Jakartified, eligible for CQ -->
+        <weld.version>4.0.0.Beta5</weld.version> <!-- 2.4.1 doesn't work - bv tests -->
         <validation.impl.version>7.0.0.Alpha6</validation.impl.version>
         <!-- END of Jakartified, eligible for CQ -->
         <xerces.version>2.11.0</xerces.version>