Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMat Booth2019-05-23 14:48:55 +0000
committerMat Booth2019-05-23 14:48:55 +0000
commit7deaf0e9f38390118c6c4d50c0e631167334608e (patch)
treec81a3f7fe6ed3ab65b598eecbb84186d7343a8ad
parent55b674acf1ea017262ac52984356f6755dac85f1 (diff)
downloadorg.eclipse.tycho.extras-7deaf0e9f38390118c6c4d50c0e631167334608e.tar.gz
org.eclipse.tycho.extras-7deaf0e9f38390118c6c4d50c0e631167334608e.tar.xz
org.eclipse.tycho.extras-7deaf0e9f38390118c6c4d50c0e631167334608e.zip
Bug 547597 - Porting tests to mockito 2.x
Use the same version of junit and mockito as tycho itself. Change-Id: I886104e8cbe7e6f46954d510f2dd6f77dc3c8106 Signed-off-by: Mat Booth <mat.booth@redhat.com>
-rw-r--r--pom.xml6
-rw-r--r--tycho-document-bundle-plugin/pom.xml2
-rw-r--r--tycho-eclipserun-plugin/pom.xml2
3 files changed, 5 insertions, 5 deletions
diff --git a/pom.xml b/pom.xml
index 54178b1..c6c0fc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -261,13 +261,13 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.4</version>
+ <artifactId>mockito-core</artifactId>
+ <version>2.23.0</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/tycho-document-bundle-plugin/pom.xml b/tycho-document-bundle-plugin/pom.xml
index decd480..ef5ebb0 100644
--- a/tycho-document-bundle-plugin/pom.xml
+++ b/tycho-document-bundle-plugin/pom.xml
@@ -60,7 +60,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/tycho-eclipserun-plugin/pom.xml b/tycho-eclipserun-plugin/pom.xml
index 6497dc2..aeeca34 100644
--- a/tycho-eclipserun-plugin/pom.xml
+++ b/tycho-eclipserun-plugin/pom.xml
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
</dependency>
</dependencies>
<profiles>

Back to the top