Update some dependency versions # 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/eb9f16ee Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/eb9f16ee Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/eb9f16ee Branch: refs/heads/3.1.x-fixes Commit: eb9f16ee4198db91a7a78dc5fb9bd000eaca8d2b Parents: 40356fc Author: Daniel Kulp <[email protected]> Authored: Mon Feb 27 10:47:55 2017 -0500 Committer: Daniel Kulp <[email protected]> Committed: Tue Mar 7 13:59:55 2017 -0500 ---------------------------------------------------------------------- parent/pom.xml | 16 ++++++++-------- rt/rs/client/pom.xml | 5 +++++ .../http/asyncclient/SharedInputBuffer.java | 2 -- .../http/asyncclient/SharedOutputBuffer.java | 2 -- 4 files changed, 13 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/eb9f16ee/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 7ddab8f..dce7bf9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -46,7 +46,7 @@ <cxf.asm.groupId>org.ow2.asm</cxf.asm.groupId> <cxf.asm.artifactId>asm</cxf.asm.artifactId> <cxf.asm.version>5.0.4</cxf.asm.version> - <cxf.osgi.asm.version>[3.0,6)</cxf.osgi.asm.version> + <cxf.osgi.asm.version>[3.0,6.1)</cxf.osgi.asm.version> <!-- OSGi related properties --> <cxf.fragment.host /> <cxf.bundle.activator /> @@ -67,7 +67,7 @@ <!-- please maintain alphabetical order here --> <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.2</cxf.activemq.version> + <cxf.activemq.version>5.14.3</cxf.activemq.version> <cxf.ahc.version>1.9.8</cxf.ahc.version> <cxf.apacheds.version>2.0.0-M23</cxf.apacheds.version> <cxf.atmosphere.version>2.3.7</cxf.atmosphere.version> @@ -88,12 +88,12 @@ <cxf.fastinfoset.bundle.version>1.2.13_1</cxf.fastinfoset.bundle.version> <cxf.guava.version>18.0</cxf.guava.version> <cxf.hazelcast.version>1.9.4.8</cxf.hazelcast.version> - <cxf.httpcomponents.asyncclient.version>4.1.2</cxf.httpcomponents.asyncclient.version> + <cxf.httpcomponents.asyncclient.version>4.1.3</cxf.httpcomponents.asyncclient.version> <cxf.httpcomponents.asyncclient.version.range>[4.0,4.2)</cxf.httpcomponents.asyncclient.version.range> - <cxf.httpcomponents.client.version>4.5.2</cxf.httpcomponents.client.version> - <cxf.httpcomponents.core.version>4.4.4</cxf.httpcomponents.core.version> + <cxf.httpcomponents.client.version>4.5.3</cxf.httpcomponents.client.version> + <cxf.httpcomponents.core.version>4.4.6</cxf.httpcomponents.core.version> <cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range> - <cxf.jackson.version>2.8.6</cxf.jackson.version> + <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.log4j.version>1.2.17</cxf.log4j.version> @@ -143,7 +143,7 @@ <cxf.servlet-api.version>1.0</cxf.servlet-api.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.slf4j.version>1.7.22</cxf.slf4j.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.1.9.RELEASE</cxf.spring.version> <cxf.spring.boot.version>1.4.4.RELEASE</cxf.spring.boot.version> @@ -1436,7 +1436,7 @@ <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> - <version>3.3.1</version> + <version>3.4</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/cxf/blob/eb9f16ee/rt/rs/client/pom.xml ---------------------------------------------------------------------- diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml index 097c356..a14dd2b 100644 --- a/rt/rs/client/pom.xml +++ b/rt/rs/client/pom.xml @@ -108,6 +108,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>cglib</groupId> + <artifactId>cglib-nodep</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>${cxf.servlet-api.group}</groupId> <artifactId>${cxf.servlet-api.artifact}</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/cxf/blob/eb9f16ee/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedInputBuffer.java ---------------------------------------------------------------------- diff --git a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedInputBuffer.java b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedInputBuffer.java index d6534d6..6c0fbd4 100644 --- a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedInputBuffer.java +++ b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedInputBuffer.java @@ -25,7 +25,6 @@ import java.nio.ByteBuffer; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; -import org.apache.http.annotation.ThreadSafe; import org.apache.http.nio.ContentDecoder; import org.apache.http.nio.IOControl; import org.apache.http.nio.util.ByteBufferAllocator; @@ -44,7 +43,6 @@ import org.apache.http.nio.util.ExpandableBuffer; * In case of an abnormal situation or when no longer needed the buffer must be shut down * using {@link #shutdown()} method. */ -@ThreadSafe public class SharedInputBuffer extends ExpandableBuffer { private final ReentrantLock lock; http://git-wip-us.apache.org/repos/asf/cxf/blob/eb9f16ee/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java ---------------------------------------------------------------------- diff --git a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java index 1e3ed96..5d2a2fd 100644 --- a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java +++ b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java @@ -26,7 +26,6 @@ import java.nio.ByteBuffer; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; -import org.apache.http.annotation.ThreadSafe; import org.apache.http.nio.ContentEncoder; import org.apache.http.nio.IOControl; import org.apache.http.nio.util.ByteBufferAllocator; @@ -45,7 +44,6 @@ import org.apache.http.nio.util.ExpandableBuffer; * In case of an abnormal situation or when no longer needed the buffer must be * shut down using {@link #shutdown()} method. */ -@ThreadSafe public class SharedOutputBuffer extends ExpandableBuffer { private final ReentrantLock lock;
