You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by rm...@apache.org on 2014/08/09 14:39:38 UTC
[07/39] git commit: [FLINK-386] Fix and clean up dependencies
[FLINK-386] Fix and clean up dependencies
- Upgraded to junit 4.11 and fixed code that used deprecated
- Changed scala dependency from 2.10.3 to 2.10.4 to avoid conflicts with scalatest dependency
- Upgraded log4j and commons-logging dependency
- Removed superfluous dependency on commons-codec
- Upgraded dependency versions in the base module
- Ensured consistency of avro versions across submodules
- Upgraded AWS dependency to version 1.8.1
- Unified configuration of jetty dependency
This closes #80.
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/bef5e548
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/bef5e548
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/bef5e548
Branch: refs/heads/travis_test
Commit: bef5e5487b3192e5ef2169fdbbd459610b762f76
Parents: ac6fd75
Author: Daniel Warneke <wa...@apache.org>
Authored: Sun Jul 27 14:30:38 2014 +0200
Committer: uce <u....@fu-berlin.de>
Committed: Wed Jul 30 00:51:57 2014 +0200
----------------------------------------------------------------------
flink-addons/flink-avro/pom.xml | 4 +-
.../io/avro/AvroRecordInputFormatTest.java | 2 +-
.../api/java/io/jdbc/JDBCInputFormatTest.java | 2 +-
.../api/java/io/jdbc/JDBCOutputFormatTest.java | 2 +-
.../record/io/jdbc/JDBCInputFormatTest.java | 2 +-
.../record/io/jdbc/JDBCOutputFormatTest.java | 2 +-
flink-clients/pom.xml | 10 ++--
.../apache/flink/compiler/DOPChangeTest.java | 2 +-
.../flink/configuration/Configuration.java | 9 ++--
.../api/common/io/FileOutputFormatTest.java | 2 +-
.../common/typeutils/SerializerTestBase.java | 2 +-
.../SimpleDataDistributionTest.java | 2 +-
.../flink/types/CollectionsDataTypeTest.java | 2 +-
.../apache/flink/types/NormalizableKeyTest.java | 2 +-
.../flink/types/PrimitiveDataTypeTest.java | 10 ++--
flink-java/pom.xml | 4 +-
.../java/functions/SemanticPropUtilTest.java | 2 +-
.../java/operator/AggregateOperatorTest.java | 2 +-
.../api/java/operator/CoGroupOperatorTest.java | 2 +-
.../api/java/operator/CrossOperatorTest.java | 2 +-
.../api/java/operator/DistinctOperatorTest.java | 2 +-
.../flink/api/java/operator/GroupingTest.java | 2 +-
.../api/java/operator/JoinOperatorTest.java | 2 +-
.../java/operator/ProjectionOperatorTest.java | 2 +-
.../api/java/record/io/CsvInputFormatTest.java | 2 +-
.../api/java/record/io/CsvOutputFormatTest.java | 2 +-
...ternalProcessFixedLengthInputFormatTest.java | 2 +-
.../io/ExternalProcessInputFormatTest.java | 2 +-
.../apache/flink/api/java/tuple/Tuple2Test.java | 2 +-
.../api/java/typeutils/TypeInfoParserTest.java | 2 +-
flink-runtime/pom.xml | 8 +--
.../FileCacheDeleteValidationTest.java | 2 +-
.../instance/DefaultInstanceManagerTest.java | 1 -
.../runtime/instance/HostInClusterTest.java | 1 -
.../local/LocalInstanceManagerTest.java | 2 +-
.../flink/runtime/io/disk/ChannelViewsTest.java | 2 +-
.../runtime/io/disk/SpillingBufferTest.java | 2 +-
.../io/disk/iomanager/IOManagerITCase.java | 2 +-
.../IOManagerPerformanceBenchmark.java | 2 +-
.../io/disk/iomanager/IOManagerTest.java | 2 +-
.../netty/InboundEnvelopeDecoderTest.java | 3 +-
.../netty/NettyConnectionManagerTest.java | 2 +-
.../netty/OutboundEnvelopeEncoderTest.java | 3 +-
.../DataInputOutputSerializerTest.java | 2 +-
.../SpanningRecordSerializationTest.java | 2 +-
.../SpanningRecordSerializerTest.java | 2 +-
.../memory/DefaultMemoryManagerTest.java | 2 +-
.../flink/runtime/memory/MemorySegmentTest.java | 2 +-
.../operators/CoGroupTaskExternalITCase.java | 2 +-
.../runtime/operators/CoGroupTaskTest.java | 2 +-
.../operators/CombineTaskExternalITCase.java | 2 +-
.../runtime/operators/CombineTaskTest.java | 2 +-
.../operators/CrossTaskExternalITCase.java | 2 +-
.../flink/runtime/operators/CrossTaskTest.java | 2 +-
.../runtime/operators/DataSinkTaskTest.java | 2 +-
.../runtime/operators/DataSourceTaskTest.java | 2 +-
.../operators/MatchTaskExternalITCase.java | 2 +-
.../operators/ReduceTaskExternalITCase.java | 2 +-
.../flink/runtime/operators/ReduceTaskTest.java | 2 +-
.../resettable/BlockResettableIteratorTest.java | 2 +-
...lockResettableMutableObjectIteratorTest.java | 2 +-
.../SpillingResettableIteratorTest.java | 2 +-
...lingResettableMutableObjectIteratorTest.java | 2 +-
.../sort/AsynchonousPartialSorterITCase.java | 2 +-
.../CombiningUnilateralSortMergerITCase.java | 2 +-
.../operators/sort/ExternalSortITCase.java | 2 +-
.../operators/testutils/DriverTestBase.java | 2 +-
.../operators/testutils/TaskCancelThread.java | 2 +-
.../operators/util/OutputEmitterTest.java | 2 +-
.../operators/util/RecordOutputEmitterTest.java | 2 +-
flink-scala/pom.xml | 6 +--
flink-test-utils/pom.xml | 2 +-
flink-tests/pom.xml | 2 +-
.../test/cancelling/CancellingTestBase.java | 6 +--
.../BulkIterationWithAllReducerITCase.java | 2 +-
.../aggregators/AggregatorsITCase.java | 2 +-
...nentsWithParametrizableAggregatorITCase.java | 2 +-
.../flink/test/javaApiOperators/MapITCase.java | 2 +-
.../apache/flink/test/util/FailingTestBase.java | 2 +-
pom.xml | 51 ++++++++++++++------
80 files changed, 134 insertions(+), 116 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-addons/flink-avro/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-avro/pom.xml b/flink-addons/flink-avro/pom.xml
index 1ffa8d0..36ad445 100644
--- a/flink-addons/flink-avro/pom.xml
+++ b/flink-addons/flink-avro/pom.xml
@@ -51,13 +51,13 @@ under the License.
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
- <version>1.7.5</version>
+ <!-- version is derived from base module -->
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-mapred</artifactId>
- <version>1.7.5</version>
+ <!-- version is derived from base module -->
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-addons/flink-avro/src/test/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-avro/src/test/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormatTest.java b/flink-addons/flink-avro/src/test/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormatTest.java
index 2387fd6..64fae94 100644
--- a/flink-addons/flink-avro/src/test/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormatTest.java
+++ b/flink-addons/flink-avro/src/test/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormatTest.java
@@ -24,7 +24,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.avro.file.DataFileWriter;
import org.apache.avro.io.DatumWriter;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java b/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java
index 5816fa8..41e9c5a 100644
--- a/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java
+++ b/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java
@@ -24,7 +24,7 @@ import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.java.io.jdbc.JDBCInputFormat;
import org.apache.flink.api.java.tuple.Tuple2;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java b/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java
index c1c899e..a101a74 100644
--- a/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java
+++ b/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java
@@ -24,7 +24,7 @@ import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.java.io.jdbc.JDBCInputFormat;
import org.apache.flink.api.java.io.jdbc.JDBCOutputFormat;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCInputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCInputFormatTest.java b/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCInputFormatTest.java
index 20463f2..295210b 100644
--- a/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCInputFormatTest.java
+++ b/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCInputFormatTest.java
@@ -23,7 +23,7 @@ import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.java.record.io.jdbc.JDBCInputFormat;
import org.apache.flink.configuration.Configuration;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCOutputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCOutputFormatTest.java b/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCOutputFormatTest.java
index 10ca85d..994eaf5 100644
--- a/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCOutputFormatTest.java
+++ b/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCOutputFormatTest.java
@@ -24,7 +24,7 @@ import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.java.record.io.jdbc.JDBCInputFormat;
import org.apache.flink.api.java.record.io.jdbc.JDBCOutputFormat;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-clients/pom.xml
----------------------------------------------------------------------
diff --git a/flink-clients/pom.xml b/flink-clients/pom.xml
index 29ce3e6..7456209 100644
--- a/flink-clients/pom.xml
+++ b/flink-clients/pom.xml
@@ -64,25 +64,25 @@ under the License.
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>8.0.0.M1</version>
+ <!-- version is derived from base module -->
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>8.0.0.M1</version>
+ <!-- version is derived from base module -->
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>8.0.0.M1</version>
+ <!-- version is derived from base module -->
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2.2</version>
+ <version>1.3.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -92,7 +92,7 @@ under the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.1</version>
+ <version>2.4</version>
<scope>compile</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-compiler/src/test/java/org/apache/flink/compiler/DOPChangeTest.java
----------------------------------------------------------------------
diff --git a/flink-compiler/src/test/java/org/apache/flink/compiler/DOPChangeTest.java b/flink-compiler/src/test/java/org/apache/flink/compiler/DOPChangeTest.java
index ce14010..db1e091 100644
--- a/flink-compiler/src/test/java/org/apache/flink/compiler/DOPChangeTest.java
+++ b/flink-compiler/src/test/java/org/apache/flink/compiler/DOPChangeTest.java
@@ -19,7 +19,7 @@
package org.apache.flink.compiler;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.Plan;
import org.apache.flink.api.java.record.operators.FileDataSink;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-core/src/main/java/org/apache/flink/configuration/Configuration.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/configuration/Configuration.java b/flink-core/src/main/java/org/apache/flink/configuration/Configuration.java
index 10e6582..d7415b8 100644
--- a/flink-core/src/main/java/org/apache/flink/configuration/Configuration.java
+++ b/flink-core/src/main/java/org/apache/flink/configuration/Configuration.java
@@ -26,12 +26,13 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.codec.binary.Base64;
import org.apache.flink.core.io.IOReadableWritable;
import org.apache.flink.core.io.StringRecord;
import org.apache.flink.core.memory.DataInputView;
import org.apache.flink.core.memory.DataOutputView;
+import com.google.common.io.BaseEncoding;
+
/**
* Lightweight configuration object which can store key/value pairs. Configuration objects
* can be extracted from or integrated into the {@link GlobalConfiguration} object. They can
@@ -337,11 +338,11 @@ public class Configuration implements IOReadableWritable, java.io.Serializable {
* @return the (default) value associated with the given key.
*/
public byte[] getBytes(String key, byte[] defaultValue) {
- String encoded = getStringInternal(key);
+ final String encoded = getStringInternal(key);
if (encoded == null) {
return defaultValue;
} else {
- return Base64.decodeBase64(encoded.getBytes());
+ return BaseEncoding.base64().decode(encoded);
}
}
@@ -354,7 +355,7 @@ public class Configuration implements IOReadableWritable, java.io.Serializable {
* The bytes to be added.
*/
public void setBytes(String key, byte[] bytes) {
- String encoded = new String(Base64.encodeBase64(bytes));
+ final String encoded = BaseEncoding.base64().encode(bytes);
setStringInternal(key, encoded);
}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-core/src/test/java/org/apache/flink/api/common/io/FileOutputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/io/FileOutputFormatTest.java b/flink-core/src/test/java/org/apache/flink/api/common/io/FileOutputFormatTest.java
index ae5a429..fd09c07 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/io/FileOutputFormatTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/io/FileOutputFormatTest.java
@@ -22,7 +22,7 @@ package org.apache.flink.api.common.io;
import java.io.File;
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.io.FileOutputFormat;
import org.apache.flink.api.common.io.FileOutputFormat.OutputDirectoryMode;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestBase.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestBase.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestBase.java
index 7d17233..0f611ed 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestBase.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestBase.java
@@ -31,7 +31,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.util.Arrays;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.lang3.SerializationException;
import org.apache.commons.lang3.SerializationUtils;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-core/src/test/java/org/apache/flink/api/distributions/SimpleDataDistributionTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/distributions/SimpleDataDistributionTest.java b/flink-core/src/test/java/org/apache/flink/api/distributions/SimpleDataDistributionTest.java
index b1fd4ba..457a075 100644
--- a/flink-core/src/test/java/org/apache/flink/api/distributions/SimpleDataDistributionTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/distributions/SimpleDataDistributionTest.java
@@ -25,7 +25,7 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.distributions.SimpleDistribution;
import org.apache.flink.core.memory.InputViewDataInputStreamWrapper;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-core/src/test/java/org/apache/flink/types/CollectionsDataTypeTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/types/CollectionsDataTypeTest.java b/flink-core/src/test/java/org/apache/flink/types/CollectionsDataTypeTest.java
index d77eeec..cceb8fd 100644
--- a/flink-core/src/test/java/org/apache/flink/types/CollectionsDataTypeTest.java
+++ b/flink-core/src/test/java/org/apache/flink/types/CollectionsDataTypeTest.java
@@ -28,7 +28,7 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Map.Entry;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.core.memory.InputViewDataInputStreamWrapper;
import org.apache.flink.core.memory.OutputViewDataOutputStreamWrapper;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-core/src/test/java/org/apache/flink/types/NormalizableKeyTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/types/NormalizableKeyTest.java b/flink-core/src/test/java/org/apache/flink/types/NormalizableKeyTest.java
index 748eef7..c1c70e4 100644
--- a/flink-core/src/test/java/org/apache/flink/types/NormalizableKeyTest.java
+++ b/flink-core/src/test/java/org/apache/flink/types/NormalizableKeyTest.java
@@ -19,7 +19,7 @@
package org.apache.flink.types;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.core.memory.MemorySegment;
import org.apache.flink.types.CharValue;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-core/src/test/java/org/apache/flink/types/PrimitiveDataTypeTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/types/PrimitiveDataTypeTest.java b/flink-core/src/test/java/org/apache/flink/types/PrimitiveDataTypeTest.java
index 64f292f..492eeb8 100644
--- a/flink-core/src/test/java/org/apache/flink/types/PrimitiveDataTypeTest.java
+++ b/flink-core/src/test/java/org/apache/flink/types/PrimitiveDataTypeTest.java
@@ -25,7 +25,7 @@ import java.io.IOException;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.core.memory.InputViewDataInputStreamWrapper;
import org.apache.flink.core.memory.OutputViewDataOutputStreamWrapper;
@@ -93,7 +93,7 @@ public class PrimitiveDataTypeTest {
public void testDoubleValue() {
DoubleValue double0 = new DoubleValue(10.2);
// test value retrieval
- Assert.assertEquals(10.2, double0.getValue());
+ Assert.assertEquals(10.2, double0.getValue(), 0.0001);
// test value comparison
DoubleValue double1 = new DoubleValue(10.2);
DoubleValue double2 = new DoubleValue(-10.5);
@@ -114,11 +114,11 @@ public class PrimitiveDataTypeTest {
double2n.read(new InputViewDataInputStreamWrapper(mIn));
double3n.read(new InputViewDataInputStreamWrapper(mIn));
Assert.assertEquals(double0.compareTo(double1n), 0);
- Assert.assertEquals(double0.getValue(), double1n.getValue());
+ Assert.assertEquals(double0.getValue(), double1n.getValue(), 0.0001);
Assert.assertEquals(double2.compareTo(double2n), 0);
- Assert.assertEquals(double2.getValue(), double2n.getValue());
+ Assert.assertEquals(double2.getValue(), double2n.getValue(), 0.0001);
Assert.assertEquals(double3.compareTo(double3n), 0);
- Assert.assertEquals(double3.getValue(), double3n.getValue());
+ Assert.assertEquals(double3.getValue(), double3n.getValue(), 0.0001);
} catch (Exception e) {
Assert.assertTrue(false);
}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-java/pom.xml
----------------------------------------------------------------------
diff --git a/flink-java/pom.xml b/flink-java/pom.xml
index 2030943..06ea151 100644
--- a/flink-java/pom.xml
+++ b/flink-java/pom.xml
@@ -50,12 +50,12 @@ under the License.
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
- <version>1.7.5</version>
+ <!-- version is derived from base module -->
</dependency>
<dependency>
<groupId>com.esotericsoftware.kryo</groupId>
<artifactId>kryo</artifactId>
- <version>2.23.0</version>
+ <version>2.24.0</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropUtilTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropUtilTest.java b/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropUtilTest.java
index 631159b..d7747a7 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropUtilTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/functions/SemanticPropUtilTest.java
@@ -19,7 +19,7 @@
package org.apache.flink.api.java.functions;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.InvalidProgramException;
import org.apache.flink.api.common.operators.DualInputSemanticProperties;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-java/src/test/java/org/apache/flink/api/java/operator/AggregateOperatorTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/operator/AggregateOperatorTest.java b/flink-java/src/test/java/org/apache/flink/api/java/operator/AggregateOperatorTest.java
index 32c8fb2..ad2d314 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/operator/AggregateOperatorTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/operator/AggregateOperatorTest.java
@@ -21,7 +21,7 @@ package org.apache.flink.api.java.operator;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.InvalidProgramException;
import org.apache.flink.api.java.aggregation.Aggregations;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-java/src/test/java/org/apache/flink/api/java/operator/CoGroupOperatorTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/operator/CoGroupOperatorTest.java b/flink-java/src/test/java/org/apache/flink/api/java/operator/CoGroupOperatorTest.java
index f7e03de..4bc7ac2 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/operator/CoGroupOperatorTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/operator/CoGroupOperatorTest.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.InvalidProgramException;
import org.apache.flink.api.java.functions.KeySelector;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-java/src/test/java/org/apache/flink/api/java/operator/CrossOperatorTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/operator/CrossOperatorTest.java b/flink-java/src/test/java/org/apache/flink/api/java/operator/CrossOperatorTest.java
index 59b9a03..9c88b2e 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/operator/CrossOperatorTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/operator/CrossOperatorTest.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.java.tuple.Tuple5;
import org.apache.flink.api.java.typeutils.BasicTypeInfo;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-java/src/test/java/org/apache/flink/api/java/operator/DistinctOperatorTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/operator/DistinctOperatorTest.java b/flink-java/src/test/java/org/apache/flink/api/java/operator/DistinctOperatorTest.java
index 3e459e8..7ef110a 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/operator/DistinctOperatorTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/operator/DistinctOperatorTest.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.InvalidProgramException;
import org.apache.flink.api.java.functions.KeySelector;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-java/src/test/java/org/apache/flink/api/java/operator/GroupingTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/operator/GroupingTest.java b/flink-java/src/test/java/org/apache/flink/api/java/operator/GroupingTest.java
index 6615d3e..0938bd9 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/operator/GroupingTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/operator/GroupingTest.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.InvalidProgramException;
import org.apache.flink.api.common.operators.Order;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-java/src/test/java/org/apache/flink/api/java/operator/JoinOperatorTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/operator/JoinOperatorTest.java b/flink-java/src/test/java/org/apache/flink/api/java/operator/JoinOperatorTest.java
index a3b6c3b..8b88288 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/operator/JoinOperatorTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/operator/JoinOperatorTest.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.InvalidProgramException;
import org.apache.flink.api.java.functions.KeySelector;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-java/src/test/java/org/apache/flink/api/java/operator/ProjectionOperatorTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/operator/ProjectionOperatorTest.java b/flink-java/src/test/java/org/apache/flink/api/java/operator/ProjectionOperatorTest.java
index 11e0a37..aacfb6b 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/operator/ProjectionOperatorTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/operator/ProjectionOperatorTest.java
@@ -21,7 +21,7 @@ package org.apache.flink.api.java.operator;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.java.tuple.Tuple5;
import org.apache.flink.api.java.typeutils.BasicTypeInfo;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-java/src/test/java/org/apache/flink/api/java/record/io/CsvInputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/record/io/CsvInputFormatTest.java b/flink-java/src/test/java/org/apache/flink/api/java/record/io/CsvInputFormatTest.java
index dc28062..65652b8 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/record/io/CsvInputFormatTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/record/io/CsvInputFormatTest.java
@@ -31,7 +31,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.java.record.io.CsvInputFormat;
import org.apache.flink.configuration.Configuration;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-java/src/test/java/org/apache/flink/api/java/record/io/CsvOutputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/record/io/CsvOutputFormatTest.java b/flink-java/src/test/java/org/apache/flink/api/java/record/io/CsvOutputFormatTest.java
index 3bf1e31..a07127e 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/record/io/CsvOutputFormatTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/record/io/CsvOutputFormatTest.java
@@ -28,7 +28,7 @@ import java.io.File;
import java.io.FileReader;
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.java.record.io.CsvOutputFormat;
import org.apache.flink.configuration.Configuration;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-java/src/test/java/org/apache/flink/api/java/record/io/ExternalProcessFixedLengthInputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/record/io/ExternalProcessFixedLengthInputFormatTest.java b/flink-java/src/test/java/org/apache/flink/api/java/record/io/ExternalProcessFixedLengthInputFormatTest.java
index 8b64824..3518927 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/record/io/ExternalProcessFixedLengthInputFormatTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/record/io/ExternalProcessFixedLengthInputFormatTest.java
@@ -21,7 +21,7 @@ package org.apache.flink.api.java.record.io;
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.io.statistics.BaseStatistics;
import org.apache.flink.api.java.record.io.ExternalProcessFixedLengthInputFormat;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-java/src/test/java/org/apache/flink/api/java/record/io/ExternalProcessInputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/record/io/ExternalProcessInputFormatTest.java b/flink-java/src/test/java/org/apache/flink/api/java/record/io/ExternalProcessInputFormatTest.java
index cb7a3de..1b86ecb 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/record/io/ExternalProcessInputFormatTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/record/io/ExternalProcessInputFormatTest.java
@@ -21,7 +21,7 @@ package org.apache.flink.api.java.record.io;
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.io.statistics.BaseStatistics;
import org.apache.flink.api.java.record.io.ExternalProcessInputFormat;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-java/src/test/java/org/apache/flink/api/java/tuple/Tuple2Test.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/tuple/Tuple2Test.java b/flink-java/src/test/java/org/apache/flink/api/java/tuple/Tuple2Test.java
index d4fd634..7379a88 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/tuple/Tuple2Test.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/tuple/Tuple2Test.java
@@ -19,7 +19,7 @@
package org.apache.flink.api.java.tuple;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.java.tuple.Tuple2;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-java/src/test/java/org/apache/flink/api/java/typeutils/TypeInfoParserTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/typeutils/TypeInfoParserTest.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/TypeInfoParserTest.java
index b77fc21..0e06226 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/typeutils/TypeInfoParserTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/TypeInfoParserTest.java
@@ -22,7 +22,7 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.java.typeutils.BasicArrayTypeInfo;
import org.apache.flink.api.java.typeutils.BasicTypeInfo;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index a1cb6e9..487beca 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -51,25 +51,25 @@ under the License.
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>8.0.0.M1</version>
+ <!-- version is derived from base module -->
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>8.0.0.M1</version>
+ <!-- version is derived from base module -->
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>8.0.0.M1</version>
+ <!-- version is derived from base module -->
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
- <version>1.2.1</version>
+ <version>1.8.1</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/filecache/FileCacheDeleteValidationTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/filecache/FileCacheDeleteValidationTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/filecache/FileCacheDeleteValidationTest.java
index 90534fb..8e9ad2f 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/filecache/FileCacheDeleteValidationTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/filecache/FileCacheDeleteValidationTest.java
@@ -22,7 +22,7 @@ package org.apache.flink.runtime.filecache;
import java.io.File;
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.cache.DistributedCache.DistributedCacheEntry;
import org.apache.flink.core.fs.local.LocalFileSystem;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/instance/DefaultInstanceManagerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/instance/DefaultInstanceManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/instance/DefaultInstanceManagerTest.java
index 7beb998..6c0a7fa 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/instance/DefaultInstanceManagerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/instance/DefaultInstanceManagerTest.java
@@ -31,7 +31,6 @@ import java.util.Set;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.GlobalConfiguration;
-import org.apache.flink.runtime.instance.*;
import org.apache.flink.runtime.jobgraph.JobID;
import org.apache.flink.util.LogUtils;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/instance/HostInClusterTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/instance/HostInClusterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/instance/HostInClusterTest.java
index f4b5c14..280b01b 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/instance/HostInClusterTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/instance/HostInClusterTest.java
@@ -30,7 +30,6 @@ import java.net.UnknownHostException;
import java.util.*;
import org.apache.flink.configuration.ConfigConstants;
-import org.apache.flink.runtime.instance.*;
import org.apache.flink.runtime.jobgraph.JobID;
import org.apache.flink.runtime.topology.NetworkTopology;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/instance/local/LocalInstanceManagerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/instance/local/LocalInstanceManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/instance/local/LocalInstanceManagerTest.java
index 41cb40f..9c712f8 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/instance/local/LocalInstanceManagerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/instance/local/LocalInstanceManagerTest.java
@@ -19,7 +19,7 @@
package org.apache.flink.runtime.instance.local;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/ChannelViewsTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/ChannelViewsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/ChannelViewsTest.java
index c928aa8..c85e508 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/ChannelViewsTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/ChannelViewsTest.java
@@ -22,7 +22,7 @@ package org.apache.flink.runtime.io.disk;
import java.io.EOFException;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.core.memory.MemorySegment;
import org.apache.flink.runtime.io.disk.iomanager.BlockChannelReader;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/SpillingBufferTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/SpillingBufferTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/SpillingBufferTest.java
index f4784a8..08c97d6 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/SpillingBufferTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/SpillingBufferTest.java
@@ -22,7 +22,7 @@ package org.apache.flink.runtime.io.disk;
import java.io.EOFException;
import java.util.ArrayList;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.core.memory.DataInputView;
import org.apache.flink.core.memory.MemorySegment;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java
index ef4ba1b..1fab785 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java
@@ -25,7 +25,7 @@ import java.io.IOException;
import java.util.List;
import java.util.Random;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerPerformanceBenchmark.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerPerformanceBenchmark.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerPerformanceBenchmark.java
index 8ae8b5c..9e79311 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerPerformanceBenchmark.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerPerformanceBenchmark.java
@@ -32,7 +32,7 @@ import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerTest.java
index 078f05d..4b2aaee 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerTest.java
@@ -23,7 +23,7 @@ import java.io.File;
import java.io.IOException;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.core.memory.MemorySegment;
import org.apache.flink.runtime.io.disk.iomanager.BlockChannelAccess;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDecoderTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDecoderTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDecoderTest.java
index 6a8e2fa..54c0676 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDecoderTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDecoderTest.java
@@ -23,7 +23,8 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.CompositeByteBuf;
import io.netty.channel.embedded.EmbeddedChannel;
-import junit.framework.Assert;
+
+import org.junit.Assert;
import org.apache.flink.core.memory.DataInputView;
import org.apache.flink.core.memory.DataOutputView;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManagerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManagerTest.java
index 6893ce9..dfb654d 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManagerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManagerTest.java
@@ -19,7 +19,7 @@
package org.apache.flink.runtime.io.network.netty;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.runtime.io.network.ChannelManager;
import org.apache.flink.runtime.io.network.Envelope;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/OutboundEnvelopeEncoderTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/OutboundEnvelopeEncoderTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/OutboundEnvelopeEncoderTest.java
index 7ce02ea..7ddf4c8 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/OutboundEnvelopeEncoderTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/OutboundEnvelopeEncoderTest.java
@@ -21,7 +21,8 @@ package org.apache.flink.runtime.io.network.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.embedded.EmbeddedChannel;
-import junit.framework.Assert;
+
+import org.junit.Assert;
import org.apache.flink.core.memory.MemorySegment;
import org.apache.flink.runtime.io.network.Buffer;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/DataInputOutputSerializerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/DataInputOutputSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/DataInputOutputSerializerTest.java
index 2a784f6..b1a967c 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/DataInputOutputSerializerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/DataInputOutputSerializerTest.java
@@ -19,7 +19,7 @@
package org.apache.flink.runtime.io.network.serialization;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.core.memory.MemorySegment;
import org.apache.flink.runtime.io.network.serialization.DataInputDeserializer;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializationTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializationTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializationTest.java
index 8bcd7c4..1ea283d 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializationTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializationTest.java
@@ -19,7 +19,7 @@
package org.apache.flink.runtime.io.network.serialization;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.core.memory.MemorySegment;
import org.apache.flink.runtime.io.network.Buffer;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializerTest.java
index f044ce5..1e63ef8 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/SpanningRecordSerializerTest.java
@@ -19,7 +19,7 @@
package org.apache.flink.runtime.io.network.serialization;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.core.memory.DataInputView;
import org.apache.flink.core.memory.DataOutputView;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/memory/DefaultMemoryManagerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/memory/DefaultMemoryManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/memory/DefaultMemoryManagerTest.java
index 6918dc9..7565093 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/memory/DefaultMemoryManagerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/memory/DefaultMemoryManagerTest.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.core.memory.MemorySegment;
import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemorySegmentTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemorySegmentTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemorySegmentTest.java
index 94f36ff..7a38603 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemorySegmentTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/memory/MemorySegmentTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.fail;
import java.util.Random;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.core.memory.MemorySegment;
import org.apache.flink.runtime.memorymanager.DefaultMemoryManager;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskExternalITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskExternalITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskExternalITCase.java
index e8024f3..46717be 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskExternalITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskExternalITCase.java
@@ -21,7 +21,7 @@ package org.apache.flink.runtime.operators;
import java.util.Iterator;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.functions.GenericCoGrouper;
import org.apache.flink.api.java.record.functions.CoGroupFunction;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskTest.java
index a453cf6..a99ffc8 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskTest.java
@@ -22,7 +22,7 @@ package org.apache.flink.runtime.operators;
import java.util.Iterator;
import java.util.concurrent.atomic.AtomicBoolean;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.functions.GenericCoGrouper;
import org.apache.flink.api.java.record.functions.CoGroupFunction;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskExternalITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskExternalITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskExternalITCase.java
index 9091809..694ae48 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskExternalITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskExternalITCase.java
@@ -22,7 +22,7 @@ package org.apache.flink.runtime.operators;
import java.util.ArrayList;
import java.util.HashMap;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.functions.GenericGroupReduce;
import org.apache.flink.api.java.typeutils.runtime.record.RecordComparator;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskTest.java
index 27fc11b..f42c443 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskTest.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.concurrent.atomic.AtomicBoolean;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.functions.GenericGroupReduce;
import org.apache.flink.api.java.record.functions.ReduceFunction;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CrossTaskExternalITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CrossTaskExternalITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CrossTaskExternalITCase.java
index d663d90..79d47fe 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CrossTaskExternalITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CrossTaskExternalITCase.java
@@ -19,7 +19,7 @@
package org.apache.flink.runtime.operators;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.functions.GenericCrosser;
import org.apache.flink.runtime.operators.CrossDriver;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CrossTaskTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CrossTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CrossTaskTest.java
index 0e95ebb..01015d3 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CrossTaskTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CrossTaskTest.java
@@ -21,7 +21,7 @@ package org.apache.flink.runtime.operators;
import java.util.concurrent.atomic.AtomicBoolean;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.functions.GenericCrosser;
import org.apache.flink.api.java.record.functions.CrossFunction;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSinkTaskTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSinkTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSinkTaskTest.java
index e155723..07e7dcd 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSinkTaskTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSinkTaskTest.java
@@ -28,7 +28,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSourceTaskTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSourceTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSourceTaskTest.java
index 9a589db..7cc3356 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSourceTaskTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSourceTaskTest.java
@@ -28,7 +28,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.java.record.io.DelimitedInputFormat;
import org.apache.flink.core.fs.Path;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/MatchTaskExternalITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/MatchTaskExternalITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/MatchTaskExternalITCase.java
index 97dc869..2115bc8 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/MatchTaskExternalITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/MatchTaskExternalITCase.java
@@ -19,7 +19,7 @@
package org.apache.flink.runtime.operators;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.functions.GenericJoiner;
import org.apache.flink.api.java.record.functions.JoinFunction;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskExternalITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskExternalITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskExternalITCase.java
index afcbf97..bf51f41 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskExternalITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskExternalITCase.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskTest.java
index 6d8ec94..0d4e370 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskTest.java
@@ -24,7 +24,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableIteratorTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableIteratorTest.java
index 4392516..96b5e09 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableIteratorTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableIteratorTest.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.api.java.typeutils.runtime.record.RecordSerializer;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIteratorTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIteratorTest.java
index 1ffdda4..c2040b2 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIteratorTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIteratorTest.java
@@ -22,7 +22,7 @@ package org.apache.flink.runtime.operators.resettable;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.api.java.typeutils.runtime.record.RecordSerializer;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIteratorTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIteratorTest.java
index 6c45b37..f27cc73 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIteratorTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIteratorTest.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.runtime.io.disk.iomanager.IOManager;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIteratorTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIteratorTest.java
index ed2db36..771b853 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIteratorTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIteratorTest.java
@@ -21,7 +21,7 @@ package org.apache.flink.runtime.operators.resettable;
import java.util.ArrayList;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.api.java.typeutils.runtime.record.RecordSerializer;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/AsynchonousPartialSorterITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/AsynchonousPartialSorterITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/AsynchonousPartialSorterITCase.java
index ddb9b3d..90fe59f 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/AsynchonousPartialSorterITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/AsynchonousPartialSorterITCase.java
@@ -21,7 +21,7 @@ package org.apache.flink.runtime.operators.sort;
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java
index 5ddaa9f..7020f89 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java
@@ -25,7 +25,7 @@ import java.util.Hashtable;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortITCase.java
index 427c12b..1ac2c04 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortITCase.java
@@ -21,7 +21,7 @@ package org.apache.flink.runtime.operators.sort;
import java.util.Comparator;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java
index c1a2fd9..9c177a6 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java
@@ -22,7 +22,7 @@ package org.apache.flink.runtime.operators.testutils;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.functions.Function;
import org.apache.flink.api.common.typeutils.TypeComparator;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TaskCancelThread.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TaskCancelThread.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TaskCancelThread.java
index 49d1068..8fef47f 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TaskCancelThread.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TaskCancelThread.java
@@ -21,7 +21,7 @@ package org.apache.flink.runtime.operators.testutils;
import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TaskCancelThread extends Thread
{
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java
index 690ccbb..94414c9 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java
@@ -25,9 +25,9 @@ import java.io.IOException;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
-import junit.framework.Assert;
import junit.framework.TestCase;
+import org.junit.Assert;
import org.apache.commons.lang.NotImplementedException;
import org.apache.flink.api.common.typeutils.TypeComparator;
import org.apache.flink.api.common.typeutils.base.IntSerializer;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/RecordOutputEmitterTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/RecordOutputEmitterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/RecordOutputEmitterTest.java
index 7d71e98..7b91510 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/RecordOutputEmitterTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/RecordOutputEmitterTest.java
@@ -26,7 +26,6 @@ import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import java.util.Random;
-import junit.framework.Assert;
import junit.framework.TestCase;
import org.apache.flink.api.common.distributions.DataDistribution;
@@ -44,6 +43,7 @@ import org.apache.flink.types.KeyFieldOutOfBoundsException;
import org.apache.flink.types.NullKeyFieldException;
import org.apache.flink.types.Record;
import org.apache.flink.types.StringValue;
+import org.junit.Assert;
import org.junit.Test;
public class RecordOutputEmitterTest extends TestCase {
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
index 5b2cc0b..e9df0aa 100644
--- a/flink-scala/pom.xml
+++ b/flink-scala/pom.xml
@@ -54,19 +54,19 @@ under the License.
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
- <version>2.10.3</version>
+ <version>2.10.4</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>2.10.3</version>
+ <version>2.10.4</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
- <version>2.10.3</version>
+ <version>2.10.4</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/flink-test-utils/pom.xml b/flink-test-utils/pom.xml
index bed182a..1a0fe1b 100644
--- a/flink-test-utils/pom.xml
+++ b/flink-test-utils/pom.xml
@@ -63,7 +63,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
+ <version>4.11</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml
index 1a94baf..e6ce7c1 100644
--- a/flink-tests/pom.xml
+++ b/flink-tests/pom.xml
@@ -64,7 +64,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
+ <version>4.11</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancellingTestBase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancellingTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancellingTestBase.java
index bef0f71..ccd5804 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancellingTestBase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancellingTestBase.java
@@ -19,11 +19,9 @@
package org.apache.flink.test.cancelling;
-import static junit.framework.Assert.fail;
-
import java.util.Iterator;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -229,7 +227,7 @@ public abstract class CancellingTestBase {
} catch (Exception e) {
LOG.error(e);
- fail(StringUtils.stringifyException(e));
+ Assert.fail(StringUtils.stringifyException(e));
return;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-tests/src/test/java/org/apache/flink/test/iterative/BulkIterationWithAllReducerITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/iterative/BulkIterationWithAllReducerITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/BulkIterationWithAllReducerITCase.java
index e17c089..857f321 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/iterative/BulkIterationWithAllReducerITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/iterative/BulkIterationWithAllReducerITCase.java
@@ -29,7 +29,7 @@ import org.apache.flink.configuration.Configuration;
import org.apache.flink.test.util.JavaProgramTestBase;
import org.apache.flink.util.Collector;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.java.DataSet;
import org.apache.flink.api.java.ExecutionEnvironment;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/AggregatorsITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/AggregatorsITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/AggregatorsITCase.java
index 38e70fa..d719cc5 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/AggregatorsITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/AggregatorsITCase.java
@@ -24,7 +24,7 @@ import java.util.Collection;
import java.util.LinkedList;
import java.util.Random;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.common.aggregators.ConvergenceCriterion;
import org.apache.flink.api.common.aggregators.LongSumAggregator;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/ConnectedComponentsWithParametrizableAggregatorITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/ConnectedComponentsWithParametrizableAggregatorITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/ConnectedComponentsWithParametrizableAggregatorITCase.java
index 00428d5..2f749d4 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/ConnectedComponentsWithParametrizableAggregatorITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/ConnectedComponentsWithParametrizableAggregatorITCase.java
@@ -33,7 +33,7 @@ import org.apache.flink.test.util.JavaProgramTestBase;
import org.apache.flink.types.LongValue;
import org.apache.flink.util.Collector;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.java.DataSet;
import org.apache.flink.api.java.ExecutionEnvironment;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/MapITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/MapITCase.java b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/MapITCase.java
index 83ae165..0921e82 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/MapITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/MapITCase.java
@@ -23,7 +23,7 @@ import java.io.IOException;
import java.util.Collection;
import java.util.LinkedList;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.api.java.functions.MapFunction;
import org.apache.flink.api.java.tuple.Tuple3;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/flink-tests/src/test/java/org/apache/flink/test/util/FailingTestBase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/util/FailingTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/util/FailingTestBase.java
index 09fe150..cc45ec5 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/util/FailingTestBase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/util/FailingTestBase.java
@@ -19,7 +19,7 @@
package org.apache.flink.test.util;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.flink.client.minicluster.NepheleMiniCluster;
import org.apache.flink.runtime.client.JobClient;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bef5e548/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 840b1cc..7e0f153 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@ under the License.
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -85,15 +85,7 @@ under the License.
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
+ <version>1.2.17</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -101,7 +93,7 @@ under the License.
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>14.0.1</version>
+ <version>17.0</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -109,7 +101,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
+ <version>4.11</version>
<type>jar</type>
<scope>test</scope>
</dependency>
@@ -117,7 +109,7 @@ under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.8.5</version>
+ <version>1.9.5</version>
<type>jar</type>
<scope>test</scope>
</dependency>
@@ -125,7 +117,7 @@ under the License.
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
- <version>1.4.9</version>
+ <version>1.5.5</version>
<type>jar</type>
<scope>test</scope>
</dependency>
@@ -133,7 +125,7 @@ under the License.
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
- <version>1.4.9</version>
+ <version>1.5.5</version>
<type>jar</type>
<scope>test</scope>
</dependency>
@@ -141,7 +133,7 @@ under the License.
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
- <version>1.1</version>
+ <version>1.3</version>
<type>jar</type>
<scope>test</scope>
</dependency>
@@ -311,6 +303,33 @@ under the License.
<dependencyManagement>
<!-- this section defines the module versions that are used if nothing else is specified. -->
<dependencies>
+ <!-- Make sure we use a consistent jetty version throughout the project -->
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>8.0.0.M1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>8.0.0.M1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>8.0.0.M1</version>
+ </dependency>
+ <!-- Make sure we use a consistent avro version throughout the project -->
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>1.7.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro-mapred</artifactId>
+ <version>1.7.6</version>
+ </dependency>
<!-- Managed dependency required for HBase in pact-hbase -->
<dependency>
<groupId>org.slf4j</groupId>