Included webarchive-commons dependency at compile time.

netarchivesuite · Aug 11, 2021 · 8d8ffd4 · 8d8ffd4
1 parent ea179c1
commit 8d8ffd4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/harvester/heritrix3/heritrix3-bundler/src/main/assembly/distribution.xml b/harvester/heritrix3/heritrix3-bundler/src/main/assembly/distribution.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
     <id>heritrix3-dist</id>
 
     <formats>
@@ -20,16 +20,17 @@
             <unpack>true</unpack>
             <unpackOptions>
                 <excludes>
-                  <exclude>*/lib/ant*</exclude>
-                  <exclude>*/lib/ant*.jar</exclude>
-                  <exclude>*/lib/oro-2.0.8.LICENSE</exclude>
-                  <exclude>*/lib/junit-*.jar</exclude>
-                  <exclude>*/lib/junit.*</exclude>
-                  <!-- Removing duplicates. -->
-                  <exclude>*/lib/webarchive-commons-1.1.4.jar</exclude>
-                  <!--exclude>*/lib/commons-configuration-1.6.jar</exclude-->
-                  <!--exclude>*/lib/httpclient-4.2.5.jar</exclude-->
-                  <!--exclude>*/lib/httpcore-4.2.4.jar</exclude-->
+                    <exclude>*/lib/ant*</exclude>
+                    <exclude>*/lib/ant*.jar</exclude>
+                    <exclude>*/lib/oro-2.0.8.LICENSE</exclude>
+                    <exclude>*/lib/junit-*.jar</exclude>
+                    <exclude>*/lib/junit.*</exclude>
+                    <!-- Removing duplicates. -->
+                    <exclude>*/lib/webarchive-commons-1.1.4.jar</exclude>
+                    <exclude>*/lib/webarchive-commons-1.1.5.jar</exclude>
+                    <!--exclude>*/lib/commons-configuration-1.6.jar</exclude-->
+                    <!--exclude>*/lib/httpclient-4.2.5.jar</exclude-->
+                    <!--exclude>*/lib/httpcore-4.2.4.jar</exclude-->
                 </excludes>
             </unpackOptions>
             <outputDirectory>/</outputDirectory>
@@ -108,15 +109,15 @@
                 <exclude>org.apache.httpcomponents:httpclient:jar:4.5.12</exclude>
                 <exclude>com.sleepycat:je:jar:5.0.73</exclude>
             </excludes>
-<!--3.3.0-LBS-2014-03-->
+            <!--3.3.0-LBS-2014-03-->
             <outputDirectory>/heritrix-${heritrix3.version}/lib/</outputDirectory>
         </dependencySet>
     </dependencySets>
 
     <fileSets>
         <fileSet>
             <directory>${basedir}/src/main/resources/</directory>
-<!--3.3.0-LBS-2014-03-->
+            <!--3.3.0-LBS-2014-03-->
             <outputDirectory>/heritrix-${heritrix3.version}</outputDirectory>
         </fileSet>
     </fileSets>

diff --git a/harvester/heritrix3/heritrix3-extensions/pom.xml b/harvester/heritrix3/heritrix3-extensions/pom.xml
@@ -87,6 +87,12 @@
       </exclusions>
     </dependency>
 
+    <dependency>
+      <groupId>org.netpreserve.commons</groupId>
+      <artifactId>webarchive-commons</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.archive.heritrix</groupId>
       <artifactId>heritrix-contrib</artifactId>