diff --git a/plugins/ingest-geoip/build.gradle b/plugins/ingest-geoip/build.gradle index d9e90a61d40..e74a27844db 100644 --- a/plugins/ingest-geoip/build.gradle +++ b/plugins/ingest-geoip/build.gradle @@ -23,10 +23,10 @@ esplugin { } dependencies { - compile ('com.maxmind.geoip2:geoip2:2.7.0') + compile ('com.maxmind.geoip2:geoip2:2.8.0') // geoip2 dependencies: - compile('com.fasterxml.jackson.core:jackson-annotations:2.7.1') - compile('com.fasterxml.jackson.core:jackson-databind:2.7.1') + compile('com.fasterxml.jackson.core:jackson-annotations:2.8.2') + compile('com.fasterxml.jackson.core:jackson-databind:2.8.2') compile('com.maxmind.db:maxmind-db:1.2.1') testCompile 'org.elasticsearch:geolite2-databases:20160608' @@ -50,14 +50,19 @@ bundlePlugin { } thirdPartyAudit.excludes = [ - // geoip WebServiceClient needs Google http client, but we're not using WebServiceClient: - 'com.google.api.client.http.HttpTransport', - 'com.google.api.client.http.GenericUrl', - 'com.google.api.client.http.HttpResponse', - 'com.google.api.client.http.HttpRequestFactory', - 'com.google.api.client.http.HttpRequest', - 'com.google.api.client.http.HttpHeaders', - 'com.google.api.client.http.HttpResponseException', - 'com.google.api.client.http.javanet.NetHttpTransport', - 'com.google.api.client.http.javanet.NetHttpTransport', + // geoip WebServiceClient needs apache http client, but we're not using WebServiceClient: + 'org.apache.http.HttpEntity', + 'org.apache.http.HttpHost', + 'org.apache.http.HttpResponse', + 'org.apache.http.StatusLine', + 'org.apache.http.auth.UsernamePasswordCredentials', + 'org.apache.http.client.config.RequestConfig$Builder', + 'org.apache.http.client.config.RequestConfig', + 'org.apache.http.client.methods.CloseableHttpResponse', + 'org.apache.http.client.methods.HttpGet', + 'org.apache.http.client.utils.URIBuilder', + 'org.apache.http.impl.auth.BasicScheme', + 'org.apache.http.impl.client.CloseableHttpClient', + 'org.apache.http.impl.client.HttpClientBuilder', + 'org.apache.http.util.EntityUtils' ] diff --git a/plugins/ingest-geoip/licenses/geoip2-2.7.0.jar.sha1 b/plugins/ingest-geoip/licenses/geoip2-2.7.0.jar.sha1 deleted file mode 100644 index 2015e311d60..00000000000 --- a/plugins/ingest-geoip/licenses/geoip2-2.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2010d922191f5801939b462a5703ab79a7829626 \ No newline at end of file diff --git a/plugins/ingest-geoip/licenses/geoip2-2.8.0.jar.sha1 b/plugins/ingest-geoip/licenses/geoip2-2.8.0.jar.sha1 new file mode 100644 index 00000000000..c6036686601 --- /dev/null +++ b/plugins/ingest-geoip/licenses/geoip2-2.8.0.jar.sha1 @@ -0,0 +1 @@ +46226778ec32b776e80f282c5bf65b88d36cc0a0 \ No newline at end of file diff --git a/plugins/ingest-geoip/licenses/jackson-annotations-2.7.1.jar.sha1 b/plugins/ingest-geoip/licenses/jackson-annotations-2.7.1.jar.sha1 deleted file mode 100644 index 69b45742d84..00000000000 --- a/plugins/ingest-geoip/licenses/jackson-annotations-2.7.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8b93f301823b79033fcbe873779b3d84f9730fc1 \ No newline at end of file diff --git a/plugins/ingest-geoip/licenses/jackson-annotations-2.8.2.jar.sha1 b/plugins/ingest-geoip/licenses/jackson-annotations-2.8.2.jar.sha1 new file mode 100644 index 00000000000..c3b701dbb86 --- /dev/null +++ b/plugins/ingest-geoip/licenses/jackson-annotations-2.8.2.jar.sha1 @@ -0,0 +1 @@ +a38d544583e90cf163b2e45e4a57f5c54de670d3 \ No newline at end of file diff --git a/plugins/ingest-geoip/licenses/jackson-databind-2.7.1.jar.sha1 b/plugins/ingest-geoip/licenses/jackson-databind-2.7.1.jar.sha1 deleted file mode 100644 index d9b4ca6a79b..00000000000 --- a/plugins/ingest-geoip/licenses/jackson-databind-2.7.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -14d88822bca655de7aa6ed3e4c498d115505710a \ No newline at end of file diff --git a/plugins/ingest-geoip/licenses/jackson-databind-2.8.2.jar.sha1 b/plugins/ingest-geoip/licenses/jackson-databind-2.8.2.jar.sha1 new file mode 100644 index 00000000000..7e90b5f8e97 --- /dev/null +++ b/plugins/ingest-geoip/licenses/jackson-databind-2.8.2.jar.sha1 @@ -0,0 +1 @@ +1f12816593c1422be957471c98a80bfbace60fa2 \ No newline at end of file