flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [4/4] flink git commit: [FLINK-4740] [tests] Upgrade testing libraries
Date Wed, 05 Oct 2016 17:16:56 GMT
[FLINK-4740] [tests] Upgrade testing libraries

Upgrades
  JUnit from 4.11 to 4.12
  Mockito from 1.9.5 to 1.10.19
  PowerMock from 1.5.5 to 1.6.5

This closes #2597


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7c9bc1e5
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7c9bc1e5
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7c9bc1e5

Branch: refs/heads/master
Commit: 7c9bc1e5172f39bd511ca4ed5e23fd8a7f3f33c6
Parents: 1577e89
Author: Greg Hogan <code@greghogan.com>
Authored: Tue Oct 4 16:14:23 2016 -0400
Committer: Greg Hogan <code@greghogan.com>
Committed: Wed Oct 5 12:40:11 2016 -0400

----------------------------------------------------------------------
 .../operators/chaining/ChainedAllReduceDriverTest.java    |  2 +-
 pom.xml                                                   | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/7c9bc1e5/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainedAllReduceDriverTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainedAllReduceDriverTest.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainedAllReduceDriverTest.java
index 4a037cd..43ec8b8 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainedAllReduceDriverTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainedAllReduceDriverTest.java
@@ -121,7 +121,7 @@ public class ChainedAllReduceDriverTest extends TaskTestBase {
 		}
 	}
 
-	private static class MockReduceStub implements ReduceFunction<Record> {
+	public static class MockReduceStub implements ReduceFunction<Record> {
 		private static final long serialVersionUID = 1047525105526690165L;
 
 		@Override

http://git-wip-us.apache.org/repos/asf/flink/blob/7c9bc1e5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b2229fb..d127ccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,9 @@ under the License.
 		<curator.version>2.8.0</curator.version>
 		<jackson.version>2.7.4</jackson.version>
 		<metrics.version>3.1.0</metrics.version>
-		<junit.version>4.11</junit.version>
+		<junit.version>4.12</junit.version>
+		<mockito.version>1.10.19</mockito.version>
+		<powermock.version>1.6.5</powermock.version>
 		<!--
 			Keeping the MiniKDC version fixed instead of taking hadoop version dependency
 			to support testing Kafka, ZK etc., modules that does not have Hadoop dependency
@@ -166,7 +168,7 @@ under the License.
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
-			<version>1.9.5</version>
+			<version>${mockito.version}</version>
 			<type>jar</type>
 			<scope>test</scope>
 		</dependency>
@@ -174,7 +176,7 @@ under the License.
 		<dependency>
 			<groupId>org.powermock</groupId>
 			<artifactId>powermock-module-junit4</artifactId>
-			<version>1.5.5</version>
+			<version>${powermock.version}</version>
 			<type>jar</type>
 			<scope>test</scope>
 		</dependency>
@@ -182,7 +184,7 @@ under the License.
 		<dependency>
 			<groupId>org.powermock</groupId>
 			<artifactId>powermock-api-mockito</artifactId>
-			<version>1.5.5</version>
+			<version>${powermock.version}</version>
 			<type>jar</type>
 			<scope>test</scope>
 		</dependency>


Mime
View raw message