Merge branch 'pr/16837'
This commit is contained in:
commit
b1f40e0013
|
@ -23,11 +23,11 @@ esplugin {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile ('com.maxmind.geoip2:geoip2:2.4.0')
|
compile ('com.maxmind.geoip2:geoip2:2.6.0')
|
||||||
// geoip2 dependencies:
|
// geoip2 dependencies:
|
||||||
compile('com.fasterxml.jackson.core:jackson-annotations:2.5.0')
|
compile('com.fasterxml.jackson.core:jackson-annotations:2.7.1')
|
||||||
compile('com.fasterxml.jackson.core:jackson-databind:2.5.3')
|
compile('com.fasterxml.jackson.core:jackson-databind:2.7.1')
|
||||||
compile('com.maxmind.db:maxmind-db:1.0.1')
|
compile('com.maxmind.db:maxmind-db:1.2.0')
|
||||||
|
|
||||||
testCompile 'org.elasticsearch:geolite2-databases:20151029'
|
testCompile 'org.elasticsearch:geolite2-databases:20151029'
|
||||||
}
|
}
|
||||||
|
@ -60,4 +60,4 @@ thirdPartyAudit.excludes = [
|
||||||
'com.google.api.client.http.HttpResponseException',
|
'com.google.api.client.http.HttpResponseException',
|
||||||
'com.google.api.client.http.javanet.NetHttpTransport',
|
'com.google.api.client.http.javanet.NetHttpTransport',
|
||||||
'com.google.api.client.http.javanet.NetHttpTransport',
|
'com.google.api.client.http.javanet.NetHttpTransport',
|
||||||
]
|
]
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
ad40667ae87138e0aed075d2c15884497fa64acc
|
|
|
@ -0,0 +1 @@
|
||||||
|
2574c8b878f1cd39709559f1b96f1b5f0cdd69d3
|
|
@ -1 +0,0 @@
|
||||||
a2a55a3375bc1cef830ca426d68d2ea22961190e
|
|
|
@ -0,0 +1 @@
|
||||||
|
8b93f301823b79033fcbe873779b3d84f9730fc1
|
|
@ -1 +0,0 @@
|
||||||
c37875ff66127d93e5f672708cb2dcc14c8232ab
|
|
|
@ -0,0 +1 @@
|
||||||
|
14d88822bca655de7aa6ed3e4c498d115505710a
|
|
@ -1 +0,0 @@
|
||||||
305429b84dbcd1cc3d393686f412cdcaec9cdbe6
|
|
|
@ -0,0 +1 @@
|
||||||
|
b842823f24555f5d26608fef8122898365b3cd63
|
Loading…
Reference in New Issue