You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/05/02 17:49:02 UTC
svn commit: r1591958 - in /incubator/slider/trunk: pom.xml
slider-core/pom.xml
Author: stevel
Date: Fri May 2 15:49:02 2014
New Revision: 1591958
URL: http://svn.apache.org/r1591958
Log:
move version definition of the mock jars into root pom
Modified:
incubator/slider/trunk/pom.xml
incubator/slider/trunk/slider-core/pom.xml
Modified: incubator/slider/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/pom.xml?rev=1591958&r1=1591957&r2=1591958&view=diff
==============================================================================
--- incubator/slider/trunk/pom.xml (original)
+++ incubator/slider/trunk/pom.xml Fri May 2 15:49:02 2014
@@ -155,6 +155,7 @@
<commons-configuration.version>1.6</commons-configuration.version>
<commons-lang.version>2.6</commons-lang.version>
<curator.version>2.4.1</curator.version>
+ <easymock.version>2.4.1</easymock.version>
<groovy.version>2.1.9</groovy.version>
<guava.version>11.0.2</guava.version>
<gson.version>2.2.2</gson.version>
@@ -168,6 +169,8 @@
<jersey.version>1.9</jersey.version>
<junit.version>4.11</junit.version>
<log4j.version>1.2.17</log4j.version>
+ <mockito.version>1.8.5</mockito.version>
+ <powermock.version>1.5</powermock.version>
<!-- ProtocolBuffer version, used to verify the protoc version and -->
<!-- define the protobuf JAR version -->
@@ -1224,7 +1227,45 @@
<artifactId>jersey-test-framework-grizzly2</artifactId>
<version>${jersey.version}</version>
</dependency>
-
+
+
+ <!-- ======================================================== -->
+ <!-- Mocking -->
+ <!-- ======================================================== -->
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>${easymock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-core</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-reflect</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-easymock</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+
+
</dependencies>
</dependencyManagement>
Modified: incubator/slider/trunk/slider-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/pom.xml?rev=1591958&r1=1591957&r2=1591958&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/pom.xml (original)
+++ incubator/slider/trunk/slider-core/pom.xml Fri May 2 15:49:02 2014
@@ -579,38 +579,32 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.8.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-core</artifactId>
- <version>1.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-reflect</artifactId>
- <version>1.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-easymock</artifactId>
- <version>1.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
- <version>1.5</version>
<scope>test</scope>
</dependency>