Author: rmannibucau
Date: Mon Feb 12 14:43:18 2018
New Revision: 1823977

URL: http://svn.apache.org/viewvc?rev=1823977&view=rev
Log:
MEECROWAVE-97 CXF 3.2.2 upgrade

Modified:
    
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
    openwebbeans/meecrowave/trunk/pom.xml

Modified: 
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java?rev=1823977&r1=1823976&r2=1823977&view=diff
==============================================================================
--- 
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
 (original)
+++ 
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
 Mon Feb 12 14:43:18 2018
@@ -97,6 +97,7 @@ import org.apache.catalina.startup.Tomca
 import org.apache.commons.lang3.text.StrLookup;
 import org.apache.commons.lang3.text.StrSubstitutor;
 import org.apache.coyote.http2.Http2Protocol;
+import org.apache.cxf.jaxrs.utils.InjectionUtils;
 import org.apache.johnzon.core.BufferStrategy;
 import org.apache.meecrowave.api.StartListening;
 import org.apache.meecrowave.api.StopListening;
@@ -130,6 +131,11 @@ import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
 public class Meecrowave implements AutoCloseable {
+    static {
+        // todo: remove if cxf fixes it for 3.2.3
+        InjectionUtils.STANDARD_CONTEXT_CLASSES.removeIf(s -> 
s.startsWith("javax.servlet."));
+    }
+
     private final Builder configuration;
     protected File base;
     protected final File ownedTempDir;

Modified: openwebbeans/meecrowave/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/pom.xml?rev=1823977&r1=1823976&r2=1823977&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/pom.xml (original)
+++ openwebbeans/meecrowave/trunk/pom.xml Mon Feb 12 14:43:18 2018
@@ -51,7 +51,7 @@
     <junit.version>4.12</junit.version>
     <tomcat.version>9.0.5</tomcat.version>
     <openwebbeans.version>2.0.4-SNAPSHOT</openwebbeans.version>
-    <cxf.version>3.2.1</cxf.version>
+    <cxf.version>3.2.2</cxf.version>
     <johnzon.version>1.1.6-SNAPSHOT</johnzon.version>
     <log4j2.version>2.10.0</log4j2.version>
     <deltaspike.version>1.8.0</deltaspike.version>


Reply via email to