cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/3] cxf git commit: Updating Weld version due to CVE-2014-8122
Date Tue, 15 Mar 2016 11:43:53 GMT
Updating Weld version due to CVE-2014-8122

# Conflicts:
#	parent/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/487cb7c2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/487cb7c2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/487cb7c2

Branch: refs/heads/3.0.x-fixes
Commit: 487cb7c2c992e280e3aa6758399ecfa5bfaccff5
Parents: 8fbce9d
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue Mar 15 11:35:09 2016 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue Mar 15 11:41:08 2016 +0000

----------------------------------------------------------------------
 parent/pom.xml                                              | 5 +++++
 .../cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java    | 9 +++++----
 .../cxf/systest/jaxrs/cdi/tomcat/AbstractTomcatServer.java  | 4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/487cb7c2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a06475f..15a8088 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -172,7 +172,12 @@
         <cxf.validation.api.version>1.1.0.Final</cxf.validation.api.version>
         <cxf.cdi.api.version>1.1</cxf.cdi.api.version>
         <cxf.json.api.version>1.0</cxf.json.api.version>
+<<<<<<< HEAD
         <cxf.jboss.weld.version>2.1.2.Final</cxf.jboss.weld.version>
+=======
+        <cxf.jboss.weld.version>2.3.3.Final</cxf.jboss.weld.version>
+        <cxf.jboss.logging.version>3.3.0.Final</cxf.jboss.logging.version>
+>>>>>>> 3a1b806... Updating Weld version due to CVE-2014-8122
         <cxf.osgi.validation.api.version>1.1.0</cxf.osgi.validation.api.version>
         <cxf.hibernate.validator.version>5.0.2.Final</cxf.hibernate.validator.version>
         <cxf.glassfish.json.version>1.0.4</cxf.glassfish.json.version>

http://git-wip-us.apache.org/repos/asf/cxf/blob/487cb7c2/systests/cdi/src/test/java/org/apache/cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java
----------------------------------------------------------------------
diff --git a/systests/cdi/src/test/java/org/apache/cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java
b/systests/cdi/src/test/java/org/apache/cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java
index db726d8..2fabdd1 100644
--- a/systests/cdi/src/test/java/org/apache/cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java
+++ b/systests/cdi/src/test/java/org/apache/cxf/systest/jaxrs/cdi/WeldDiscoverableContainer.java
@@ -21,7 +21,8 @@ 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.tomcat7.Tomcat7Container;
+import org.jboss.weld.environment.tomcat.TomcatContainer;
+import org.jboss.weld.resources.spi.ResourceLoader;
 
 /**
  * Because we are mixing several Servlet Containers in the same project, JBoss Weld
@@ -34,13 +35,13 @@ public class WeldDiscoverableContainer implements Container {
         if (JettyContainer.class.getName().equals(System.getProperty(Container.class.getName())))
{
             delegate = JettyContainer.INSTANCE;
         } else {
-            delegate = Tomcat7Container.INSTANCE;
+            delegate = TomcatContainer.INSTANCE;
         }
     }
 
     @Override
-    public boolean touch(ContainerContext context) throws Exception {
-        return delegate.touch(context);
+    public boolean touch(ResourceLoader loader, ContainerContext context) throws Exception
{
+        return delegate.touch(loader, context);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cxf/blob/487cb7c2/systests/cdi/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/AbstractTomcatServer.java
----------------------------------------------------------------------
diff --git a/systests/cdi/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/AbstractTomcatServer.java
b/systests/cdi/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/AbstractTomcatServer.java
index a28cff3..2ff0388 100644
--- a/systests/cdi/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/AbstractTomcatServer.java
+++ b/systests/cdi/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/AbstractTomcatServer.java
@@ -26,7 +26,7 @@ import java.io.IOException;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 import org.jboss.weld.environment.Container;
-import org.jboss.weld.environment.tomcat7.Tomcat7Container;
+import org.jboss.weld.environment.tomcat.TomcatContainer;
 
 public abstract class AbstractTomcatServer extends AbstractBusTestServerBase {
 
@@ -44,7 +44,7 @@ public abstract class AbstractTomcatServer extends AbstractBusTestServerBase
{
     protected void run() {
         System.setProperty("java.naming.factory.url", "org.eclipse.jetty.jndi");
         System.setProperty("java.naming.factory.initial", "org.eclipse.jetty.jndi.InitialContextFactory");
-        System.setProperty(Container.class.getName(), Tomcat7Container.class.getName());
+        System.setProperty(Container.class.getName(), TomcatContainer.class.getName());
                 
         server = new Tomcat();
         server.setPort(port);


Mime
View raw message