Return-Path: X-Original-To: apmail-crunch-commits-archive@www.apache.org Delivered-To: apmail-crunch-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A0416102BF for ; Tue, 25 Feb 2014 16:58:18 +0000 (UTC) Received: (qmail 81555 invoked by uid 500); 25 Feb 2014 16:58:17 -0000 Delivered-To: apmail-crunch-commits-archive@crunch.apache.org Received: (qmail 81457 invoked by uid 500); 25 Feb 2014 16:58:14 -0000 Mailing-List: contact commits-help@crunch.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@crunch.apache.org Delivered-To: mailing list commits@crunch.apache.org Received: (qmail 81423 invoked by uid 99); 25 Feb 2014 16:58:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Feb 2014 16:58:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 932B392C679; Tue, 25 Feb 2014 16:58:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jwills@apache.org To: commits@crunch.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: CRUNCH-356: Switch from deprecated Closeables.closeQuietly to IOUtils.closeQuietly. Contributed by John Leacox. Date: Tue, 25 Feb 2014 16:58:08 +0000 (UTC) Repository: crunch Updated Branches: refs/heads/master 0da8e3c3e -> d68895f32 CRUNCH-356: Switch from deprecated Closeables.closeQuietly to IOUtils.closeQuietly. Contributed by John Leacox. Project: http://git-wip-us.apache.org/repos/asf/crunch/repo Commit: http://git-wip-us.apache.org/repos/asf/crunch/commit/d68895f3 Tree: http://git-wip-us.apache.org/repos/asf/crunch/tree/d68895f3 Diff: http://git-wip-us.apache.org/repos/asf/crunch/diff/d68895f3 Branch: refs/heads/master Commit: d68895f32fbc22001c0577ed6a91aa5a0fd37ef0 Parents: 0da8e3c Author: Josh Wills Authored: Tue Feb 25 08:55:32 2014 -0800 Committer: Josh Wills Committed: Tue Feb 25 08:55:32 2014 -0800 ---------------------------------------------------------------------- crunch-core/pom.xml | 6 ++++++ .../java/org/apache/crunch/io/impl/AutoClosingIterator.java | 4 ++-- .../apache/crunch/scrunch/interpreter/InterpreterRunner.scala | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/crunch/blob/d68895f3/crunch-core/pom.xml ---------------------------------------------------------------------- diff --git a/crunch-core/pom.xml b/crunch-core/pom.xml index 24fa4cd..06a8a19 100644 --- a/crunch-core/pom.xml +++ b/crunch-core/pom.xml @@ -84,6 +84,12 @@ under the License. + commons-io + commons-io + provided + + + org.codehaus.jackson jackson-core-asl provided http://git-wip-us.apache.org/repos/asf/crunch/blob/d68895f3/crunch-core/src/main/java/org/apache/crunch/io/impl/AutoClosingIterator.java ---------------------------------------------------------------------- diff --git a/crunch-core/src/main/java/org/apache/crunch/io/impl/AutoClosingIterator.java b/crunch-core/src/main/java/org/apache/crunch/io/impl/AutoClosingIterator.java index a854ebc..caddb73 100644 --- a/crunch-core/src/main/java/org/apache/crunch/io/impl/AutoClosingIterator.java +++ b/crunch-core/src/main/java/org/apache/crunch/io/impl/AutoClosingIterator.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.util.Iterator; import com.google.common.collect.UnmodifiableIterator; -import com.google.common.io.Closeables; +import org.apache.commons.io.IOUtils; /** * Closes the wrapped {@code Closeable} when {@link #hasNext()} returns false. As long a client loops through to @@ -42,7 +42,7 @@ public class AutoClosingIterator extends UnmodifiableIterator implements C if (iter.hasNext()) { return true; } else { - Closeables.closeQuietly(this); + IOUtils.closeQuietly(this); return false; } } http://git-wip-us.apache.org/repos/asf/crunch/blob/d68895f3/crunch-scrunch/src/main/scala/org/apache/crunch/scrunch/interpreter/InterpreterRunner.scala ---------------------------------------------------------------------- diff --git a/crunch-scrunch/src/main/scala/org/apache/crunch/scrunch/interpreter/InterpreterRunner.scala b/crunch-scrunch/src/main/scala/org/apache/crunch/scrunch/interpreter/InterpreterRunner.scala index 196e222..9443f68 100644 --- a/crunch-scrunch/src/main/scala/org/apache/crunch/scrunch/interpreter/InterpreterRunner.scala +++ b/crunch-scrunch/src/main/scala/org/apache/crunch/scrunch/interpreter/InterpreterRunner.scala @@ -33,10 +33,10 @@ import scala.tools.nsc.io.Jar import scala.tools.nsc.io.VirtualDirectory import com.google.common.io.Files -import com.google.common.io.Closeables import org.apache.hadoop.conf.Configuration import org.apache.crunch.util.DistCache +import org.apache.commons.io.IOUtils /** * An object used to run a Scala REPL with modifications to facilitate Scrunch jobs running @@ -153,7 +153,7 @@ object InterpreterRunner extends MainGenericRunner { addVirtualDirectoryToJar(virtualDirectory, "", jarStream) return tempJar } finally { - Closeables.closeQuietly(jarStream) + IOUtils.closeQuietly(jarStream) } }