From a79557c0bc142b4a488a61f57d21c4b3f3e10655 Mon Sep 17 00:00:00 2001 From: jaymode Date: Sat, 6 Jun 2015 15:29:44 -0400 Subject: [PATCH] remove use of shaded core packages Elasticsearch core no longer uses shaded dependencies by default, so this change makes the plugin use the unshaded dependencies. Original commit: elastic/x-pack-elasticsearch@6f8b8b3feb693c974bc317f44152c2a077881594 --- .../org/elasticsearch/license/core/DateUtils.java | 6 +++--- .../org/elasticsearch/license/core/Licenses.java | 2 +- .../license/core/LicenseSerializationTests.java | 2 +- .../org/elasticsearch/license/core/TestUtils.java | 4 ++-- .../license/licensor/LicenseSigner.java | 2 +- .../licensor/tools/KeyPairGeneratorTool.java | 2 +- .../licensor/tools/LicenseGeneratorTool.java | 4 ++-- .../licensor/tools/LicenseVerificationTool.java | 3 +-- .../elasticsearch/license/licensor/TestUtils.java | 8 +++----- .../licensor/tools/KeyPairGenerationToolTests.java | 2 +- .../licensor/tools/LicenseGenerationToolTests.java | 4 ++-- .../tools/LicenseVerificationToolTests.java | 6 +++--- .../elasticsearch/license/plugin/LicensePlugin.java | 4 ++-- .../license/plugin/core/LicensesMetaData.java | 2 +- .../license/plugin/core/LicensesService.java | 13 ++++++++----- .../license/plugin/rest/RestGetLicenseAction.java | 2 +- ...tractLicensesConsumerPluginIntegrationTests.java | 2 +- .../plugin/AbstractLicensesIntegrationTests.java | 7 ++++--- .../license/plugin/LicensesClientServiceTests.java | 2 +- .../license/plugin/LicensesManagerServiceTests.java | 2 +- .../plugin/LicensesPluginIntegrationTests.java | 2 +- .../license/plugin/LicensesServiceNodeTests.java | 2 +- .../license/plugin/LicensesTransportTests.java | 2 +- .../plugin/consumer/TestConsumerPluginBase.java | 2 +- 24 files changed, 44 insertions(+), 43 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/license/core/DateUtils.java b/core/src/main/java/org/elasticsearch/license/core/DateUtils.java index 952dd74bfd1..80b42aa82bf 100644 --- a/core/src/main/java/org/elasticsearch/license/core/DateUtils.java +++ b/core/src/main/java/org/elasticsearch/license/core/DateUtils.java @@ -7,9 +7,9 @@ package org.elasticsearch.license.core; import org.elasticsearch.common.joda.FormatDateTimeFormatter; import org.elasticsearch.common.joda.Joda; -import org.elasticsearch.common.joda.time.MutableDateTime; -import org.elasticsearch.common.joda.time.format.DateTimeFormatter; -import org.elasticsearch.common.joda.time.format.ISODateTimeFormat; +import org.joda.time.MutableDateTime; +import org.joda.time.format.DateTimeFormatter; +import org.joda.time.format.ISODateTimeFormat; public class DateUtils { diff --git a/core/src/main/java/org/elasticsearch/license/core/Licenses.java b/core/src/main/java/org/elasticsearch/license/core/Licenses.java index efb1d884e7b..e4e37b6b5ba 100644 --- a/core/src/main/java/org/elasticsearch/license/core/Licenses.java +++ b/core/src/main/java/org/elasticsearch/license/core/Licenses.java @@ -5,8 +5,8 @@ */ package org.elasticsearch.license.core; +import com.google.common.collect.ImmutableMap; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.common.collect.ImmutableMap; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.*; diff --git a/core/src/test/java/org/elasticsearch/license/core/LicenseSerializationTests.java b/core/src/test/java/org/elasticsearch/license/core/LicenseSerializationTests.java index b5a65684117..ee790c8dc41 100644 --- a/core/src/test/java/org/elasticsearch/license/core/LicenseSerializationTests.java +++ b/core/src/test/java/org/elasticsearch/license/core/LicenseSerializationTests.java @@ -5,7 +5,7 @@ */ package org.elasticsearch.license.core; -import org.elasticsearch.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.elasticsearch.common.xcontent.*; import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; diff --git a/core/src/test/java/org/elasticsearch/license/core/TestUtils.java b/core/src/test/java/org/elasticsearch/license/core/TestUtils.java index e6d30e57edf..5465a7d2b40 100644 --- a/core/src/test/java/org/elasticsearch/license/core/TestUtils.java +++ b/core/src/test/java/org/elasticsearch/license/core/TestUtils.java @@ -10,11 +10,11 @@ import org.elasticsearch.common.joda.FormatDateTimeFormatter; import org.elasticsearch.common.joda.Joda; import org.elasticsearch.common.xcontent.XContentBuilder; import org.hamcrest.MatcherAssert; +import org.joda.time.format.DateTimeFormatter; import java.io.IOException; import java.util.*; import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; import static com.carrotsearch.randomizedtesting.RandomizedTest.*; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -26,7 +26,7 @@ public class TestUtils { private final static FormatDateTimeFormatter formatDateTimeFormatter = Joda.forPattern("yyyy-MM-dd"); private final static DateMathParser dateMathParser = new DateMathParser(formatDateTimeFormatter); - private final static org.elasticsearch.common.joda.time.format.DateTimeFormatter dateTimeFormatter = formatDateTimeFormatter.printer(); + private final static DateTimeFormatter dateTimeFormatter = formatDateTimeFormatter.printer(); public static void isSame(Set firstLicenses, Set secondLicenses) { diff --git a/licensor/src/main/java/org/elasticsearch/license/licensor/LicenseSigner.java b/licensor/src/main/java/org/elasticsearch/license/licensor/LicenseSigner.java index 30329729d9a..9fe4b391d4b 100644 --- a/licensor/src/main/java/org/elasticsearch/license/licensor/LicenseSigner.java +++ b/licensor/src/main/java/org/elasticsearch/license/licensor/LicenseSigner.java @@ -5,10 +5,10 @@ */ package org.elasticsearch.license.licensor; +import com.google.common.collect.ImmutableSet; import org.elasticsearch.common.Base64; import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.io.PathUtils; -import org.elasticsearch.common.collect.ImmutableSet; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; diff --git a/licensor/src/main/java/org/elasticsearch/license/licensor/tools/KeyPairGeneratorTool.java b/licensor/src/main/java/org/elasticsearch/license/licensor/tools/KeyPairGeneratorTool.java index fd401cee6a3..80f339065e7 100644 --- a/licensor/src/main/java/org/elasticsearch/license/licensor/tools/KeyPairGeneratorTool.java +++ b/licensor/src/main/java/org/elasticsearch/license/licensor/tools/KeyPairGeneratorTool.java @@ -5,10 +5,10 @@ */ package org.elasticsearch.license.licensor.tools; +import org.apache.commons.cli.CommandLine; import org.elasticsearch.common.cli.CliTool; import org.elasticsearch.common.cli.CliToolConfig; import org.elasticsearch.common.cli.Terminal; -import org.elasticsearch.common.cli.commons.CommandLine; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; diff --git a/licensor/src/main/java/org/elasticsearch/license/licensor/tools/LicenseGeneratorTool.java b/licensor/src/main/java/org/elasticsearch/license/licensor/tools/LicenseGeneratorTool.java index a6a586990bb..9bbd915c815 100644 --- a/licensor/src/main/java/org/elasticsearch/license/licensor/tools/LicenseGeneratorTool.java +++ b/licensor/src/main/java/org/elasticsearch/license/licensor/tools/LicenseGeneratorTool.java @@ -5,11 +5,11 @@ */ package org.elasticsearch.license.licensor.tools; +import com.google.common.collect.ImmutableSet; +import org.apache.commons.cli.CommandLine; import org.elasticsearch.common.cli.CliTool; import org.elasticsearch.common.cli.CliToolConfig; import org.elasticsearch.common.cli.Terminal; -import org.elasticsearch.common.cli.commons.CommandLine; -import org.elasticsearch.common.collect.ImmutableSet; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/licensor/src/main/java/org/elasticsearch/license/licensor/tools/LicenseVerificationTool.java b/licensor/src/main/java/org/elasticsearch/license/licensor/tools/LicenseVerificationTool.java index 89fe9bdb425..27a0a87a244 100644 --- a/licensor/src/main/java/org/elasticsearch/license/licensor/tools/LicenseVerificationTool.java +++ b/licensor/src/main/java/org/elasticsearch/license/licensor/tools/LicenseVerificationTool.java @@ -5,10 +5,10 @@ */ package org.elasticsearch.license.licensor.tools; +import org.apache.commons.cli.CommandLine; import org.elasticsearch.common.cli.CliTool; import org.elasticsearch.common.cli.CliToolConfig; import org.elasticsearch.common.cli.Terminal; -import org.elasticsearch.common.cli.commons.CommandLine; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -16,7 +16,6 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.env.Environment; import org.elasticsearch.license.core.License; -import org.elasticsearch.license.core.LicenseVerifier; import org.elasticsearch.license.core.Licenses; import java.io.IOException; diff --git a/licensor/src/test/java/org/elasticsearch/license/licensor/TestUtils.java b/licensor/src/test/java/org/elasticsearch/license/licensor/TestUtils.java index 2752550967e..e8473b01054 100644 --- a/licensor/src/test/java/org/elasticsearch/license/licensor/TestUtils.java +++ b/licensor/src/test/java/org/elasticsearch/license/licensor/TestUtils.java @@ -16,15 +16,13 @@ import org.elasticsearch.license.core.DateUtils; import org.elasticsearch.license.core.License; import org.elasticsearch.license.core.Licenses; import org.hamcrest.MatcherAssert; +import org.joda.time.format.DateTimeFormatter; import java.io.IOException; import java.util.*; import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; -import static com.carrotsearch.randomizedtesting.RandomizedTest.randomBoolean; -import static com.carrotsearch.randomizedtesting.RandomizedTest.randomInt; -import static com.carrotsearch.randomizedtesting.RandomizedTest.randomIntBetween; +import static com.carrotsearch.randomizedtesting.RandomizedTest.*; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.test.ElasticsearchTestCase.randomFrom; import static org.hamcrest.core.IsEqual.equalTo; @@ -37,7 +35,7 @@ public class TestUtils { private final static FormatDateTimeFormatter formatDateTimeFormatter = Joda.forPattern("yyyy-MM-dd"); private final static DateMathParser dateMathParser = new DateMathParser(formatDateTimeFormatter); - private final static org.elasticsearch.common.joda.time.format.DateTimeFormatter dateTimeFormatter = formatDateTimeFormatter.printer(); + private final static DateTimeFormatter dateTimeFormatter = formatDateTimeFormatter.printer(); public static void isSame(Set firstLicenses, Set secondLicenses) { diff --git a/licensor/src/test/java/org/elasticsearch/license/licensor/tools/KeyPairGenerationToolTests.java b/licensor/src/test/java/org/elasticsearch/license/licensor/tools/KeyPairGenerationToolTests.java index 3cde35b7014..bf2ee87a8df 100644 --- a/licensor/src/test/java/org/elasticsearch/license/licensor/tools/KeyPairGenerationToolTests.java +++ b/licensor/src/test/java/org/elasticsearch/license/licensor/tools/KeyPairGenerationToolTests.java @@ -5,8 +5,8 @@ */ package org.elasticsearch.license.licensor.tools; +import org.apache.commons.cli.MissingOptionException; import org.elasticsearch.common.cli.CliToolTestCase; -import org.elasticsearch.common.cli.commons.MissingOptionException; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.license.licensor.tools.KeyPairGeneratorTool.KeyGenerator; diff --git a/licensor/src/test/java/org/elasticsearch/license/licensor/tools/LicenseGenerationToolTests.java b/licensor/src/test/java/org/elasticsearch/license/licensor/tools/LicenseGenerationToolTests.java index b5f2f69cebc..cc7914d3652 100644 --- a/licensor/src/test/java/org/elasticsearch/license/licensor/tools/LicenseGenerationToolTests.java +++ b/licensor/src/test/java/org/elasticsearch/license/licensor/tools/LicenseGenerationToolTests.java @@ -5,8 +5,8 @@ */ package org.elasticsearch.license.licensor.tools; +import org.apache.commons.cli.MissingOptionException; import org.elasticsearch.common.cli.CliToolTestCase; -import org.elasticsearch.common.cli.commons.MissingOptionException; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.license.core.License; @@ -20,8 +20,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.*; -import static org.elasticsearch.common.cli.CliTool.ExitStatus; import static org.elasticsearch.common.cli.CliTool.Command; +import static org.elasticsearch.common.cli.CliTool.ExitStatus; import static org.elasticsearch.license.licensor.tools.LicenseGeneratorTool.LicenseGenerator; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.instanceOf; diff --git a/licensor/src/test/java/org/elasticsearch/license/licensor/tools/LicenseVerificationToolTests.java b/licensor/src/test/java/org/elasticsearch/license/licensor/tools/LicenseVerificationToolTests.java index 730d6e7c50c..d403e810e6b 100644 --- a/licensor/src/test/java/org/elasticsearch/license/licensor/tools/LicenseVerificationToolTests.java +++ b/licensor/src/test/java/org/elasticsearch/license/licensor/tools/LicenseVerificationToolTests.java @@ -5,15 +5,15 @@ */ package org.elasticsearch.license.licensor.tools; +import org.apache.commons.cli.MissingOptionException; import org.elasticsearch.common.cli.CliToolTestCase; -import org.elasticsearch.common.cli.commons.MissingOptionException; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.env.Environment; -import org.elasticsearch.license.licensor.AbstractLicensingTestBase; -import org.elasticsearch.license.licensor.TestUtils; import org.elasticsearch.license.core.License; import org.elasticsearch.license.core.Licenses; +import org.elasticsearch.license.licensor.AbstractLicensingTestBase; +import org.elasticsearch.license.licensor.TestUtils; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/plugin/src/main/java/org/elasticsearch/license/plugin/LicensePlugin.java b/plugin/src/main/java/org/elasticsearch/license/plugin/LicensePlugin.java index 0b9cec87b0d..425ca301943 100644 --- a/plugin/src/main/java/org/elasticsearch/license/plugin/LicensePlugin.java +++ b/plugin/src/main/java/org/elasticsearch/license/plugin/LicensePlugin.java @@ -5,12 +5,12 @@ */ package org.elasticsearch.license.plugin; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; import org.elasticsearch.action.ActionModule; import org.elasticsearch.client.Client; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.collect.ImmutableSet; -import org.elasticsearch.common.collect.Lists; import org.elasticsearch.common.component.LifecycleComponent; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.Module; diff --git a/plugin/src/main/java/org/elasticsearch/license/plugin/core/LicensesMetaData.java b/plugin/src/main/java/org/elasticsearch/license/plugin/core/LicensesMetaData.java index a3e18f7afed..1cf9809e48a 100644 --- a/plugin/src/main/java/org/elasticsearch/license/plugin/core/LicensesMetaData.java +++ b/plugin/src/main/java/org/elasticsearch/license/plugin/core/LicensesMetaData.java @@ -5,9 +5,9 @@ */ package org.elasticsearch.license.plugin.core; +import com.google.common.collect.ImmutableList; import org.elasticsearch.cluster.AbstractDiffable; import org.elasticsearch.cluster.metadata.MetaData; -import org.elasticsearch.common.collect.ImmutableList; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/plugin/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java b/plugin/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java index e259e041ad3..70c1d7e306b 100644 --- a/plugin/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java +++ b/plugin/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java @@ -5,6 +5,10 @@ */ package org.elasticsearch.license.plugin.core; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; import org.apache.lucene.util.CollectionUtil; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.ActionListener; @@ -13,10 +17,6 @@ import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.collect.ImmutableList; -import org.elasticsearch.common.collect.ImmutableMap; -import org.elasticsearch.common.collect.Iterables; -import org.elasticsearch.common.collect.Sets; import org.elasticsearch.common.component.AbstractLifecycleComponent; import org.elasticsearch.common.component.Lifecycle; import org.elasticsearch.common.inject.Inject; @@ -37,7 +37,10 @@ import org.elasticsearch.transport.*; import java.io.IOException; import java.util.*; -import java.util.concurrent.*; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; diff --git a/plugin/src/main/java/org/elasticsearch/license/plugin/rest/RestGetLicenseAction.java b/plugin/src/main/java/org/elasticsearch/license/plugin/rest/RestGetLicenseAction.java index 219291e317c..71b9fd5d423 100644 --- a/plugin/src/main/java/org/elasticsearch/license/plugin/rest/RestGetLicenseAction.java +++ b/plugin/src/main/java/org/elasticsearch/license/plugin/rest/RestGetLicenseAction.java @@ -5,8 +5,8 @@ */ package org.elasticsearch.license.plugin.rest; +import com.google.common.collect.ImmutableMap; import org.elasticsearch.client.Client; -import org.elasticsearch.common.collect.ImmutableMap; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesConsumerPluginIntegrationTests.java b/plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesConsumerPluginIntegrationTests.java index 1cf38512d7a..b18c99786d2 100644 --- a/plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesConsumerPluginIntegrationTests.java +++ b/plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesConsumerPluginIntegrationTests.java @@ -5,7 +5,7 @@ */ package org.elasticsearch.license.plugin; -import org.elasticsearch.common.base.Predicate; +import com.google.common.base.Predicate; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.gateway.GatewayService; diff --git a/plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesIntegrationTests.java b/plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesIntegrationTests.java index 003d3e0e231..bffa917ab80 100644 --- a/plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesIntegrationTests.java +++ b/plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesIntegrationTests.java @@ -5,13 +5,13 @@ */ package org.elasticsearch.license.plugin; +import com.google.common.base.Predicate; +import com.google.common.collect.Lists; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.ProcessedClusterStateUpdateTask; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.base.Predicate; -import org.elasticsearch.common.collect.Lists; import org.elasticsearch.common.joda.DateMathParser; import org.elasticsearch.common.joda.FormatDateTimeFormatter; import org.elasticsearch.common.joda.Joda; @@ -29,6 +29,7 @@ import org.elasticsearch.license.plugin.core.LicensesMetaData; import org.elasticsearch.license.plugin.core.LicensesStatus; import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.InternalTestCluster; +import org.joda.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; @@ -43,7 +44,7 @@ import static org.hamcrest.Matchers.greaterThan; public abstract class AbstractLicensesIntegrationTests extends ElasticsearchIntegrationTest { private final static FormatDateTimeFormatter formatDateTimeFormatter = Joda.forPattern("yyyy-MM-dd"); - private final static org.elasticsearch.common.joda.time.format.DateTimeFormatter dateTimeFormatter = formatDateTimeFormatter.printer(); + private final static DateTimeFormatter dateTimeFormatter = formatDateTimeFormatter.printer(); private final static DateMathParser dateMathParser = new DateMathParser(formatDateTimeFormatter); public static String dateMathString(String time, final long now) { diff --git a/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesClientServiceTests.java b/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesClientServiceTests.java index a0cf4ae70f9..950dc4ca779 100644 --- a/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesClientServiceTests.java +++ b/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesClientServiceTests.java @@ -5,7 +5,7 @@ */ package org.elasticsearch.license.plugin; -import org.elasticsearch.common.base.Predicate; +import com.google.common.base.Predicate; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.license.core.License; import org.elasticsearch.license.plugin.core.*; diff --git a/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesManagerServiceTests.java b/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesManagerServiceTests.java index ab268cb7b69..958a3264225 100644 --- a/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesManagerServiceTests.java +++ b/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesManagerServiceTests.java @@ -5,9 +5,9 @@ */ package org.elasticsearch.license.plugin; +import com.google.common.collect.Sets; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse; -import org.elasticsearch.common.collect.Sets; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.license.core.License; import org.elasticsearch.license.plugin.action.delete.DeleteLicenseRequest; diff --git a/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesPluginIntegrationTests.java b/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesPluginIntegrationTests.java index 5690e5666ea..df4a5caf6b6 100644 --- a/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesPluginIntegrationTests.java +++ b/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesPluginIntegrationTests.java @@ -5,7 +5,7 @@ */ package org.elasticsearch.license.plugin; -import org.elasticsearch.common.base.Predicate; +import com.google.common.base.Predicate; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.gateway.GatewayService; diff --git a/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesServiceNodeTests.java b/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesServiceNodeTests.java index 13c7afa8fcc..c6de70b35ab 100644 --- a/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesServiceNodeTests.java +++ b/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesServiceNodeTests.java @@ -5,7 +5,7 @@ */ package org.elasticsearch.license.plugin; -import org.elasticsearch.common.base.Predicate; +import com.google.common.base.Predicate; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.license.plugin.consumer.EagerLicenseRegistrationConsumerPlugin; import org.elasticsearch.license.plugin.consumer.EagerLicenseRegistrationPluginService; diff --git a/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesTransportTests.java b/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesTransportTests.java index 4a9699a774c..ee5ee6c5ce2 100644 --- a/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesTransportTests.java +++ b/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesTransportTests.java @@ -5,8 +5,8 @@ */ package org.elasticsearch.license.plugin; +import com.google.common.collect.Sets; import org.elasticsearch.action.ActionFuture; -import org.elasticsearch.common.collect.Sets; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.license.core.License; import org.elasticsearch.license.plugin.action.delete.DeleteLicenseAction; diff --git a/plugin/src/test/java/org/elasticsearch/license/plugin/consumer/TestConsumerPluginBase.java b/plugin/src/test/java/org/elasticsearch/license/plugin/consumer/TestConsumerPluginBase.java index e9546fa6473..c28682cc2a8 100644 --- a/plugin/src/test/java/org/elasticsearch/license/plugin/consumer/TestConsumerPluginBase.java +++ b/plugin/src/test/java/org/elasticsearch/license/plugin/consumer/TestConsumerPluginBase.java @@ -5,9 +5,9 @@ */ package org.elasticsearch.license.plugin.consumer; +import com.google.common.collect.Lists; import org.elasticsearch.client.Client; import org.elasticsearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.collect.Lists; import org.elasticsearch.common.component.LifecycleComponent; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.plugins.AbstractPlugin;