TRUNK-3944: Incorrect mockito, hamcrest and junit dependencies

rkorytkowski · rkorytkowski · commit 11ba1107fda8 · 2013-03-26T22:40:26.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -579,26 +579,37 @@
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
-				<version>4.8.1</version>
+				<version>4.10</version>
 			</dependency>
 			<dependency>
 				<groupId>org.mockito</groupId>
-				<artifactId>mockito-all</artifactId>
-				<version>1.8.5</version>
+				<artifactId>mockito-core</artifactId>
+				<version>1.9.5</version>
 			</dependency>
 			<dependency>
 				<groupId>org.powermock</groupId>
 				<artifactId>powermock-module-junit4</artifactId>
-				<version>1.4.10</version>
+				<version>1.5</version>
 			</dependency>
 			<dependency>
 				<groupId>org.powermock</groupId>
 				<artifactId>powermock-api-mockito</artifactId>
-				<version>1.4.10</version>
+				<version>1.5</version>
+				<exclusions>
+					<exclusion>
+						<artifactId>mockito-all</artifactId>
+						<groupId>org.mockito</groupId>
+					</exclusion>
+				</exclusions>
 			</dependency>
             <dependency>
                 <groupId>org.hamcrest</groupId>
-                <artifactId>hamcrest-all</artifactId>
+                <artifactId>hamcrest-core</artifactId>
+                <version>1.3</version>
+            </dependency>
+            <dependency>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest-library</artifactId>
                 <version>1.3</version>
             </dependency>
 			<dependency>
@@ -1027,5 +1038,4 @@
 		<springVersion>3.0.5.RELEASE</springVersion>
 		<customArgLineForTesting></customArgLineForTesting>
 	</properties>
-
 </project>
diff --git a/test/pom.xml b/test/pom.xml
@@ -35,9 +35,10 @@
          <groupId>xmlunit</groupId>
          <artifactId>xmlunit</artifactId>
       </dependency>
+      
 		<dependency>	
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<artifactId>mockito-core</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.powermock</groupId>
@@ -47,9 +48,13 @@
 			<groupId>org.powermock</groupId>
 			<artifactId>powermock-api-mockito</artifactId>
 		</dependency>
-       <dependency>
-           <groupId>org.hamcrest</groupId>
-           <artifactId>hamcrest-all</artifactId>
-       </dependency>
+		<dependency>
+		    <groupId>org.hamcrest</groupId>
+		    <artifactId>hamcrest-core</artifactId>
+		</dependency>
+		<dependency>
+		    <groupId>org.hamcrest</groupId>
+		    <artifactId>hamcrest-library</artifactId>
+		</dependency>
    </dependencies>
 </project>
