From 002b4f89ecd362dda902311353981e08250226a5 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Thu, 7 Jun 2018 10:57:07 -0400 Subject: [PATCH 1/4] Remove vestiges of animal sniffer We no longer need animal sniffer because we use JDK functionality (introduced in JDK 9) to target older versions of the JDK for compilation. This functionality means that the JDK handles the problem of ensuring that we do not use JDK APIs from the version that we are compiling from that are not available in the version that we are compiling to. A previous commit removed this for the REST client (where we target JDK 7) but a few traces were left behind. --- client/test/build.gradle | 3 --- distribution/tools/launchers/build.gradle | 3 --- 2 files changed, 6 deletions(-) diff --git a/client/test/build.gradle b/client/test/build.gradle index fd5777cc8df3f..51fa6fc193214 100644 --- a/client/test/build.gradle +++ b/client/test/build.gradle @@ -21,7 +21,6 @@ import org.elasticsearch.gradle.precommit.PrecommitTasks import org.gradle.api.JavaVersion apply plugin: 'elasticsearch.build' -apply plugin: 'ru.vyarus.animalsniffer' targetCompatibility = JavaVersion.VERSION_1_7 sourceCompatibility = JavaVersion.VERSION_1_7 @@ -31,8 +30,6 @@ dependencies { compile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" compile "junit:junit:${versions.junit}" compile "org.hamcrest:hamcrest-all:${versions.hamcrest}" - compile "org.codehaus.mojo:animal-sniffer-annotations:1.15" - signature "org.codehaus.mojo.signature:java17:1.0@signature" } forbiddenApisMain { diff --git a/distribution/tools/launchers/build.gradle b/distribution/tools/launchers/build.gradle index 27e8712ffcbe2..ff0f4c473a49e 100644 --- a/distribution/tools/launchers/build.gradle +++ b/distribution/tools/launchers/build.gradle @@ -21,14 +21,11 @@ import org.elasticsearch.gradle.precommit.PrecommitTasks import org.gradle.api.JavaVersion apply plugin: 'elasticsearch.build' -apply plugin: 'ru.vyarus.animalsniffer' sourceCompatibility = JavaVersion.VERSION_1_7 targetCompatibility = JavaVersion.VERSION_1_7 dependencies { - signature "org.codehaus.mojo.signature:java17:1.0@signature" - testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" testCompile "junit:junit:${versions.junit}" testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}" From 878f4e24af49c3ae80173a5b17794066c1359060 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Thu, 7 Jun 2018 11:55:20 -0400 Subject: [PATCH 2/4] Iteration --- .../client/sniff/ElasticsearchHostsSnifferTests.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/client/sniffer/src/test/java/org/elasticsearch/client/sniff/ElasticsearchHostsSnifferTests.java b/client/sniffer/src/test/java/org/elasticsearch/client/sniff/ElasticsearchHostsSnifferTests.java index f13d175110434..ed2744df31c61 100644 --- a/client/sniffer/src/test/java/org/elasticsearch/client/sniff/ElasticsearchHostsSnifferTests.java +++ b/client/sniffer/src/test/java/org/elasticsearch/client/sniff/ElasticsearchHostsSnifferTests.java @@ -30,7 +30,6 @@ import org.apache.http.Consts; import org.apache.http.HttpHost; import org.apache.http.client.methods.HttpGet; -import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement; import org.elasticsearch.client.Response; import org.elasticsearch.client.ResponseException; import org.elasticsearch.client.RestClient; @@ -148,8 +147,6 @@ private static HttpServer createHttpServer(final SniffResponse sniffResponse, fi return httpServer; } - //animal-sniffer doesn't like our usage of com.sun.net.httpserver.* classes - @IgnoreJRERequirement private static class ResponseHandler implements HttpHandler { private final int sniffTimeoutMillis; private final SniffResponse sniffResponse; From dea7cea38a7781420b34f3049eac94ec24217dd2 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Thu, 7 Jun 2018 11:34:25 -0400 Subject: [PATCH 3/4] Move cli sub-project out of server to libs This commit moves the cli sub-project out of server to libs. This resolves a dependency resolution problem when upgrading to Gradle 4.8 where Gradle was confused about the elasticsearch-core dependency arising from sql-shared-proto and transitively via elasticsearch-cli. --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 54329 -> 54413 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- {server => libs}/cli/build.gradle | 0 .../cli/licenses/jopt-simple-5.0.2.jar.sha1 | 0 .../cli/licenses/jopt-simple-LICENSE.txt | 0 .../cli/licenses/jopt-simple-NOTICE.txt | 0 .../java/org/elasticsearch/cli/Command.java | 0 .../java/org/elasticsearch/cli/ExitCodes.java | 0 .../org/elasticsearch/cli/MultiCommand.java | 10 ++++------ .../elasticsearch/cli/SuppressForbidden.java | 0 .../java/org/elasticsearch/cli/Terminal.java | 0 .../org/elasticsearch/cli/UserException.java | 0 13 files changed, 7 insertions(+), 9 deletions(-) rename {server => libs}/cli/build.gradle (100%) rename {server => libs}/cli/licenses/jopt-simple-5.0.2.jar.sha1 (100%) rename {server => libs}/cli/licenses/jopt-simple-LICENSE.txt (100%) rename {server => libs}/cli/licenses/jopt-simple-NOTICE.txt (100%) rename {server => libs}/cli/src/main/java/org/elasticsearch/cli/Command.java (100%) rename {server => libs}/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java (100%) rename {server => libs}/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java (99%) rename {server => libs}/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java (100%) rename {server => libs}/cli/src/main/java/org/elasticsearch/cli/Terminal.java (100%) rename {server => libs}/cli/src/main/java/org/elasticsearch/cli/UserException.java (100%) diff --git a/build.gradle b/build.gradle index 620e043d1c081..4721a3520b8aa 100644 --- a/build.gradle +++ b/build.gradle @@ -205,7 +205,7 @@ subprojects { "org.elasticsearch.gradle:build-tools:${version}": ':build-tools', "org.elasticsearch:rest-api-spec:${version}": ':rest-api-spec', "org.elasticsearch:elasticsearch:${version}": ':server', - "org.elasticsearch:elasticsearch-cli:${version}": ':server:cli', + "org.elasticsearch:elasticsearch-cli:${version}": ':libs:cli', "org.elasticsearch:elasticsearch-core:${version}": ':libs:elasticsearch-core', "org.elasticsearch:elasticsearch-nio:${version}": ':libs:elasticsearch-nio', "org.elasticsearch:elasticsearch-x-content:${version}": ':libs:x-content', diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a5fe1cb94b9ee5ce57e6113458225bcba12d83e3..1948b9074f1016d15d505d185bc3f73deb82d8c8 100644 GIT binary patch delta 7399 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 Da{n=i delta 7286 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 Kp$_){$NV2Uh7M%_ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7962563f742fe..fdbd3758709dc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists distributionSha256Sum=203f4537da8b8075e38c036a6d14cb71b1149de5bf0a8f6db32ac2833a1d1294 diff --git a/server/cli/build.gradle b/libs/cli/build.gradle similarity index 100% rename from server/cli/build.gradle rename to libs/cli/build.gradle diff --git a/server/cli/licenses/jopt-simple-5.0.2.jar.sha1 b/libs/cli/licenses/jopt-simple-5.0.2.jar.sha1 similarity index 100% rename from server/cli/licenses/jopt-simple-5.0.2.jar.sha1 rename to libs/cli/licenses/jopt-simple-5.0.2.jar.sha1 diff --git a/server/cli/licenses/jopt-simple-LICENSE.txt b/libs/cli/licenses/jopt-simple-LICENSE.txt similarity index 100% rename from server/cli/licenses/jopt-simple-LICENSE.txt rename to libs/cli/licenses/jopt-simple-LICENSE.txt diff --git a/server/cli/licenses/jopt-simple-NOTICE.txt b/libs/cli/licenses/jopt-simple-NOTICE.txt similarity index 100% rename from server/cli/licenses/jopt-simple-NOTICE.txt rename to libs/cli/licenses/jopt-simple-NOTICE.txt diff --git a/server/cli/src/main/java/org/elasticsearch/cli/Command.java b/libs/cli/src/main/java/org/elasticsearch/cli/Command.java similarity index 100% rename from server/cli/src/main/java/org/elasticsearch/cli/Command.java rename to libs/cli/src/main/java/org/elasticsearch/cli/Command.java diff --git a/server/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java b/libs/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java similarity index 100% rename from server/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java rename to libs/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java diff --git a/server/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java b/libs/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java similarity index 99% rename from server/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java rename to libs/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java index 054a29e78a6cc..bcc75a2d1be12 100644 --- a/server/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java +++ b/libs/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java @@ -19,17 +19,15 @@ package org.elasticsearch.cli; -import java.io.Closeable; +import joptsimple.NonOptionArgumentSpec; +import joptsimple.OptionSet; +import org.elasticsearch.core.internal.io.IOUtils; + import java.io.IOException; import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; -import joptsimple.NonOptionArgumentSpec; -import joptsimple.OptionSet; - -import org.elasticsearch.core.internal.io.IOUtils; - /** * A cli tool which is made up of multiple subcommands. */ diff --git a/server/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java b/libs/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java similarity index 100% rename from server/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java rename to libs/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java diff --git a/server/cli/src/main/java/org/elasticsearch/cli/Terminal.java b/libs/cli/src/main/java/org/elasticsearch/cli/Terminal.java similarity index 100% rename from server/cli/src/main/java/org/elasticsearch/cli/Terminal.java rename to libs/cli/src/main/java/org/elasticsearch/cli/Terminal.java diff --git a/server/cli/src/main/java/org/elasticsearch/cli/UserException.java b/libs/cli/src/main/java/org/elasticsearch/cli/UserException.java similarity index 100% rename from server/cli/src/main/java/org/elasticsearch/cli/UserException.java rename to libs/cli/src/main/java/org/elasticsearch/cli/UserException.java From fc46118e1301f8deb56b52ca4913033429216583 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Thu, 7 Jun 2018 14:45:39 -0400 Subject: [PATCH 4/4] Revert "Move cli sub-project out of server to libs" This reverts commit dea7cea38a7781420b34f3049eac94ec24217dd2. --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 54413 -> 54329 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- {libs => server}/cli/build.gradle | 0 .../cli/licenses/jopt-simple-5.0.2.jar.sha1 | 0 .../cli/licenses/jopt-simple-LICENSE.txt | 0 .../cli/licenses/jopt-simple-NOTICE.txt | 0 .../java/org/elasticsearch/cli/Command.java | 0 .../java/org/elasticsearch/cli/ExitCodes.java | 0 .../org/elasticsearch/cli/MultiCommand.java | 10 ++++++---- .../elasticsearch/cli/SuppressForbidden.java | 0 .../java/org/elasticsearch/cli/Terminal.java | 0 .../org/elasticsearch/cli/UserException.java | 0 13 files changed, 9 insertions(+), 7 deletions(-) rename {libs => server}/cli/build.gradle (100%) rename {libs => server}/cli/licenses/jopt-simple-5.0.2.jar.sha1 (100%) rename {libs => server}/cli/licenses/jopt-simple-LICENSE.txt (100%) rename {libs => server}/cli/licenses/jopt-simple-NOTICE.txt (100%) rename {libs => server}/cli/src/main/java/org/elasticsearch/cli/Command.java (100%) rename {libs => server}/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java (100%) rename {libs => server}/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java (99%) rename {libs => server}/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java (100%) rename {libs => server}/cli/src/main/java/org/elasticsearch/cli/Terminal.java (100%) rename {libs => server}/cli/src/main/java/org/elasticsearch/cli/UserException.java (100%) diff --git a/build.gradle b/build.gradle index 4721a3520b8aa..620e043d1c081 100644 --- a/build.gradle +++ b/build.gradle @@ -205,7 +205,7 @@ subprojects { "org.elasticsearch.gradle:build-tools:${version}": ':build-tools', "org.elasticsearch:rest-api-spec:${version}": ':rest-api-spec', "org.elasticsearch:elasticsearch:${version}": ':server', - "org.elasticsearch:elasticsearch-cli:${version}": ':libs:cli', + "org.elasticsearch:elasticsearch-cli:${version}": ':server:cli', "org.elasticsearch:elasticsearch-core:${version}": ':libs:elasticsearch-core', "org.elasticsearch:elasticsearch-nio:${version}": ':libs:elasticsearch-nio', "org.elasticsearch:elasticsearch-x-content:${version}": ':libs:x-content', diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1948b9074f1016d15d505d185bc3f73deb82d8c8..a5fe1cb94b9ee5ce57e6113458225bcba12d83e3 100644 GIT binary patch delta 7286 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 Kp$_){$NV2Uh7M%_ delta 7399 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 Da{n=i diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fdbd3758709dc..7962563f742fe 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ +distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME distributionSha256Sum=203f4537da8b8075e38c036a6d14cb71b1149de5bf0a8f6db32ac2833a1d1294 diff --git a/libs/cli/build.gradle b/server/cli/build.gradle similarity index 100% rename from libs/cli/build.gradle rename to server/cli/build.gradle diff --git a/libs/cli/licenses/jopt-simple-5.0.2.jar.sha1 b/server/cli/licenses/jopt-simple-5.0.2.jar.sha1 similarity index 100% rename from libs/cli/licenses/jopt-simple-5.0.2.jar.sha1 rename to server/cli/licenses/jopt-simple-5.0.2.jar.sha1 diff --git a/libs/cli/licenses/jopt-simple-LICENSE.txt b/server/cli/licenses/jopt-simple-LICENSE.txt similarity index 100% rename from libs/cli/licenses/jopt-simple-LICENSE.txt rename to server/cli/licenses/jopt-simple-LICENSE.txt diff --git a/libs/cli/licenses/jopt-simple-NOTICE.txt b/server/cli/licenses/jopt-simple-NOTICE.txt similarity index 100% rename from libs/cli/licenses/jopt-simple-NOTICE.txt rename to server/cli/licenses/jopt-simple-NOTICE.txt diff --git a/libs/cli/src/main/java/org/elasticsearch/cli/Command.java b/server/cli/src/main/java/org/elasticsearch/cli/Command.java similarity index 100% rename from libs/cli/src/main/java/org/elasticsearch/cli/Command.java rename to server/cli/src/main/java/org/elasticsearch/cli/Command.java diff --git a/libs/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java b/server/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java similarity index 100% rename from libs/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java rename to server/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java diff --git a/libs/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java b/server/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java similarity index 99% rename from libs/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java rename to server/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java index bcc75a2d1be12..054a29e78a6cc 100644 --- a/libs/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java +++ b/server/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java @@ -19,15 +19,17 @@ package org.elasticsearch.cli; -import joptsimple.NonOptionArgumentSpec; -import joptsimple.OptionSet; -import org.elasticsearch.core.internal.io.IOUtils; - +import java.io.Closeable; import java.io.IOException; import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; +import joptsimple.NonOptionArgumentSpec; +import joptsimple.OptionSet; + +import org.elasticsearch.core.internal.io.IOUtils; + /** * A cli tool which is made up of multiple subcommands. */ diff --git a/libs/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java b/server/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java similarity index 100% rename from libs/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java rename to server/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java diff --git a/libs/cli/src/main/java/org/elasticsearch/cli/Terminal.java b/server/cli/src/main/java/org/elasticsearch/cli/Terminal.java similarity index 100% rename from libs/cli/src/main/java/org/elasticsearch/cli/Terminal.java rename to server/cli/src/main/java/org/elasticsearch/cli/Terminal.java diff --git a/libs/cli/src/main/java/org/elasticsearch/cli/UserException.java b/server/cli/src/main/java/org/elasticsearch/cli/UserException.java similarity index 100% rename from libs/cli/src/main/java/org/elasticsearch/cli/UserException.java rename to server/cli/src/main/java/org/elasticsearch/cli/UserException.java