You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/03/08 16:59:57 UTC
cxf git commit: Move some deps into parent pom, update some other deps
Repository: cxf
Updated Branches:
refs/heads/master 218218f5c -> bfa7a22c9
Move some deps into parent pom, update some other deps
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bfa7a22c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bfa7a22c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bfa7a22c
Branch: refs/heads/master
Commit: bfa7a22c95af1f7c33f218d0cf5b10f17fce308c
Parents: 218218f
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Mar 8 11:37:07 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Mar 8 11:37:07 2017 -0500
----------------------------------------------------------------------
integration/cdi/pom.xml | 4 +-
.../cxf/cdi/JAXRSCdiResourceExtensionTest.java | 2 +-
maven-plugins/java2wadl-plugin/pom.xml | 2 +-
.../features/src/main/resources/features.xml | 4 +-
parent/pom.xml | 89 ++++++++++++++++++--
rt/features/logging/pom.xml | 1 -
rt/rs/client/pom.xml | 2 +-
rt/rs/extensions/rx/pom.xml | 1 -
rt/transports/http-undertow/pom.xml | 2 -
rt/transports/jms/pom.xml | 2 -
rt/ws/eventing/pom.xml | 5 +-
rt/ws/rm/pom.xml | 1 -
services/sts/sts-core/pom.xml | 10 ---
services/wsn/wsn-core/pom.xml | 3 +-
systests/container-integration/grizzly/pom.xml | 2 +-
systests/jaxws/pom.xml | 11 ---
.../apache/cxf/systest/jaxws/CXF6655Test.java | 14 ++-
systests/transports/pom.xml | 11 ---
.../systest/http/HTTPProxyAuthConduitTest.java | 44 ++++++----
.../cxf/systest/http/HTTPProxyConduitTest.java | 24 +++---
.../conduit/HTTPSProxyAuthConduitTest.java | 48 +++++++----
.../https/conduit/HTTPSProxyConduitTest.java | 30 ++++---
systests/uncategorized/pom.xml | 1 -
23 files changed, 184 insertions(+), 129 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/integration/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/integration/cdi/pom.xml b/integration/cdi/pom.xml
index 09e4132..fc059d1 100644
--- a/integration/cdi/pom.xml
+++ b/integration/cdi/pom.xml
@@ -34,7 +34,7 @@
<properties>
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
- javax.enterprise*;version="[${cxf.cdi.api.version},2)",
+ javax.enterprise*;version="${cxf.cda.api.osgi.range}",
javax.ws.rs*;version="[1.0,3)",
org.apache.cxf.interceptor;resolution:=optional,
*
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.1.0</version>
+ <version>2.7.14</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/integration/cdi/src/test/java/org/apache/cxf/cdi/JAXRSCdiResourceExtensionTest.java
----------------------------------------------------------------------
diff --git a/integration/cdi/src/test/java/org/apache/cxf/cdi/JAXRSCdiResourceExtensionTest.java b/integration/cdi/src/test/java/org/apache/cxf/cdi/JAXRSCdiResourceExtensionTest.java
index c0997c0..72c4d34 100644
--- a/integration/cdi/src/test/java/org/apache/cxf/cdi/JAXRSCdiResourceExtensionTest.java
+++ b/integration/cdi/src/test/java/org/apache/cxf/cdi/JAXRSCdiResourceExtensionTest.java
@@ -29,7 +29,7 @@ import org.apache.cxf.Bus;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.never;
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/maven-plugins/java2wadl-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/java2wadl-plugin/pom.xml b/maven-plugins/java2wadl-plugin/pom.xml
index 4527ff0..42a7fbe 100644
--- a/maven-plugins/java2wadl-plugin/pom.xml
+++ b/maven-plugins/java2wadl-plugin/pom.xml
@@ -117,7 +117,7 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.3</version>
+ <version>2.10.4</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/osgi/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 8398a24..5b204be 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -128,7 +128,7 @@
<feature version="${project.version}">cxf-rt-security-saml</feature>
<feature version="${project.version}">cxf-ws-policy</feature>
<feature version="${project.version}">cxf-ws-addr</feature>
- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.transaction.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.jta.version}</bundle>
<bundle start-level="40" dependency="true">mvn:net.sf.ehcache/ehcache/${cxf.ehcache.version}</bundle>
<bundle start-level="40">mvn:org.apache.cxf/cxf-rt-ws-security/${project.version}</bundle>
</feature>
@@ -349,7 +349,7 @@
<feature name="cxf-transports-jms" version="${project.version}">
<feature version="${project.version}">cxf-core</feature>
<feature version="${project.version}">cxf-bindings-soap</feature>
- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.transaction.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.jta.version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${cxf.geronimo.jms.version}</bundle>
<bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-jms/${project.version}</bundle>
</feature>
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 307d074..972ee86 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -69,7 +69,7 @@
<cxf.abdera.version>1.1.3</cxf.abdera.version>
<cxf.abdera.osgi.version>1.1.3_2</cxf.abdera.osgi.version>
<cxf.activemq.version>5.14.4</cxf.activemq.version>
- <cxf.ahc.version>1.9.8</cxf.ahc.version>
+ <cxf.ahc.version>1.9.40</cxf.ahc.version>
<cxf.apacheds.version>2.0.0-M23</cxf.apacheds.version>
<cxf.atmosphere.version>2.4.9</cxf.atmosphere.version>
<cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
@@ -81,7 +81,7 @@
<cxf.commons-codec.version>1.10</cxf.commons-codec.version>
<cxf.commons-collections.version>3.2.2</cxf.commons-collections.version>
<cxf.commons-lang3.version>3.5</cxf.commons-lang3.version>
- <cxf.derby.version>10.12.1.1</cxf.derby.version>
+ <cxf.derby.version>10.13.1.1</cxf.derby.version>
<cxf.dropwizard.version>3.2.0</cxf.dropwizard.version>
<cxf.ehcache.version>2.10.3</cxf.ehcache.version>
<cxf.ehcache3.version>3.0.3</cxf.ehcache3.version>
@@ -95,19 +95,19 @@
<cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range>
<cxf.jackson.version>2.8.7</cxf.jackson.version>
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
- <cxf.logback.classic.version>1.0.13</cxf.logback.classic.version>
+ <cxf.logback.classic.version>1.2.1</cxf.logback.classic.version>
<cxf.log4j.version>1.2.17</cxf.log4j.version>
<cxf.lucene.version>4.9.0</cxf.lucene.version>
<cxf.mina.version>2.0.14</cxf.mina.version>
- <cxf.rx.java.version>1.1.3</cxf.rx.java.version>
- <cxf.javax.annotation-api.version>1.2</cxf.javax.annotation-api.version>
+ <cxf.rx.java.version>1.2.7</cxf.rx.java.version>
+ <cxf.javax.annotation-api.version>1.3</cxf.javax.annotation-api.version>
<cxf.jcache.version>1.0.0</cxf.jcache.version>
<cxf.geronimo.jms.version>1.1.1</cxf.geronimo.jms.version>
<cxf.geronimo.jta.version>1.1.1</cxf.geronimo.jta.version>
<cxf.geronimo.j2ee.management.version>1.0.1</cxf.geronimo.j2ee.management.version>
<cxf.geronimo.jpa.version>1.0</cxf.geronimo.jpa.version>
<cxf.openjpa.version>2.4.2</cxf.openjpa.version>
- <cxf.geronimo.transaction.version>1.1.1</cxf.geronimo.transaction.version>
+ <cxf.geronimo.transaction.version>3.1.4</cxf.geronimo.transaction.version>
<cxf.jasypt.bundle.version>1.9.0_1</cxf.jasypt.bundle.version>
<cxf.javassist.version>3.19.0-GA</cxf.javassist.version>
<cxf.javax.ws.rs.version>2.1-m05</cxf.javax.ws.rs.version>
@@ -128,6 +128,7 @@
<cxf.undertow.osgi.version>[1.3, 1.5)</cxf.undertow.osgi.version>
<cxf.junit.version>4.12</cxf.junit.version>
<cxf.hamcrest.version>1.3</cxf.hamcrest.version>
+ <cxf.littleproxy.version>1.1.2</cxf.littleproxy.version>
<cxf.maven.core.version>3.0.5</cxf.maven.core.version>
<cxf.msv.version>2013.6.1</cxf.msv.version>
<cxf.neethi.version>3.0.3</cxf.neethi.version>
@@ -146,14 +147,14 @@
<cxf.servlet-api.version>3.1.0</cxf.servlet-api.version>
<cxf.geronimo.servlet25.version>1.2</cxf.geronimo.servlet25.version>
<cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact>
- <cxf.servlet-api-2.5.version>1.1.2</cxf.servlet-api-2.5.version>
+ <cxf.servlet-api-2.5.version>1.2</cxf.servlet-api-2.5.version>
<cxf.slf4j.version>1.7.24</cxf.slf4j.version>
<cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
<cxf.spring.version>4.3.7.RELEASE</cxf.spring.version>
<cxf.spring.boot.version>1.5.2.RELEASE</cxf.spring.boot.version>
<cxf.spring.security.version>4.2.2.RELEASE</cxf.spring.security.version>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
- <cxf.spring.ldap.version>2.2.1.RELEASE</cxf.spring.ldap.version>
+ <cxf.spring.ldap.version>2.3.1.RELEASE</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
<cxf.swagger.version>1.3.13</cxf.swagger.version>
<cxf.swagger2.version>1.5.12</cxf.swagger2.version>
@@ -162,6 +163,7 @@
<cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version>
<cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version>
<cxf.wss4j.version>2.2.0-SNAPSHOT</cxf.wss4j.version>
+ <cxf.xbean.version>3.5</cxf.xbean.version>
<cxf.xerces.version>2.11.0</cxf.xerces.version>
<cxf.xmlbeans.version>2.6.0</cxf.xmlbeans.version>
<cxf.xmlschema.version>2.2.1</cxf.xmlschema.version>
@@ -171,7 +173,8 @@
version (with the Final), but we don't want an import package with a version
with a qualifier. We do want a range. -->
<cxf.validation.api.package.version>[1.0.0,2)</cxf.validation.api.package.version>
- <cxf.cdi.api.version>1.1</cxf.cdi.api.version>
+ <cxf.cdi.api.version>1.2</cxf.cdi.api.version>
+ <cxf.cda.api.osgi.range>[1.1,2)</cxf.cda.api.osgi.range>
<cxf.json.api.version>1.0</cxf.json.api.version>
<cxf.jboss.weld.version>2.4.0.Final</cxf.jboss.weld.version>
<cxf.jboss.logging.version>3.3.0.Final</cxf.jboss.logging.version>
@@ -622,6 +625,11 @@
<version>${cxf.log4j.version}</version>
</dependency>
<dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${cxf.logback.classic.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>${cxf.javax.ws.rs.version}</version>
@@ -779,11 +787,21 @@
<version>${cxf.mina.version}</version>
</dependency>
<dependency>
+ <groupId>io.reactivex</groupId>
+ <artifactId>rxjava</artifactId>
+ <version>${cxf.rx.java.version}</version>
+ </dependency>
+ <dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<version>${cxf.netty.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${cxf.derby.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${cxf.httpcomponents.client.version}</version>
@@ -981,6 +999,11 @@
<version>${cxf.slf4j.version}</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${cxf.slf4j.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${cxf.jetty.version}</version>
@@ -1106,6 +1129,17 @@
<version>${cxf.spring.version}</version>
</dependency>
<dependency>
+ <groupId>org.springframework.ldap</groupId>
+ <artifactId>spring-ldap-core</artifactId>
+ <version>${cxf.spring.ldap.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${cxf.spring.version}</version>
@@ -1608,6 +1642,17 @@
<version>1.0.1</version>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ <version>${cxf.geronimo.transaction.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>${cxf.activemq.version}</version>
@@ -1633,6 +1678,11 @@
<version>${cxf.rhino.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <version>${cxf.xbean.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<version>${cxf.xmlbeans.version}</version>
@@ -1887,6 +1937,22 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.littleshoot</groupId>
+ <artifactId>littleproxy</artifactId>
+ <version>${cxf.littleproxy.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>net.java.dev.msv</groupId>
<artifactId>msv-core</artifactId>
<version>${cxf.msv.version}</version>
@@ -1912,6 +1978,11 @@
<version>${cxf.tika.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <version>${cxf.jexl.version}</version>
+ </dependency>
+ <dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>${cxf.dropwizard.version}</version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/rt/features/logging/pom.xml
----------------------------------------------------------------------
diff --git a/rt/features/logging/pom.xml b/rt/features/logging/pom.xml
index 29ff63e..86965bb 100644
--- a/rt/features/logging/pom.xml
+++ b/rt/features/logging/pom.xml
@@ -41,7 +41,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/rt/rs/client/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml
index 237d079..9123d65 100644
--- a/rt/rs/client/pom.xml
+++ b/rt/rs/client/pom.xml
@@ -144,7 +144,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs-jcache</artifactId>
- <version>2.0-beta-1</version>
+ <version>2.1</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/rt/rs/extensions/rx/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/rx/pom.xml b/rt/rs/extensions/rx/pom.xml
index a1207a5..13bf166 100644
--- a/rt/rs/extensions/rx/pom.xml
+++ b/rt/rs/extensions/rx/pom.xml
@@ -44,7 +44,6 @@
<dependency>
<groupId>io.reactivex</groupId>
<artifactId>rxjava</artifactId>
- <version>${cxf.rx.java.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/rt/transports/http-undertow/pom.xml
----------------------------------------------------------------------
diff --git a/rt/transports/http-undertow/pom.xml b/rt/transports/http-undertow/pom.xml
index 29ceaa6..87f5947 100644
--- a/rt/transports/http-undertow/pom.xml
+++ b/rt/transports/http-undertow/pom.xml
@@ -80,12 +80,10 @@
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
- <version>1.3.7.Final</version>
</dependency>
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-servlet</artifactId>
- <version>1.3.7.Final</version>
</dependency>
<dependency>
<groupId>${cxf.servlet-api.group}</groupId>
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/rt/transports/jms/pom.xml
----------------------------------------------------------------------
diff --git a/rt/transports/jms/pom.xml b/rt/transports/jms/pom.xml
index a4559fc..e13c5a6 100644
--- a/rt/transports/jms/pom.xml
+++ b/rt/transports/jms/pom.xml
@@ -105,7 +105,6 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
- <version>3.5</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -116,7 +115,6 @@
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
- <version>3.1.3</version>
<scope>test</scope>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/rt/ws/eventing/pom.xml
----------------------------------------------------------------------
diff --git a/rt/ws/eventing/pom.xml b/rt/ws/eventing/pom.xml
index 1e22144..034d348 100644
--- a/rt/ws/eventing/pom.xml
+++ b/rt/ws/eventing/pom.xml
@@ -77,9 +77,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <groupId>${cxf.servlet-api.group}</groupId>
+ <artifactId>${cxf.servlet-api.artifact}</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/rt/ws/rm/pom.xml
----------------------------------------------------------------------
diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml
index d6cbd7e..c512449 100644
--- a/rt/ws/rm/pom.xml
+++ b/rt/ws/rm/pom.xml
@@ -124,7 +124,6 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>${cxf.derby.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/services/sts/sts-core/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index d30045b..767b788 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -69,15 +69,8 @@
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-core</artifactId>
- <version>${cxf.spring.ldap.version}</version>
<scope>provided</scope>
<optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.hazelcast</groupId>
@@ -123,21 +116,18 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${cxf.log4j.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${cxf.logback.classic.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jexl</artifactId>
- <version>${cxf.jexl.version}</version>
<optional>true</optional>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/services/wsn/wsn-core/pom.xml
----------------------------------------------------------------------
diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml
index 883c645..e91ef46 100644
--- a/services/wsn/wsn-core/pom.xml
+++ b/services/wsn/wsn-core/pom.xml
@@ -39,7 +39,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -110,7 +109,7 @@
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
- <version>2.1.7</version>
+ <version>2.2.10</version>
<scope>test</scope>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/systests/container-integration/grizzly/pom.xml
----------------------------------------------------------------------
diff --git a/systests/container-integration/grizzly/pom.xml b/systests/container-integration/grizzly/pom.xml
index bdaf3cf..449dcf0 100644
--- a/systests/container-integration/grizzly/pom.xml
+++ b/systests/container-integration/grizzly/pom.xml
@@ -57,7 +57,7 @@
<dependency>
<groupId>com.sun.grizzly</groupId>
<artifactId>grizzly-http</artifactId>
- <version>1.9.18</version>
+ <version>1.9.65</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/systests/jaxws/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jaxws/pom.xml b/systests/jaxws/pom.xml
index f3cb087..24073da 100644
--- a/systests/jaxws/pom.xml
+++ b/systests/jaxws/pom.xml
@@ -269,17 +269,6 @@
<dependency>
<groupId>org.littleshoot</groupId>
<artifactId>littleproxy</artifactId>
- <version>0.4</version>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
index 6b4364a..1b82205 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
@@ -19,8 +19,6 @@
package org.apache.cxf.systest.jaxws;
-import java.util.HashMap;
-
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Endpoint;
@@ -37,14 +35,14 @@ import org.apache.cxf.transports.http.configuration.ProxyServerType;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.littleshoot.proxy.DefaultHttpProxyServer;
-import org.littleshoot.proxy.HttpFilter;
-import org.littleshoot.proxy.ProxyUtils;
+
+import org.littleshoot.proxy.HttpProxyServer;
+import org.littleshoot.proxy.impl.DefaultHttpProxyServer;
public class CXF6655Test extends AbstractClientServerTestBase {
static final String PORT = allocatePort(Server.class);
static final int PROXY_PORT = Integer.parseInt(allocatePort(CXF6655Test.class));
- static DefaultHttpProxyServer proxy;
+ static HttpProxyServer proxy;
public static class Server extends AbstractBusTestServerBase {
@@ -76,9 +74,7 @@ public class CXF6655Test extends AbstractClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly", launchServer(Server.class, true));
- proxy = new DefaultHttpProxyServer(PROXY_PORT, ProxyUtils.PASS_THROUGH_REQUEST_FILTER,
- new HashMap<String, HttpFilter>());
- proxy.start();
+ proxy = DefaultHttpProxyServer.bootstrap().withPort(PROXY_PORT).start();
}
@Test
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/systests/transports/pom.xml
----------------------------------------------------------------------
diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml
index 199427c..6211f80 100644
--- a/systests/transports/pom.xml
+++ b/systests/transports/pom.xml
@@ -260,17 +260,6 @@
<dependency>
<groupId>org.littleshoot</groupId>
<artifactId>littleproxy</artifactId>
- <version>0.4</version>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPProxyAuthConduitTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPProxyAuthConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPProxyAuthConduitTest.java
index 789cfe5..f9e2fd7 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPProxyAuthConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPProxyAuthConduitTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.systest.http;
-import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.cxf.configuration.security.ProxyAuthorizationPolicy;
@@ -27,16 +26,18 @@ import org.apache.cxf.endpoint.Client;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.littleshoot.proxy.DefaultHttpProxyServer;
-import org.littleshoot.proxy.HttpFilter;
-import org.littleshoot.proxy.HttpRequestFilter;
-import org.littleshoot.proxy.ProxyAuthorizationHandler;
+
+import org.littleshoot.proxy.ActivityTrackerAdapter;
+import org.littleshoot.proxy.FlowContext;
+import org.littleshoot.proxy.HttpProxyServer;
+import org.littleshoot.proxy.ProxyAuthenticator;
+import org.littleshoot.proxy.impl.DefaultHttpProxyServer;
+
+import io.netty.handler.codec.http.HttpRequest;
/**
@@ -44,12 +45,13 @@ import org.littleshoot.proxy.ProxyAuthorizationHandler;
*/
public class HTTPProxyAuthConduitTest extends HTTPConduitTest {
static final int PROXY_PORT = Integer.parseInt(allocatePort(HTTPProxyAuthConduitTest.class));
- static DefaultHttpProxyServer proxy;
+ static HttpProxyServer proxy;
static CountingFilter requestFilter = new CountingFilter();
- static class CountingFilter implements HttpRequestFilter {
+ static class CountingFilter extends ActivityTrackerAdapter {
AtomicInteger count = new AtomicInteger();
- public void filter(HttpRequest httpRequest) {
+ public void requestReceivedFromClient(FlowContext flowContext,
+ HttpRequest httpRequest) {
count.incrementAndGet();
}
@@ -60,7 +62,6 @@ public class HTTPProxyAuthConduitTest extends HTTPConduitTest {
return count.get();
}
}
-
public HTTPProxyAuthConduitTest() {
}
@@ -73,13 +74,20 @@ public class HTTPProxyAuthConduitTest extends HTTPConduitTest {
@BeforeClass
public static void startProxy() {
- proxy = new DefaultHttpProxyServer(PROXY_PORT, requestFilter, new HashMap<String, HttpFilter>());
- proxy.addProxyAuthenticationHandler(new ProxyAuthorizationHandler() {
- public boolean authenticate(String userName, String password) {
- return "password".equals(password) && "CXF".equals(userName);
- }
- });
- proxy.start();
+ proxy = DefaultHttpProxyServer.bootstrap()
+ .withPort(PROXY_PORT)
+ .withProxyAuthenticator(new ProxyAuthenticator() {
+ @Override
+ public boolean authenticate(String userName, String password) {
+ return "password".equals(password) && "CXF".equals(userName);
+ }
+ @Override
+ public String getRealm() {
+ return null;
+ }
+ })
+ .plusActivityTracker(requestFilter)
+ .start();
}
@Before
public void resetCount() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPProxyConduitTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPProxyConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPProxyConduitTest.java
index 5ccaaea..71dc50d 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPProxyConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPProxyConduitTest.java
@@ -19,22 +19,23 @@
package org.apache.cxf.systest.http;
-import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
-import org.jboss.netty.handler.codec.http.HttpRequest;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.littleshoot.proxy.DefaultHttpProxyServer;
-import org.littleshoot.proxy.HttpFilter;
-import org.littleshoot.proxy.HttpRequestFilter;
+
+import org.littleshoot.proxy.ActivityTrackerAdapter;
+import org.littleshoot.proxy.FlowContext;
+import org.littleshoot.proxy.HttpProxyServer;
+import org.littleshoot.proxy.impl.DefaultHttpProxyServer;
+import io.netty.handler.codec.http.HttpRequest;
/**
@@ -42,12 +43,13 @@ import org.littleshoot.proxy.HttpRequestFilter;
*/
public class HTTPProxyConduitTest extends HTTPConduitTest {
static final int PROXY_PORT = Integer.parseInt(allocatePort(HTTPProxyConduitTest.class));
- static DefaultHttpProxyServer proxy;
+ static HttpProxyServer proxy;
static CountingFilter requestFilter = new CountingFilter();
- static class CountingFilter implements HttpRequestFilter {
+ static class CountingFilter extends ActivityTrackerAdapter {
AtomicInteger count = new AtomicInteger();
- public void filter(HttpRequest httpRequest) {
+ public void requestReceivedFromClient(FlowContext flowContext,
+ HttpRequest httpRequest) {
count.incrementAndGet();
}
@@ -71,8 +73,10 @@ public class HTTPProxyConduitTest extends HTTPConduitTest {
@BeforeClass
public static void startProxy() {
- proxy = new DefaultHttpProxyServer(PROXY_PORT, requestFilter, new HashMap<String, HttpFilter>());
- proxy.start();
+ proxy = DefaultHttpProxyServer.bootstrap()
+ .withPort(PROXY_PORT)
+ .plusActivityTracker(requestFilter)
+ .start();
}
@Before
public void resetCount() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyAuthConduitTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyAuthConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyAuthConduitTest.java
index 30a37a6..e837dbc 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyAuthConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyAuthConduitTest.java
@@ -19,7 +19,6 @@
package org.apache.cxf.systest.https.conduit;
-import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.cxf.configuration.security.ProxyAuthorizationPolicy;
@@ -27,16 +26,19 @@ import org.apache.cxf.endpoint.Client;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.littleshoot.proxy.DefaultHttpProxyServer;
-import org.littleshoot.proxy.HttpFilter;
-import org.littleshoot.proxy.HttpRequestFilter;
-import org.littleshoot.proxy.ProxyAuthorizationHandler;
+
+import org.littleshoot.proxy.ActivityTrackerAdapter;
+import org.littleshoot.proxy.FlowContext;
+import org.littleshoot.proxy.HttpProxyServer;
+import org.littleshoot.proxy.ProxyAuthenticator;
+import org.littleshoot.proxy.impl.DefaultHttpProxyServer;
+
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
/**
@@ -44,13 +46,16 @@ import org.littleshoot.proxy.ProxyAuthorizationHandler;
*/
public class HTTPSProxyAuthConduitTest extends HTTPSConduitTest {
static final int PROXY_PORT = Integer.parseInt(allocatePort(HTTPSProxyAuthConduitTest.class));
- static DefaultHttpProxyServer proxy;
+ static HttpProxyServer proxy;
static CountingFilter requestFilter = new CountingFilter();
- static class CountingFilter implements HttpRequestFilter {
+ static class CountingFilter extends ActivityTrackerAdapter {
AtomicInteger count = new AtomicInteger();
- public void filter(HttpRequest httpRequest) {
- count.incrementAndGet();
+ public void requestReceivedFromClient(FlowContext flowContext,
+ HttpRequest httpRequest) {
+ if (httpRequest.getMethod() != HttpMethod.CONNECT) {
+ count.incrementAndGet();
+ }
}
public void reset() {
@@ -74,13 +79,20 @@ public class HTTPSProxyAuthConduitTest extends HTTPSConduitTest {
@BeforeClass
public static void startProxy() {
System.setProperty("jdk.http.auth.tunneling.disabledSchemes", "");
- proxy = new DefaultHttpProxyServer(PROXY_PORT, requestFilter, new HashMap<String, HttpFilter>());
- proxy.addProxyAuthenticationHandler(new ProxyAuthorizationHandler() {
- public boolean authenticate(String userName, String password) {
- return "password".equals(password) && "CXF".equals(userName);
- }
- });
- proxy.start();
+ proxy = DefaultHttpProxyServer.bootstrap()
+ .withPort(PROXY_PORT)
+ .withProxyAuthenticator(new ProxyAuthenticator() {
+ @Override
+ public boolean authenticate(String userName, String password) {
+ return "password".equals(password) && "CXF".equals(userName);
+ }
+ @Override
+ public String getRealm() {
+ return null;
+ }
+ })
+ .plusActivityTracker(requestFilter)
+ .start();
}
@Before
public void resetCount() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyConduitTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyConduitTest.java
index 785fab4..42cd8ec 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyConduitTest.java
@@ -19,36 +19,40 @@
package org.apache.cxf.systest.https.conduit;
-import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.littleshoot.proxy.DefaultHttpProxyServer;
-import org.littleshoot.proxy.HttpFilter;
-import org.littleshoot.proxy.HttpRequestFilter;
+import org.littleshoot.proxy.ActivityTrackerAdapter;
+import org.littleshoot.proxy.FlowContext;
+import org.littleshoot.proxy.HttpProxyServer;
+import org.littleshoot.proxy.impl.DefaultHttpProxyServer;
+
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
/**
*
*/
public class HTTPSProxyConduitTest extends HTTPSConduitTest {
static final int PROXY_PORT = Integer.parseInt(allocatePort(HTTPSProxyConduitTest.class));
- static DefaultHttpProxyServer proxy;
+ static HttpProxyServer proxy;
static CountingFilter requestFilter = new CountingFilter();
- static class CountingFilter implements HttpRequestFilter {
+ static class CountingFilter extends ActivityTrackerAdapter {
AtomicInteger count = new AtomicInteger();
- public void filter(HttpRequest httpRequest) {
- count.incrementAndGet();
+ public void requestReceivedFromClient(FlowContext flowContext,
+ HttpRequest httpRequest) {
+ if (httpRequest.getMethod() != HttpMethod.CONNECT) {
+ count.incrementAndGet();
+ }
}
public void reset() {
@@ -71,8 +75,10 @@ public class HTTPSProxyConduitTest extends HTTPSConduitTest {
@BeforeClass
public static void startProxy() {
- proxy = new DefaultHttpProxyServer(PROXY_PORT, requestFilter, new HashMap<String, HttpFilter>());
- proxy.start();
+ proxy = DefaultHttpProxyServer.bootstrap()
+ .withPort(PROXY_PORT)
+ .plusActivityTracker(requestFilter)
+ .start();
}
@Before
public void resetCount() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfa7a22c/systests/uncategorized/pom.xml
----------------------------------------------------------------------
diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml
index e7ee27c..1140874 100644
--- a/systests/uncategorized/pom.xml
+++ b/systests/uncategorized/pom.xml
@@ -248,7 +248,6 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>${cxf.derby.version}</version>
<scope>test</scope>
</dependency>
<dependency>