Prechádzať zdrojové kódy

ingest: upgraded ingest geoip's geoip2's dependencies.

Martijn van Groningen 7 rokov pred
rodič
commit
90ee35930a

+ 5 - 4
plugins/ingest-geoip/build.gradle

@@ -23,11 +23,12 @@ esplugin {
 }
 
 dependencies {
-  compile ('com.maxmind.geoip2:geoip2:2.8.0')
+  // Upgrade to 2.10.0 or higher when jackson-core gets upgraded to 2.9.x
+  compile ('com.maxmind.geoip2:geoip2:2.9.0')
   // geoip2 dependencies:
-  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')
+  compile("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
+  compile("com.fasterxml.jackson.core:jackson-databind:${versions.jackson}")
+  compile('com.maxmind.db:maxmind-db:1.2.2')
 
   testCompile 'org.elasticsearch:geolite2-databases:20171206'
 }

+ 0 - 1
plugins/ingest-geoip/licenses/geoip2-2.8.0.jar.sha1

@@ -1 +0,0 @@
-46226778ec32b776e80f282c5bf65b88d36cc0a0

+ 1 - 0
plugins/ingest-geoip/licenses/geoip2-2.9.0.jar.sha1

@@ -0,0 +1 @@
+c12b463a2c10824225c0b27952c49b464cb0e4c6

+ 1 - 0
plugins/ingest-geoip/licenses/jackson-annotations-2.8.10.jar.sha1

@@ -0,0 +1 @@
+5e924646d6f893bc9036939c5f2b4ecaee85e5da

+ 0 - 1
plugins/ingest-geoip/licenses/jackson-annotations-2.8.2.jar.sha1

@@ -1 +0,0 @@
-a38d544583e90cf163b2e45e4a57f5c54de670d3

+ 1 - 0
plugins/ingest-geoip/licenses/jackson-databind-2.8.10.jar.sha1

@@ -0,0 +1 @@
+f7b83cb2bc4b88d53961e749e1ad32f49ef017b7

+ 0 - 1
plugins/ingest-geoip/licenses/jackson-databind-2.8.2.jar.sha1

@@ -1 +0,0 @@
-1f12816593c1422be957471c98a80bfbace60fa2

+ 0 - 1
plugins/ingest-geoip/licenses/maxmind-db-1.2.1.jar.sha1

@@ -1 +0,0 @@
-64b6b6a8c162fc9b0004fcdf9641cf1b408ffa33

+ 1 - 0
plugins/ingest-geoip/licenses/maxmind-db-1.2.2.jar.sha1

@@ -0,0 +1 @@
+78c22a03de1e222b0751855aff7bb6e6db5569e5

+ 2 - 0
plugins/ingest-geoip/src/main/plugin-metadata/plugin-security.policy

@@ -24,4 +24,6 @@ grant {
   // should be enough, so this permission wouldn't then be needed. Unfortunately this is not what jackson-databind does
   // or can be configured to do.
   permission java.lang.RuntimePermission "accessDeclaredMembers";
+  // Also needed because of jackson-databind:
+  permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
 };