ingest: Upgrade geoip2 dependency

Closes #20563
This commit is contained in:
Martijn van Groningen 2016-09-30 15:24:26 +02:00 committed by Simon Willnauer
parent d7dca15970
commit 0c7860f533
7 changed files with 21 additions and 16 deletions

View File

@ -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'
]

View File

@ -1 +0,0 @@
2010d922191f5801939b462a5703ab79a7829626

View File

@ -0,0 +1 @@
46226778ec32b776e80f282c5bf65b88d36cc0a0

View File

@ -1 +0,0 @@
8b93f301823b79033fcbe873779b3d84f9730fc1

View File

@ -0,0 +1 @@
a38d544583e90cf163b2e45e4a57f5c54de670d3

View File

@ -1 +0,0 @@
14d88822bca655de7aa6ed3e4c498d115505710a

View File

@ -0,0 +1 @@
1f12816593c1422be957471c98a80bfbace60fa2