Merge pull request #2678 from arjantijms/PAYARA-2671-Weld304

PAYARA-2671 Updated Weld to 3.0.4.Final
payara · May 8, 2018 · 7c6ea35 · 7c6ea35
2 parents 0f09462 + aa674a2
commit 7c6ea35
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 4 deletions.
diff --git a/appserver/extras/payara-micro/payara-micro-microprofile-distribution/pom.xml b/appserver/extras/payara-micro/payara-micro-microprofile-distribution/pom.xml
@@ -701,6 +701,10 @@
             <groupId>org.jboss.weld</groupId>
             <artifactId>weld-osgi-bundle</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.bcel</groupId>
+            <artifactId>bcel</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jboss.classfilewriter</groupId>
             <artifactId>jboss-classfilewriter</artifactId>

diff --git a/appserver/packager/glassfish-jcdi/pom.xml b/appserver/packager/glassfish-jcdi/pom.xml
@@ -40,7 +40,7 @@
     holder.
 
 -->
-<!-- Portions Copyright [2016-2017] [Payara Foundation and/or its affiliates] -->
+<!-- Portions Copyright [2016-2018] [Payara Foundation and/or its affiliates] -->
 
 <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 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion>
 
@@ -136,6 +136,10 @@
             <groupId>org.jboss.weld</groupId>
             <artifactId>weld-osgi-bundle</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.bcel</groupId>
+            <artifactId>bcel</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jboss.classfilewriter</groupId>
             <artifactId>jboss-classfilewriter</artifactId>

diff --git a/appserver/pom.xml b/appserver/pom.xml
@@ -122,9 +122,10 @@
         <!-- CDI -->
         <javax.inject.version>1</javax.inject.version>
         <cdi-api.version>2.0</cdi-api.version>
-        <weld.version>3.0.3.Final</weld.version>
+        <weld.version>3.0.4.Final</weld.version>
         <weld-api.version>3.0.SP2</weld-api.version>
-        <jboss.classfilewriter.version>1.2.1.Final</jboss.classfilewriter.version>
+        <jboss.classfilewriter.version>1.2.2.Final</jboss.classfilewriter.version>
+        <apache.bcel.version>6.2</apache.bcel.version>
 
         <!-- Java EE Security API -->
         <javax.security.enterprise-spec.version>1.0</javax.security.enterprise-spec.version>
@@ -833,6 +834,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.apache.bcel</groupId>
+                <artifactId>bcel</artifactId>
+                <version>${apache.bcel.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.jboss.weld</groupId>
                 <artifactId>weld-api</artifactId>

diff --git a/appserver/web/web-sse/pom.xml b/appserver/web/web-sse/pom.xml
@@ -40,7 +40,7 @@
     holder.
 
 -->
-<!-- Portions Copyright [2016] [Payara Foundation] -->
+<!-- Portions Copyright [2016-2018] [Payara Foundation and/or its affiliates] -->
 <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 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.glassfish.main.web</groupId>
@@ -82,5 +82,10 @@
             <artifactId>weld-osgi-bundle</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.bcel</groupId>
+            <artifactId>bcel</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/appserver/web/weld-integration/pom.xml b/appserver/web/weld-integration/pom.xml
@@ -156,6 +156,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.bcel</groupId>
+            <artifactId>bcel</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.glassfish.main.web</groupId>
             <artifactId>gf-weld-connector</artifactId>