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@6f8b8b3feb

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 {
 

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.*;

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;

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<License> firstLicenses, Set<License> secondLicenses) {
 

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;

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;
 

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;

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;

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<License> firstLicenses, Set<License> secondLicenses) {
 

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;

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;

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;

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;

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;

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;
 

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;

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;

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) {

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.*;

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;

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;

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;

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;

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;