This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 997eed0 Updating CDI API + JBoss Weld versions
997eed0 is described below
commit 997eed0a4bc68445fe46dcf093548e04b17e1566
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Tue Nov 19 13:19:05 2019 +0000
Updating CDI API + JBoss Weld versions
---
parent/pom.xml | 4 ++--
.../apache/cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java | 4 ++--
.../org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 2 +-
.../java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 2 +-
.../org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 2 +-
.../apache/cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java | 4 ++--
.../org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 2 +-
.../java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 2 +-
.../org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 2 +-
.../apache/cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java | 4 ++--
.../org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 2 +-
.../java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 2 +-
.../org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 2 +-
systests/cdi/cdi-weld/pom.xml | 7 +------
14 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index c854138..7d7accd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -92,7 +92,7 @@
<cxf.brave.version>5.6.9</cxf.brave.version>
<cxf.brave.zipkin.version>2.14.2</cxf.brave.zipkin.version>
<cxf.cda.api.osgi.range>[1.1,2)</cxf.cda.api.osgi.range>
- <cxf.cdi.api.version>1.2</cxf.cdi.api.version>
+ <cxf.cdi.api.version>2.0</cxf.cdi.api.version>
<cxf.classgraph.version>4.6.32</cxf.classgraph.version>
<cxf.classmate.version>1.1.0</cxf.classmate.version>
<cxf.commons-codec.version>1.13</cxf.commons-codec.version>
@@ -142,7 +142,7 @@
<cxf.jaxb.version>2.3.2</cxf.jaxb.version>
<cxf.jaxb.xjc.version>${cxf.jaxb.version}</cxf.jaxb.xjc.version>
<cxf.jboss.logging.version>3.3.0.Final</cxf.jboss.logging.version>
- <cxf.jboss.weld.version>2.4.8.Final</cxf.jboss.weld.version>
+ <cxf.jboss.weld.version>3.1.2.Final</cxf.jboss.weld.version>
<cxf.jcache.version>1.1.1</cxf.jcache.version>
<cxf.jdom.version>1.0</cxf.jdom.version>
<cxf.jettison.version>1.4.0</cxf.jettison.version>
diff --git
a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java
b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java
index f3b6dcd..debb4aa 100644
---
a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java
+++
b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java
@@ -18,9 +18,9 @@
*/
package org.apache.cxf.systest.jaxrs.cdi;
-import org.jboss.weld.environment.Container;
-import org.jboss.weld.environment.ContainerContext;
import org.jboss.weld.environment.jetty.JettyContainer;
+import org.jboss.weld.environment.servlet.Container;
+import org.jboss.weld.environment.servlet.ContainerContext;
import org.jboss.weld.environment.tomcat.TomcatContainer;
import org.jboss.weld.resources.spi.ResourceLoader;
diff --git
a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
index 735e99e..6eaf90f 100644
---
a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
+++
b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
@@ -22,8 +22,8 @@ package org.apache.cxf.systest.jaxrs.cdi.jetty;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.systests.cdi.base.AbstractCdiMultiAppTest;
import org.apache.cxf.systests.cdi.base.jetty.AbstractJettyServer;
-import org.jboss.weld.environment.Container;
import org.jboss.weld.environment.jetty.JettyContainer;
+import org.jboss.weld.environment.servlet.Container;
import org.jboss.weld.environment.servlet.Listener;
import org.junit.BeforeClass;
diff --git
a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
index dbe9506..677129c 100644
---
a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
+++
b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
@@ -22,8 +22,8 @@ package org.apache.cxf.systest.jaxrs.cdi.jetty;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.systests.cdi.base.AbstractCdiMultiAppTest;
import org.apache.cxf.systests.cdi.base.jetty.AbstractJettyServer;
-import org.jboss.weld.environment.Container;
import org.jboss.weld.environment.jetty.JettyContainer;
+import org.jboss.weld.environment.servlet.Container;
import org.jboss.weld.environment.servlet.Listener;
import org.junit.BeforeClass;
diff --git
a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
index 4fb3aea..9422139 100644
---
a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
+++
b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
@@ -22,7 +22,7 @@ package org.apache.cxf.systest.jaxrs.cdi.tomcat;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.systests.cdi.base.AbstractCdiMultiAppTest;
import org.apache.cxf.systests.cdi.base.tomcat.AbstractTomcatServer;
-import org.jboss.weld.environment.Container;
+import org.jboss.weld.environment.servlet.Container;
import org.jboss.weld.environment.tomcat.TomcatContainer;
import org.junit.BeforeClass;
diff --git
a/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java
b/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java
index f3b6dcd..debb4aa 100644
---
a/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java
+++
b/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java
@@ -18,9 +18,9 @@
*/
package org.apache.cxf.systest.jaxrs.cdi;
-import org.jboss.weld.environment.Container;
-import org.jboss.weld.environment.ContainerContext;
import org.jboss.weld.environment.jetty.JettyContainer;
+import org.jboss.weld.environment.servlet.Container;
+import org.jboss.weld.environment.servlet.ContainerContext;
import org.jboss.weld.environment.tomcat.TomcatContainer;
import org.jboss.weld.resources.spi.ResourceLoader;
diff --git
a/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
b/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
index 868efd6..e85d0ae 100644
---
a/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
+++
b/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
@@ -21,8 +21,8 @@ package org.apache.cxf.systest.jaxrs.cdi.jetty;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.systests.cdi.base.AbstractCdiSingleAppTest;
import org.apache.cxf.systests.cdi.base.jetty.AbstractJettyServer;
-import org.jboss.weld.environment.Container;
import org.jboss.weld.environment.jetty.JettyContainer;
+import org.jboss.weld.environment.servlet.Container;
import org.jboss.weld.environment.servlet.Listener;
import org.junit.BeforeClass;
diff --git
a/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
b/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
index 2118a66..a11a9d1 100644
---
a/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
+++
b/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
@@ -21,8 +21,8 @@ package org.apache.cxf.systest.jaxrs.cdi.jetty;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.systests.cdi.base.AbstractCdiSingleAppTest;
import org.apache.cxf.systests.cdi.base.jetty.AbstractJettyServer;
-import org.jboss.weld.environment.Container;
import org.jboss.weld.environment.jetty.JettyContainer;
+import org.jboss.weld.environment.servlet.Container;
import org.jboss.weld.environment.servlet.Listener;
import org.junit.BeforeClass;
diff --git
a/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
b/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
index 233ee9f..97a3874 100644
---
a/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
+++
b/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
@@ -21,7 +21,7 @@ package org.apache.cxf.systest.jaxrs.cdi.tomcat;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.systests.cdi.base.AbstractCdiSingleAppTest;
import org.apache.cxf.systests.cdi.base.tomcat.AbstractTomcatServer;
-import org.jboss.weld.environment.Container;
+import org.jboss.weld.environment.servlet.Container;
import org.jboss.weld.environment.tomcat.TomcatContainer;
import org.junit.BeforeClass;
diff --git
a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java
b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java
index f3b6dcd..debb4aa 100644
---
a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java
+++
b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java
@@ -18,9 +18,9 @@
*/
package org.apache.cxf.systest.jaxrs.cdi;
-import org.jboss.weld.environment.Container;
-import org.jboss.weld.environment.ContainerContext;
import org.jboss.weld.environment.jetty.JettyContainer;
+import org.jboss.weld.environment.servlet.Container;
+import org.jboss.weld.environment.servlet.ContainerContext;
import org.jboss.weld.environment.tomcat.TomcatContainer;
import org.jboss.weld.resources.spi.ResourceLoader;
diff --git
a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
index 7117e3e..5249065 100644
---
a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
+++
b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
@@ -21,8 +21,8 @@ package org.apache.cxf.systest.jaxrs.cdi.jetty;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.systest.jaxrs.cdi.AbstractBookStoreCdiTest;
import org.apache.cxf.systests.cdi.base.jetty.AbstractJettyServer;
-import org.jboss.weld.environment.Container;
import org.jboss.weld.environment.jetty.JettyContainer;
+import org.jboss.weld.environment.servlet.Container;
import org.jboss.weld.environment.servlet.Listener;
import org.junit.BeforeClass;
diff --git
a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
index 299e019..71573cb 100644
---
a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
+++
b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
@@ -21,8 +21,8 @@ package org.apache.cxf.systest.jaxrs.cdi.jetty;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.systest.jaxrs.cdi.AbstractBookStoreCdiTest;
import org.apache.cxf.systests.cdi.base.jetty.AbstractJettyServer;
-import org.jboss.weld.environment.Container;
import org.jboss.weld.environment.jetty.JettyContainer;
+import org.jboss.weld.environment.servlet.Container;
import org.jboss.weld.environment.servlet.Listener;
import org.junit.BeforeClass;
diff --git
a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
index ac9ca37..1d3bd13 100644
---
a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
+++
b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
@@ -21,7 +21,7 @@ package org.apache.cxf.systest.jaxrs.cdi.tomcat;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.systest.jaxrs.cdi.AbstractBookStoreCdiTest;
import org.apache.cxf.systests.cdi.base.tomcat.AbstractTomcatServer;
-import org.jboss.weld.environment.Container;
+import org.jboss.weld.environment.servlet.Container;
import org.jboss.weld.environment.tomcat.TomcatContainer;
import org.junit.BeforeClass;
diff --git a/systests/cdi/cdi-weld/pom.xml b/systests/cdi/cdi-weld/pom.xml
index 87ed68d..d52a47e 100644
--- a/systests/cdi/cdi-weld/pom.xml
+++ b/systests/cdi/cdi-weld/pom.xml
@@ -48,15 +48,10 @@
</dependency>
<dependency>
<groupId>org.jboss.weld.servlet</groupId>
- <artifactId>weld-servlet</artifactId>
+ <artifactId>weld-servlet-core</artifactId>
<version>${cxf.jboss.weld.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- <version>${cxf.jboss.weld.version}</version>
- </dependency>
- <dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
</dependency>
