Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1FA371035F for ; Fri, 25 Jul 2014 16:46:05 +0000 (UTC) Received: (qmail 41073 invoked by uid 500); 25 Jul 2014 16:46:05 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 41044 invoked by uid 500); 25 Jul 2014 16:46:05 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 41027 invoked by uid 99); 25 Jul 2014 16:46:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Jul 2014 16:46:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 25 Jul 2014 16:46:04 +0000 Received: (qmail 38257 invoked by uid 99); 25 Jul 2014 16:45:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Jul 2014 16:45:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C00239B513D; Fri, 25 Jul 2014 16:45:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.incubator.apache.org Date: Fri, 25 Jul 2014 16:45:43 -0000 Message-Id: In-Reply-To: <106cf0c2ea4a4c1b8706fc0e652f47e8@git.apache.org> References: <106cf0c2ea4a4c1b8706fc0e652f47e8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/8] git commit: Use guava instead of com.beust Lists X-Virus-Checked: Checked by ClamAV on apache.org Use guava instead of com.beust Lists Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0b8a639d Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0b8a639d Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0b8a639d Branch: refs/heads/master Commit: 0b8a639d6350a59504f91961a27cc7a8c6efc75a Parents: e315de3 Author: Aled Sage Authored: Tue Jul 22 12:52:37 2014 +0100 Committer: Aled Sage Committed: Tue Jul 22 12:52:37 2014 +0100 ---------------------------------------------------------------------- .../brooklyn/internal/storage/impl/BrooklynStorageImplTest.java | 4 ++-- .../java/brooklyn/util/internal/ssh/ShellToolAbstractTest.java | 2 +- .../brooklyn/policy/loadbalancing/MockContainerEntityImpl.java | 2 +- .../test/java/brooklyn/entity/database/VogellaExampleAccess.java | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0b8a639d/core/src/test/java/brooklyn/internal/storage/impl/BrooklynStorageImplTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/internal/storage/impl/BrooklynStorageImplTest.java b/core/src/test/java/brooklyn/internal/storage/impl/BrooklynStorageImplTest.java index 6fb396d..50b7ba3 100644 --- a/core/src/test/java/brooklyn/internal/storage/impl/BrooklynStorageImplTest.java +++ b/core/src/test/java/brooklyn/internal/storage/impl/BrooklynStorageImplTest.java @@ -28,18 +28,18 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import brooklyn.internal.storage.impl.inmemory.InmemoryDatagrid; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.internal.storage.BrooklynStorage; import brooklyn.internal.storage.DataGrid; import brooklyn.internal.storage.Reference; +import brooklyn.internal.storage.impl.inmemory.InmemoryDatagrid; -import com.beust.jcommander.internal.Lists; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; public class BrooklynStorageImplTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0b8a639d/core/src/test/java/brooklyn/util/internal/ssh/ShellToolAbstractTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/util/internal/ssh/ShellToolAbstractTest.java b/core/src/test/java/brooklyn/util/internal/ssh/ShellToolAbstractTest.java index 9914e0b..886e473 100644 --- a/core/src/test/java/brooklyn/util/internal/ssh/ShellToolAbstractTest.java +++ b/core/src/test/java/brooklyn/util/internal/ssh/ShellToolAbstractTest.java @@ -42,11 +42,11 @@ import brooklyn.util.config.ConfigBag; import brooklyn.util.text.Identifiers; import brooklyn.util.time.Time; -import com.beust.jcommander.internal.Lists; import com.google.common.base.Stopwatch; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0b8a639d/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java b/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java index 85a5893..13baec5 100644 --- a/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java +++ b/policy/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java @@ -37,10 +37,10 @@ import brooklyn.location.Location; import brooklyn.util.collections.MutableList; import brooklyn.util.time.Time; -import com.beust.jcommander.internal.Lists; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0b8a639d/software/database/src/test/java/brooklyn/entity/database/VogellaExampleAccess.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/VogellaExampleAccess.java b/software/database/src/test/java/brooklyn/entity/database/VogellaExampleAccess.java index a8c1d4c..962a294 100644 --- a/software/database/src/test/java/brooklyn/entity/database/VogellaExampleAccess.java +++ b/software/database/src/test/java/brooklyn/entity/database/VogellaExampleAccess.java @@ -18,10 +18,11 @@ */ package brooklyn.entity.database; -import com.beust.jcommander.internal.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.collect.Lists; + import java.sql.*; import java.util.List;