diff --git a/plugins/ingest/build.gradle b/plugins/ingest/build.gradle index 383ad6c88fa..2e5aede319f 100644 --- a/plugins/ingest/build.gradle +++ b/plugins/ingest/build.gradle @@ -27,11 +27,11 @@ dependencies { // joni dependencies: compile 'org.jruby.jcodings:jcodings:1.0.12' - compile ('com.maxmind.geoip2:geoip2:2.3.1') + compile ('com.maxmind.geoip2:geoip2:2.4.0') // geoip2 dependencies: compile('com.fasterxml.jackson.core:jackson-annotations:2.5.0') compile('com.fasterxml.jackson.core:jackson-databind:2.5.3') - compile('com.maxmind.db:maxmind-db:1.0.0') + compile('com.maxmind.db:maxmind-db:1.0.1') compile 'joda-time:joda-time:2.8.2' testCompile 'org.elasticsearch:geolite2-databases:20151029' @@ -63,5 +63,6 @@ bundlePlugin { } } -//geoip depends on asm and google http client which we don't need +//geoip WebServiceClient needs Google http client, but we're not using WebServiceClient and +// joni has AsmCompilerSupport, but that isn't being used: thirdPartyAudit.missingClasses = true diff --git a/plugins/ingest/licenses/geoip2-2.3.1.jar.sha1 b/plugins/ingest/licenses/geoip2-2.3.1.jar.sha1 deleted file mode 100644 index cb1982ffef5..00000000000 --- a/plugins/ingest/licenses/geoip2-2.3.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0b128448f5bcfafb6caa82ae079ab39aa56dafb4 diff --git a/plugins/ingest/licenses/geoip2-2.4.0.jar.sha1 b/plugins/ingest/licenses/geoip2-2.4.0.jar.sha1 new file mode 100644 index 00000000000..485286f06a4 --- /dev/null +++ b/plugins/ingest/licenses/geoip2-2.4.0.jar.sha1 @@ -0,0 +1 @@ +ad40667ae87138e0aed075d2c15884497fa64acc \ No newline at end of file diff --git a/plugins/ingest/licenses/maxmind-db-1.0.0.jar.sha1 b/plugins/ingest/licenses/maxmind-db-1.0.0.jar.sha1 deleted file mode 100644 index 4437d02a227..00000000000 --- a/plugins/ingest/licenses/maxmind-db-1.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b140295a52005aaf224b6c711ad4ecb38b1da155 diff --git a/plugins/ingest/licenses/maxmind-db-1.0.1.jar.sha1 b/plugins/ingest/licenses/maxmind-db-1.0.1.jar.sha1 new file mode 100644 index 00000000000..6cb749e35ae --- /dev/null +++ b/plugins/ingest/licenses/maxmind-db-1.0.1.jar.sha1 @@ -0,0 +1 @@ +305429b84dbcd1cc3d393686f412cdcaec9cdbe6 \ No newline at end of file diff --git a/plugins/ingest/src/main/plugin-metadata/plugin-security.policy b/plugins/ingest/src/main/plugin-metadata/plugin-security.policy index dadb2acd640..f49d15d5521 100644 --- a/plugins/ingest/src/main/plugin-metadata/plugin-security.policy +++ b/plugins/ingest/src/main/plugin-metadata/plugin-security.policy @@ -18,8 +18,6 @@ */ grant { - // needed because geoip2 is using reflection to deserialize data into its own domain classes - permission java.lang.reflect.ReflectPermission "suppressAccessChecks"; // needed because jackson-databind is using Class#getDeclaredConstructors(), Class#getDeclaredMethods() and // Class#getDeclaredAnnotations() to find all public, private, protected, package protected and // private constructors, methods or annotations. Just locating all public constructors, methods and annotations