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/29 21:12:02 UTC
[camel] branch master updated: CAMEL-11869: Upgrade mockito-core to
2.11.0 for camel-pdf and camel-atmos
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 7b4a486 CAMEL-11869: Upgrade mockito-core to 2.11.0 for camel-pdf and camel-atmos
7b4a486 is described below
commit 7b4a4867ecf27513d860d5a1e83b76f6945f3135
Author: aldettinger <al...@gmail.com>
AuthorDate: Sun Oct 29 22:10:39 2017 +0100
CAMEL-11869: Upgrade mockito-core to 2.11.0 for camel-pdf and camel-atmos
---
components/camel-atmos/pom.xml | 1 +
.../org/apache/camel/component/atmos/AtmosComponentTest.java | 2 +-
components/camel-pdf/pom.xml | 9 ---------
3 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/components/camel-atmos/pom.xml b/components/camel-atmos/pom.xml
index d13720e..ff4ca47 100644
--- a/components/camel-atmos/pom.xml
+++ b/components/camel-atmos/pom.xml
@@ -97,6 +97,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/AtmosComponentTest.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/AtmosComponentTest.java
index 5d341d9..543ca23 100644
--- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/AtmosComponentTest.java
+++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/AtmosComponentTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.util.URISupport;
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.junit.Assert.assertEquals;
@RunWith(MockitoJUnitRunner.class)
diff --git a/components/camel-pdf/pom.xml b/components/camel-pdf/pom.xml
index 9432954..0b6f54e 100644
--- a/components/camel-pdf/pom.xml
+++ b/components/camel-pdf/pom.xml
@@ -80,31 +80,22 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>java-hamcrest</artifactId>
<version>${hamcrest-version}</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].