You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2017/10/26 16:44:24 UTC
[camel] branch master updated: CAMEL-11869: Upgrade mockito-core to
2.11.0 for camel-cxf, camel-cxf-transport and camel-grooxy-dsl
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 5e69ecf CAMEL-11869: Upgrade mockito-core to 2.11.0 for camel-cxf, camel-cxf-transport and camel-grooxy-dsl
5e69ecf is described below
commit 5e69ecf8bfaad798a6147385fb6b5392313cc0b5
Author: aldettinger <al...@gmail.com>
AuthorDate: Thu Oct 26 14:07:28 2017 +0200
CAMEL-11869: Upgrade mockito-core to 2.11.0 for camel-cxf, camel-cxf-transport and camel-grooxy-dsl
---
components/camel-cxf-transport/pom.xml | 1 +
.../camel/component/cxf/transport/JaxWSCamelDestinationTest.java | 1 -
components/camel-cxf/pom.xml | 1 +
components/camel-groovy-dsl/pom.xml | 5 -----
4 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml
index 56d7b49..3158471 100644
--- a/components/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf-transport/pom.xml
@@ -151,6 +151,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java
index 6ca7f6d..71131c9 100644
--- a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java
+++ b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java
@@ -21,7 +21,6 @@ import javax.xml.ws.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.cxf.transport.common.gzip.GZIPOutInterceptor;
import org.junit.After;
import org.junit.Test;
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 9e47227..d842c4b 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -321,6 +321,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-groovy-dsl/pom.xml b/components/camel-groovy-dsl/pom.xml
index c1fd229..d9f4127 100644
--- a/components/camel-groovy-dsl/pom.xml
+++ b/components/camel-groovy-dsl/pom.xml
@@ -87,11 +87,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].