Author: rmannibucau
Date: Fri Mar 23 07:54:39 2018
New Revision: 1827547
URL: http://svn.apache.org/viewvc?rev=1827547&view=rev
Log:
MEECROWAVE-106 CXF 3.2.4 with cdi fixes, yeah
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=1827547&r1=1827546&r2=1827547&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
Fri Mar 23 07:54:39 2018
@@ -97,7 +97,6 @@ import org.apache.commons.text.StrLookup
import org.apache.commons.text.StrSubstitutor;
import org.apache.coyote.http2.Http2Protocol;
import org.apache.cxf.BusFactory;
-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;
@@ -133,11 +132,6 @@ 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 ConfigurableBus clientBus;
protected File base;
Modified: openwebbeans/meecrowave/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/pom.xml?rev=1827547&r1=1827546&r2=1827547&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/pom.xml (original)
+++ openwebbeans/meecrowave/trunk/pom.xml Fri Mar 23 07:54:39 2018
@@ -51,7 +51,7 @@
<junit.version>4.12</junit.version>
<tomcat.version>9.0.6</tomcat.version>
<openwebbeans.version>2.0.4</openwebbeans.version>
- <cxf.version>3.2.3</cxf.version>
+ <cxf.version>3.2.4</cxf.version>
<johnzon.version>1.1.7</johnzon.version>
<log4j2.version>2.11.0</log4j2.version>
<deltaspike.version>1.8.1</deltaspike.version>
@@ -162,6 +162,13 @@
</plugins>
</build>
+ <repositories>
+ <repository>
+ <id>cxf-staging</id>
+
<url>https://repository.apache.org/content/repositories/orgapachecxf-1115/</url>
+ </repository>
+ </repositories>
+
<!-- only needed when under development
<repositories>
<repository>
