From 80e48bbcdeb4ce46d5d1b522a5b771ea51f5dffa Mon Sep 17 00:00:00 2001 From: Luca Cavanna Date: Tue, 1 May 2018 09:33:17 +0200 Subject: [PATCH] Remove animal sniffer from REST client sniffer (#30260) Animal sniffer is no longer needed, we can remove it for sniffer like we did for the low-level REST client with #29646 --- client/sniffer/build.gradle | 3 --- .../client/sniff/ElasticsearchHostsSnifferTests.java | 2 -- 2 files changed, 5 deletions(-) diff --git a/client/sniffer/build.gradle b/client/sniffer/build.gradle index 03e4a082d27..e226656dbd2 100644 --- a/client/sniffer/build.gradle +++ b/client/sniffer/build.gradle @@ -20,7 +20,6 @@ import org.elasticsearch.gradle.precommit.PrecommitTasks apply plugin: 'elasticsearch.build' -apply plugin: 'ru.vyarus.animalsniffer' apply plugin: 'nebula.maven-base-publish' apply plugin: 'nebula.maven-scm' @@ -52,8 +51,6 @@ dependencies { testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}" testCompile "org.elasticsearch:securemock:${versions.securemock}" testCompile "org.elasticsearch:mocksocket:${versions.mocksocket}" - testCompile "org.codehaus.mojo:animal-sniffer-annotations:1.15" - signature "org.codehaus.mojo.signature:java17:1.0@signature" } forbiddenApisMain { 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 483b7df62f9..f13d1751104 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 @@ -60,8 +60,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -//animal-sniffer doesn't like our usage of com.sun.net.httpserver.* classes -@IgnoreJRERequirement public class ElasticsearchHostsSnifferTests extends RestClientTestCase { private int sniffRequestTimeout;