From 53356aca055109e8deb792e582e912447f7fed9e Mon Sep 17 00:00:00 2001 From: leventov Date: Fri, 22 Jun 2018 17:57:35 +0400 Subject: [PATCH] Upgrade Guava to 25.1-jre --- build.gradle | 4 ++-- src/main/java/io/airlift/command/GlobalUsageSummary.java | 4 ++-- src/test/java/io/airlift/command/GalaxyCommandLineParser.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 8aef6f19f..8fe3b1ca5 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ allprojects { group = "com.complexible.airline" sourceCompatibility = '1.8' targetCompatibility = '1.8' - version = "0.7.5" + version = "0.7.6" repositories { mavenCentral() @@ -26,7 +26,7 @@ ext { dependencies { compile 'javax.inject:javax.inject:1' - compile "com.google.guava:guava:18.0" + compile "com.google.guava:guava:25.1-jre" compile 'com.google.code.findbugs:jsr305:3.0.0' testCompile 'org.testng:testng:6.0.1' diff --git a/src/main/java/io/airlift/command/GlobalUsageSummary.java b/src/main/java/io/airlift/command/GlobalUsageSummary.java index 98e82158a..c35f36f97 100644 --- a/src/main/java/io/airlift/command/GlobalUsageSummary.java +++ b/src/main/java/io/airlift/command/GlobalUsageSummary.java @@ -1,7 +1,7 @@ package io.airlift.command; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableList; @@ -101,7 +101,7 @@ public String apply(OptionMetadata option) { public Iterable apply(Entry entry) { - return ImmutableList.of(entry.getKey(), Objects.firstNonNull(entry.getValue(), "")); + return ImmutableList.of(entry.getKey(), MoreObjects.firstNonNull(entry.getValue(), "")); } })); out.newline(); diff --git a/src/test/java/io/airlift/command/GalaxyCommandLineParser.java b/src/test/java/io/airlift/command/GalaxyCommandLineParser.java index 639bfc5a4..9175e07e7 100644 --- a/src/test/java/io/airlift/command/GalaxyCommandLineParser.java +++ b/src/test/java/io/airlift/command/GalaxyCommandLineParser.java @@ -1,7 +1,7 @@ package io.airlift.command; import com.google.common.base.Joiner; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.Lists; import io.airlift.command.Cli.CliBuilder; import org.testng.annotations.Test; @@ -91,7 +91,7 @@ public static class GlobalOptions public boolean debug = false; @Option(type = GLOBAL, name = "--coordinator", description = "Galaxy coordinator host (overrides GALAXY_COORDINATOR)") - public String coordinator = Objects.firstNonNull(System.getenv("GALAXY_COORDINATOR"), "http://localhost:64000"); + public String coordinator = MoreObjects.firstNonNull(System.getenv("GALAXY_COORDINATOR"), "http://localhost:64000"); @Override public String toString()