You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by wf...@apache.org on 2014/11/06 21:50:10 UTC
incubator-aurora git commit: Replace twitter.commons.io.FileUtils
dependency w/ guava's Files
Repository: incubator-aurora
Updated Branches:
refs/heads/master 2dda4a3e2 -> 5250a94da
Replace twitter.commons.io.FileUtils dependency w/ guava's Files
Reviewed at https://reviews.apache.org/r/27545/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/5250a94d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/5250a94d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/5250a94d
Branch: refs/heads/master
Commit: 5250a94da3b8f7ea72f6014fb586a1c06ecd83c1
Parents: 2dda4a3
Author: Joshua Cohen <jc...@twopensource.com>
Authored: Thu Nov 6 12:49:52 2014 -0800
Committer: Bill Farner <wf...@apache.org>
Committed: Thu Nov 6 12:49:52 2014 -0800
----------------------------------------------------------------------
build.gradle | 1 -
src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java | 4 ++--
.../org/apache/aurora/scheduler/storage/backup/RecoveryTest.java | 4 ++--
.../aurora/scheduler/storage/backup/StorageBackupTest.java | 3 +--
4 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5250a94d/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index a68de0d..135d1a9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -208,7 +208,6 @@ dependencies {
compile 'com.twitter.common:util:0.0.94'
testCompile "com.sun.jersey:jersey-client:${jerseyRev}"
- testCompile 'com.twitter.common:io:0.0.53'
testCompile 'com.twitter.common:testing-easymock:0.0.4'
testCompile 'com.twitter.common:util-system-mocks:0.0.72'
testCompile 'com.twitter.common:zookeeper-testing:0.0.45'
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5250a94d/src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java b/src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java
index 91a92c6..7137971 100644
--- a/src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java
+++ b/src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java
@@ -33,6 +33,7 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.hash.Hashing;
+import com.google.common.io.Files;
import com.google.common.testing.TearDown;
import com.google.common.util.concurrent.Atomics;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -46,7 +47,6 @@ import com.twitter.common.application.StartupStage;
import com.twitter.common.application.modules.AppLauncherModule;
import com.twitter.common.application.modules.LifecycleModule;
import com.twitter.common.base.ExceptionalCommand;
-import com.twitter.common.io.FileUtils;
import com.twitter.common.net.pool.DynamicHostSet.HostChangeMonitor;
import com.twitter.common.quantity.Amount;
import com.twitter.common.quantity.Time;
@@ -146,7 +146,7 @@ public class SchedulerIT extends BaseZooKeeperTest {
control.verify();
}
});
- backupDir = FileUtils.createTempDir();
+ backupDir = Files.createTempDir();
addTearDown(new TearDown() {
@Override
public void tearDown() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5250a94d/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java b/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java
index 5ac15ec..7602d11 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java
@@ -16,9 +16,9 @@ package org.apache.aurora.scheduler.storage.backup;
import java.io.File;
import com.google.common.collect.ImmutableSet;
+import com.google.common.io.Files;
import com.google.common.testing.TearDown;
import com.twitter.common.base.Command;
-import com.twitter.common.io.FileUtils;
import com.twitter.common.quantity.Amount;
import com.twitter.common.quantity.Time;
import com.twitter.common.testing.easymock.EasyMockTest;
@@ -75,7 +75,7 @@ public class RecoveryTest extends EasyMockTest {
@Before
public void setUp() {
- final File backupDir = FileUtils.createTempDir();
+ final File backupDir = Files.createTempDir();
addTearDown(new TearDown() {
@Override
public void tearDown() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5250a94d/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java b/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java
index 3a3c95e..15fc440 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java
@@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.Files;
import com.google.common.testing.TearDown;
-import com.twitter.common.io.FileUtils;
import com.twitter.common.quantity.Amount;
import com.twitter.common.quantity.Time;
import com.twitter.common.testing.easymock.EasyMockTest;
@@ -61,7 +60,7 @@ public class StorageBackupTest extends EasyMockTest {
public void setUp() {
delegate = createMock(new Clazz<SnapshotStore<Snapshot>>() { });
clock = new FakeClock();
- final File backupDir = FileUtils.createTempDir();
+ final File backupDir = Files.createTempDir();
addTearDown(new TearDown() {
@Override
public void tearDown() throws Exception {