Repository: brooklyn-server Updated Branches: refs/heads/master bb1da12b9 -> 5a3a6b694
Use Airline 0.7 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3bb2b2b8 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3bb2b2b8 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3bb2b2b8 Branch: refs/heads/master Commit: 3bb2b2b8f4cda014ad543432da16be38b49eaa2e Parents: 786b938 Author: Sam Corbett <sam.corb...@cloudsoftcorp.com> Authored: Mon Mar 13 10:41:17 2017 +0000 Committer: Sam Corbett <sam.corb...@cloudsoftcorp.com> Committed: Mon Mar 13 10:48:13 2017 +0000 ---------------------------------------------------------------------- pom.xml | 2 +- .../java/org/apache/brooklyn/cli/AbstractMain.java | 16 ++++++++-------- .../java/org/apache/brooklyn/cli/CloudExplorer.java | 6 +++--- .../java/org/apache/brooklyn/cli/ItemLister.java | 4 ++-- .../src/main/java/org/apache/brooklyn/cli/Main.java | 8 ++++---- .../test/java/org/apache/brooklyn/cli/CliTest.java | 6 +++--- .../apache/brooklyn/cli/CloudExplorerLiveTest.java | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3bb2b2b8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 60e0de5..534bf08 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ <reflections.version>0.9.9-RC1</reflections.version> <jetty.version>9.2.13.v20150730</jetty.version> <jetty-schemas.version>3.1.M0</jetty-schemas.version> - <airline.version>0.6</airline.version> + <airline.version>0.7</airline.version> <mockwebserver.version>20121111</mockwebserver.version> <freemarker.version>2.3.25-incubating</freemarker.version> <commons-io.version>2.4</commons-io.version> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3bb2b2b8/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java ---------------------------------------------------------------------- diff --git a/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java b/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java index fe54880..64c8e1d 100644 --- a/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java +++ b/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java @@ -18,14 +18,14 @@ */ package org.apache.brooklyn.cli; -import io.airlift.command.Arguments; -import io.airlift.command.Cli; -import io.airlift.command.Cli.CliBuilder; -import io.airlift.command.Command; -import io.airlift.command.Help; -import io.airlift.command.Option; -import io.airlift.command.OptionType; -import io.airlift.command.ParseException; +import io.airlift.airline.Arguments; +import io.airlift.airline.Cli; +import io.airlift.airline.Cli.CliBuilder; +import io.airlift.airline.Command; +import io.airlift.airline.Help; +import io.airlift.airline.Option; +import io.airlift.airline.OptionType; +import io.airlift.airline.ParseException; import java.io.InputStream; import java.io.PrintStream; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3bb2b2b8/server-cli/src/main/java/org/apache/brooklyn/cli/CloudExplorer.java ---------------------------------------------------------------------- diff --git a/server-cli/src/main/java/org/apache/brooklyn/cli/CloudExplorer.java b/server-cli/src/main/java/org/apache/brooklyn/cli/CloudExplorer.java index 5018ae6..24246ef 100644 --- a/server-cli/src/main/java/org/apache/brooklyn/cli/CloudExplorer.java +++ b/server-cli/src/main/java/org/apache/brooklyn/cli/CloudExplorer.java @@ -28,9 +28,9 @@ import org.apache.brooklyn.launcher.command.support.CloudExplorerSupport.ListIma import org.apache.brooklyn.launcher.command.support.CloudExplorerSupport.ListInstances; import org.apache.brooklyn.launcher.command.support.CloudExplorerSupport.ListHardwareProfiles; import org.apache.brooklyn.launcher.command.support.CloudExplorerSupport.TerminateInstances; -import io.airlift.command.Command; -import io.airlift.command.Option; -import io.airlift.command.ParseException; +import io.airlift.airline.Command; +import io.airlift.airline.Option; +import io.airlift.airline.ParseException; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3bb2b2b8/server-cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java ---------------------------------------------------------------------- diff --git a/server-cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java b/server-cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java index 5fd4b4f..1cd0de0 100644 --- a/server-cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java +++ b/server-cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java @@ -18,8 +18,8 @@ */ package org.apache.brooklyn.cli; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import java.io.File; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3bb2b2b8/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java ---------------------------------------------------------------------- diff --git a/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java b/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java index 6bb50e1..a791520 100644 --- a/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java +++ b/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java @@ -96,10 +96,10 @@ import com.google.common.collect.Iterables; import groovy.lang.GroovyClassLoader; import groovy.lang.GroovyShell; -import io.airlift.command.Cli; -import io.airlift.command.Cli.CliBuilder; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Cli; +import io.airlift.airline.Cli.CliBuilder; +import io.airlift.airline.Command; +import io.airlift.airline.Option; /** * This class is the primary CLI for brooklyn. http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3bb2b2b8/server-cli/src/test/java/org/apache/brooklyn/cli/CliTest.java ---------------------------------------------------------------------- diff --git a/server-cli/src/test/java/org/apache/brooklyn/cli/CliTest.java b/server-cli/src/test/java/org/apache/brooklyn/cli/CliTest.java index d3dbe28..987f054 100644 --- a/server-cli/src/test/java/org/apache/brooklyn/cli/CliTest.java +++ b/server-cli/src/test/java/org/apache/brooklyn/cli/CliTest.java @@ -86,9 +86,9 @@ import com.google.common.collect.Lists; import com.google.common.io.Files; import groovy.lang.GroovyClassLoader; -import io.airlift.command.Cli; -import io.airlift.command.Command; -import io.airlift.command.ParseException; +import io.airlift.airline.Cli; +import io.airlift.airline.Command; +import io.airlift.airline.ParseException; public class CliTest { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3bb2b2b8/server-cli/src/test/java/org/apache/brooklyn/cli/CloudExplorerLiveTest.java ---------------------------------------------------------------------- diff --git a/server-cli/src/test/java/org/apache/brooklyn/cli/CloudExplorerLiveTest.java b/server-cli/src/test/java/org/apache/brooklyn/cli/CloudExplorerLiveTest.java index 1e99841..beeecba 100644 --- a/server-cli/src/test/java/org/apache/brooklyn/cli/CloudExplorerLiveTest.java +++ b/server-cli/src/test/java/org/apache/brooklyn/cli/CloudExplorerLiveTest.java @@ -37,8 +37,8 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.airlift.command.Cli; -import io.airlift.command.ParseException; +import io.airlift.airline.Cli; +import io.airlift.airline.ParseException; public class CloudExplorerLiveTest {
