Attempt to auto-detect heritrix version

netarchivesuite · Aug 10, 2021 · 63321f1 · 63321f1
1 parent ea179c1
commit 63321f1
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/common/common-core/pom.xml b/common/common-core/pom.xml
@@ -285,6 +285,11 @@
       <artifactId>webarchive-commons</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.archive.heritrix</groupId>
+      <artifactId>heritrix-commons</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-client</artifactId>

diff --git a/common/common-core/src/main/java/dk/netarkivet/common/Constants.java b/common/common-core/src/main/java/dk/netarkivet/common/Constants.java
@@ -22,7 +22,9 @@
  */
 package dk.netarkivet.common;
 
+import java.io.InputStream;
 import java.text.SimpleDateFormat;
+import java.util.Properties;
 import java.util.regex.Pattern;
 
 import org.apache.lucene.util.Version;
@@ -166,6 +168,29 @@ public static SimpleDateFormat getIsoDateFormatter() {
     public static final String PROJECT_WEBSITE = "https://sbforge.org/display/NAS";
 
     public static String getHeritrix3VersionString() {
-        return HERITRIX3_VERSION;
+        String h3version = null;
+        try {
+            Properties p = new Properties();
+            InputStream is = Constants.class.getResourceAsStream("/META-INF/maven/org.archive.heritrix/heritrix-commons/pom.properties");
+            if (is != null) {
+                p.load(is);
+                h3version = p.getProperty("version", "");
+            }
+        } catch (Exception e) {
+            // ignore
+        }
+        if (h3version == null) {
+            Package aPackage = org.archive.util.UriUtils.class.getPackage();
+            if (aPackage != null) {
+                h3version = aPackage.getImplementationVersion();
+                if (h3version == null) {
+                    h3version = aPackage.getSpecificationVersion();
+                }
+            }
+        }
+        if (h3version == null) {
+            h3version = "unknownHeritrixVersion";
+        }
+        return h3version;
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -465,6 +465,12 @@
         <version>${heritrix3.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.archive.heritrix</groupId>
+        <artifactId>heritrix-commons</artifactId>
+        <version>${heritrix3.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>org.archive.heritrix</groupId>
         <artifactId>heritrix</artifactId>