Upgrade geoip2 dependency (#93522)

elastic · Feb 7, 2023 · ea17a19 · ea17a19
1 parent 134f51b
commit ea17a19
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 28 deletions.
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -229,11 +229,6 @@
             <sha256 value="5ad94fbb2642df695892c4d6e2ab4c319821e5f9bfb7b920f1378de4f611417c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.13.1">
-         <artifact name="jackson-annotations-2.13.1.jar">
-            <sha256 value="ab607939d288e22bff4cb97acc6b25e841d82681f2bc40ce67bb35cb0ffdb06d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.13.2">
          <artifact name="jackson-annotations-2.13.2.jar">
             <sha256 value="7d3df5aafa2dc61ad1dbad30f411548c0184ed92d94628c63168721f08237cd4" origin="Generated by Gradle"/>
@@ -249,6 +244,11 @@
             <sha256 value="ac5b27a634942391ca113850ee7db01df1499a240174021263501c05fc653b44" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.14.2">
+         <artifact name="jackson-annotations-2.14.2.jar">
+            <sha256 value="2c6869d505cf60dc066734b7d50339f975bd3adc635e26a78abb71acb4473c0d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson.core" name="jackson-core" version="2.10.5">
          <artifact name="jackson-core-2.10.5.jar">
             <sha256 value="2656010d1e921ac69b76fc7e0c0f5a6b14aca62fa9603e78831e6148eb7c77ba" origin="Generated by Gradle"/>
@@ -284,21 +284,11 @@
             <sha256 value="f93db83891a53e8d268e2cc8fcd88ead2981edc2163e35c2a52c88d9ab57b4a0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.13.1">
-         <artifact name="jackson-databind-2.13.1.jar">
-            <sha256 value="56cfbdc9e1736b5c56b43757f6cf546ee6d49393c79383c4e495c4f7047cb506" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.13.2">
          <artifact name="jackson-databind-2.13.2.jar">
             <sha256 value="0d5459b7f18184c4ce8f07264b1b7feced51529e550a098d6f9e2dfe091138ad" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.13.2.2">
-         <artifact name="jackson-databind-2.13.2.2.jar">
-            <sha256 value="efb86b148712a838b94b3cfc95769785a116b3461f709b4cc510055a58b804b2" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.13.3">
          <artifact name="jackson-databind-2.13.3.jar">
             <sha256 value="6444bf08d8cd4629740afc3db1276938f494728deb663ce585c4e91f6b45eb84" origin="Generated by Gradle"/>
@@ -309,6 +299,11 @@
             <sha256 value="ba1a368137f9b92f48dd07f299ff7a782a69487b853ef5578215426fcde8f08b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.14.2">
+         <artifact name="jackson-databind-2.14.2.jar">
+            <sha256 value="501d3abce4d18dcc381058ec593c5b94477906bba6efbac14dae40a642f77424" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-cbor" version="2.13.2">
          <artifact name="jackson-dataformat-cbor-2.13.2.jar">
             <sha256 value="bc2055d3c199f47b425ac527f895152b80174b43c53a9cf13a818df692a3f91e" origin="Generated by Gradle"/>
@@ -824,14 +819,14 @@
             <sha256 value="f8f5c726c8c615a94d9d6cd1073787f9c554841ae24c8bab5cd73481ea2021a8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.maxmind.db" name="maxmind-db" version="2.1.0">
-         <artifact name="maxmind-db-2.1.0.jar">
-            <sha256 value="04a7281ddb9f96ab9eacacbe35bb4c8583a8369973d8883acf5faae91f851572" origin="Generated by Gradle"/>
+      <component group="com.maxmind.db" name="maxmind-db" version="3.0.0">
+         <artifact name="maxmind-db-3.0.0.jar">
+            <sha256 value="4d783d30abc7c8adb3580faa3f76c33af9ecb5b0fc1c3d83b204df3fbb6725c2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.maxmind.geoip2" name="geoip2" version="3.0.2">
-         <artifact name="geoip2-3.0.2.jar">
-            <sha256 value="a02a34fafccc4b1aca85cf725f97f9bba18910992b6588e26d4d412358c1e597" origin="Generated by Gradle"/>
+      <component group="com.maxmind.geoip2" name="geoip2" version="4.0.0">
+         <artifact name="geoip2-4.0.0.jar">
+            <sha256 value="b73aa72fbaf6fa6376a6c12f8976631b5bb183027695fac665eab5082b1a67f7" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.microsoft.azure" name="azure-core" version="0.9.3">

diff --git 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
@@ -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
@@ -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;