diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 678fad682dfa9..437534a5021a3 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -229,11 +229,6 @@ - - - - - @@ -249,6 +244,11 @@ + + + + + @@ -284,21 +284,11 @@ - - - - - - - - - - @@ -309,6 +299,11 @@ + + + + + @@ -824,14 +819,14 @@ - - - + + + - - - + + + diff --git a/modules/ingest-geoip/build.gradle b/modules/ingest-geoip/build.gradle index 282d4a6059234..ad5e28646b88f 100644 --- a/modules/ingest-geoip/build.gradle +++ b/modules/ingest-geoip/build.gradle @@ -27,12 +27,12 @@ tasks.named('internalClusterTestTestingConventions').configure { } dependencies { - implementation('com.maxmind.geoip2:geoip2:3.0.2') + implementation('com.maxmind.geoip2:geoip2:4.0.0') // geoip2 dependencies: - runtimeOnly("com.fasterxml.jackson.core:jackson-annotations:2.13.4") - runtimeOnly("com.fasterxml.jackson.core:jackson-databind:2.13.4.2") - runtimeOnly("com.fasterxml.jackson.core:jackson-core:2.13.4") - implementation('com.maxmind.db:maxmind-db:2.1.0') + runtimeOnly("com.fasterxml.jackson.core:jackson-annotations:2.14.2") + runtimeOnly("com.fasterxml.jackson.core:jackson-databind:2.14.2") + runtimeOnly("com.fasterxml.jackson.core:jackson-core:2.14.2") + implementation('com.maxmind.db:maxmind-db:3.0.0') testImplementation 'org.elasticsearch:geolite2-databases:20191119' internalClusterTestImplementation project(path: ":modules:reindex") diff --git a/modules/ingest-geoip/src/main/java/module-info.java b/modules/ingest-geoip/src/main/java/module-info.java index 08f12becdf883..fa0b0266414f0 100644 --- a/modules/ingest-geoip/src/main/java/module-info.java +++ b/modules/ingest-geoip/src/main/java/module-info.java @@ -12,8 +12,8 @@ requires org.elasticsearch.xcontent; requires org.apache.logging.log4j; requires org.apache.lucene.core; - requires geoip2; - requires maxmind.db; + requires com.maxmind.geoip2; + requires com.maxmind.db; exports org.elasticsearch.ingest.geoip.stats to org.elasticsearch.server; } diff --git a/server/src/main/java/module-info.java b/server/src/main/java/module-info.java index cc3c71228a91a..51706347a38d8 100644 --- a/server/src/main/java/module-info.java +++ b/server/src/main/java/module-info.java @@ -15,6 +15,7 @@ requires java.sql; requires java.management; requires jdk.unsupported; + requires java.net.http; // required by ingest-geoip's dependency maxmind.geoip2 https://github.com/elastic/elasticsearch/issues/93553 requires org.elasticsearch.cli; requires org.elasticsearch.base;