flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject flink git commit: [FLINK-3677] Remove Guava dependency from flink-core
Date Mon, 29 Aug 2016 08:38:29 GMT
Repository: flink
Updated Branches:
  refs/heads/master 3505316c6 -> 7a539c05a


[FLINK-3677] Remove Guava dependency from flink-core


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

Branch: refs/heads/master
Commit: 7a539c05a4a7239801f4fa9bc7313e6f30ff85f5
Parents: 3505316
Author: Ivan Mushketyk <ivan.mushketik@gmail.com>
Authored: Fri Aug 26 21:58:27 2016 +0100
Committer: Maximilian Michels <mxm@apache.org>
Committed: Mon Aug 29 10:38:02 2016 +0200

----------------------------------------------------------------------
 flink-core/pom.xml                                           | 8 --------
 .../org/apache/flink/api/common/io/FileInputFormatTest.java  | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/7a539c05/flink-core/pom.xml
----------------------------------------------------------------------
diff --git a/flink-core/pom.xml b/flink-core/pom.xml
index dcb2599..fe24f0e 100644
--- a/flink-core/pom.xml
+++ b/flink-core/pom.xml
@@ -102,14 +102,6 @@ under the License.
 			<artifactId>joda-convert</artifactId>
 			<scope>test</scope>
 		</dependency>
-
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>${guava.version}</version>
-			<scope>test</scope>
-		</dependency>
-
 	</dependencies>
 
 	<build>

http://git-wip-us.apache.org/repos/asf/flink/blob/7a539c05/flink-core/src/test/java/org/apache/flink/api/common/io/FileInputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/io/FileInputFormatTest.java
b/flink-core/src/test/java/org/apache/flink/api/common/io/FileInputFormatTest.java
index dcd6583..f66bd76 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/io/FileInputFormatTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/io/FileInputFormatTest.java
@@ -18,7 +18,6 @@
 
 package org.apache.flink.api.common.io;
 
-import com.google.common.collect.Lists;
 import org.apache.flink.api.common.io.FileInputFormat.FileBaseStatistics;
 import org.apache.flink.api.common.io.statistics.BaseStatistics;
 import org.apache.flink.configuration.Configuration;
@@ -38,6 +37,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
+import java.util.Arrays;
 import java.util.Collections;
 
 import static org.junit.Assert.*;
@@ -359,7 +359,7 @@ public class FileInputFormatTest {
 			format.configure(configuration);
 			format.setFilesFilter(new GlobFilePathFilter(
 				Collections.singletonList("**"),
-				Lists.newArrayList("**/another_file.bin", "**/dataFile1.txt")
+				Arrays.asList(new String[] {"**/another_file.bin", "**/dataFile1.txt"})
 			));
 			FileInputSplit[] splits = format.createInputSplits(1);
 


Mime
View raw message