WIP NUTCH-3064 Upgrade com.maxmind.geoip2:geoip2 dependency in geoip-index to v4.2.0

build.xml

@@ -1180,6 +1180,7 @@
         <source path="${plugins.dir}/index-basic/src/java/" />
         <source path="${plugins.dir}/index-basic/src/test/" />
         <source path="${plugins.dir}/index-geoip/src/java/" />
+        <source path="${plugins.dir}/index-geoip/src/test/" />
         <source path="${plugins.dir}/index-jexl-filter/src/java/" />
         <source path="${plugins.dir}/index-jexl-filter/src/test/" />
         <source path="${plugins.dir}/index-links/src/java/" />

conf/nutch-default.xml

@@ -2206,15 +2206,25 @@ CAUTION: Set the parser.timeout to -1 or a bigger value than 30, when using this
 <!-- index-geoip plugin properties -->
 <property>
   <name>index.geoip.usage</name>
-  <value>insightsService</value>
+  <value></value>
   <description>
+  To use the geoip-plugin you must set 'store.ip.address' to true.
   A string representing the information source to be used for GeoIP information
-  association. Either enter 'cityDatabase', 'connectionTypeDatabase',
-  'domainDatabase', 'ispDatabase' or 'insightsService'. If you wish to use any one of the
-  Database options, you should make one of GeoIP2-City.mmdb, GeoIP2-Connection-Type.mmdb,
-  GeoIP2-Domain.mmdb or GeoIP2-ISP.mmdb files respectively available on the classpath and
-  available at runtime. Alternatively, also the GeoLite2 IP databases (GeoLite2-*.mmdb)
-  can be used.
+  lookup. Options are 'anonymous', 'asn', 'city', 'connection', 'domain', 
+  'insights' or 'isp'.
+  If you wish to use any one of the Database options, you should make the relevant  
+  *.mmdb file(s) available on the Hadoop classpath and available at runtime. 
+  This can be achieved by adding it to `$NUTCH_HOME/conf`.
+  </description>
+</property>
+
+<property>
+  <name>index.geoip.db.file</name>
+  <value></value>
+  <description>
+  The GeoIP2 or GeoLite2 database file in the MMDB format. More information available at 
+  https://support.maxmind.com/hc/en-us/articles/4408216157723-Database-Formats
+  This file must be available on the Hadoop classpath.
   </description>
 </property>
 

src/plugin/build.xml

@@ -120,7 +120,7 @@
      <ant dir="index-anchor" target="test"/>
      <ant dir="index-arbitrary" target="test"/>
      <ant dir="index-basic" target="test"/>
-     <!--ant dir="index-geoip" target="test"/-->
+     <ant dir="index-geoip" target="test"/>
      <ant dir="index-jexl-filter" target="test"/>
      <ant dir="index-links" target="test"/>
      <ant dir="index-more" target="test"/>

src/plugin/index-geoip/ivy.xml

@@ -37,7 +37,7 @@
   </publications>
 
   <dependencies>
-    <dependency org="com.maxmind.geoip2" name="geoip2" rev="3.0.1">
+    <dependency org="com.maxmind.geoip2" name="geoip2" rev="4.2.0">
       <!-- Exlude libs provided in Nutch core -->
       <exclude org="com.fasterxml.jackson.core" name="jackson-annotations" />
       <exclude org="com.fasterxml.jackson.core" name="jackson-databind" />

src/plugin/index-geoip/plugin.xml

@@ -26,8 +26,8 @@
       <library name="index-geoip.jar">
          <export name="*"/>
       </library>
-      <library name="geoip2-3.0.1.jar"/>
-      <library name="maxmind-db-2.0.0.jar"/>
+      <library name="geoip2-4.2.0.jar"/>
+      <library name="maxmind-db-3.1.0.jar"/>
    </runtime>
 
    <requires>