Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EB869200B73 for ; Mon, 29 Aug 2016 10:38:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id EA19D160AB8; Mon, 29 Aug 2016 08:38:30 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3D210160AA7 for ; Mon, 29 Aug 2016 10:38:30 +0200 (CEST) Received: (qmail 21289 invoked by uid 500); 29 Aug 2016 08:38:29 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 21280 invoked by uid 99); 29 Aug 2016 08:38:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Aug 2016 08:38:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3EED3DFE2C; Mon, 29 Aug 2016 08:38:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mxm@apache.org To: commits@flink.apache.org Message-Id: <82f9a84a467e48d9bbebc20f3cfabd46@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: flink git commit: [FLINK-3677] Remove Guava dependency from flink-core Date: Mon, 29 Aug 2016 08:38:29 +0000 (UTC) archived-at: Mon, 29 Aug 2016 08:38:31 -0000 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 Authored: Fri Aug 26 21:58:27 2016 +0100 Committer: Maximilian Michels 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. joda-convert test - - - com.google.guava - guava - ${guava.version} - test - - 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);