Merge pull request #176 from daveneiman/mavenize

Convert project build from Ant to Maven
harvard-lts · Jun 6, 2018 · a438c51 · a438c51
2 parents a0f92e2 + 6e4eedf
commit a438c51
Show file tree

Hide file tree

Showing 199 changed files with 1,020 additions and 964 deletions.
diff --git a/.classpath b/.classpath
@@ -1,67 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="xml/nlnz"/>
-	<classpathentry kind="src" path="tests"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib-ant/junit-4.11.jar"/>
-	<classpathentry kind="lib" path="lib-ant/xmlunit-1.6.jar"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="lib" path="lib/serializer.jar"/>
 	<classpathentry kind="lib" path="lib/jhove/jhove-core-1.20.1.jar"/>
 	<classpathentry kind="lib" path="lib/jhove/jhove-modules-1.20.1.jar"/>
-	<classpathentry kind="lib" path="lib/jdom.jar"/>
-	<classpathentry kind="lib" path="lib/saxpath.jar"/>
-	<classpathentry kind="lib" path="lib/fast-md5.jar"/>
-	<classpathentry kind="lib" path="lib/commons-cli-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/jaxen-core.jar"/>
-	<classpathentry kind="lib" path="lib/jaxen-jdom.jar"/>
-	<classpathentry kind="lib" path="lib/staxmate-2.0.0.jar"/>
-	<classpathentry kind="lib" path="lib/saxon9-dom.jar"/>
-	<classpathentry kind="lib" path="lib/saxon9-jdom.jar"/>
-	<classpathentry kind="lib" path="lib/saxon9.jar"/>
-	<classpathentry kind="lib" path="lib/AES31.jar"/>
-	<classpathentry kind="lib" path="lib/hclaps-2.1.jar"/>
-	<classpathentry kind="lib" path="lib/stax2-api-3.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/woodstox-core-lgpl-4.0.7.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
 	<classpathentry kind="lib" path="lib/tika/tika-app-1.10.jar"/>
-	<classpathentry kind="lib" path="lib/commons-configuration-1.8.jar"/>
-	<classpathentry kind="lib" path="lib/commons-collections-3.2.1.jar"/>
-	<classpathentry kind="lib" path="lib/commons-io-2.4.jar"/>
-	<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging-1.2.jar"/>
-	<classpathentry kind="lib" path="lib/xercesImpl-2.9.1.jar"/>
-	<classpathentry kind="lib" path="lib/slf4j-api-1.7.12.jar"/>
-	<classpathentry kind="lib" path="lib/slf4j-log4j12-1.7.12.jar"/>
-	<classpathentry kind="lib" path="lib/jna-4.1.0.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/bfj220.jar"/>
 	<classpathentry kind="lib" path="lib/nzmetool/metadata.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/PDFBox-0.7.3.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/bmp_adapter_1_0.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/excel_adapter_1_0.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/gif_adapter_1_0.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/html_adapter_1_0.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/jpg_adapter_1_1.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/mp3_adapter_1_0.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/msworks_adapter_1_0.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/openoffice_adapter_1_0.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/pdf_adapter_1_0.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/pdfbox_adapter_1_0.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/powerpoint_adapter_1_0.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/tiff_adapter_1_0.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/wave_adapter_1_0.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/wordperfect_adapter_1_0.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/xml_adapter_1_0.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/arc_adapter_1_0.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/flac_adapter_1_1.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/jID3LibMp3_adapter_1_0.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/mpeg4_adapter_1_0.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/warc_adapter_1_0.jar"/>
-	<classpathentry kind="lib" path="lib/nzmetool/adapters/msword_adapter_2_0.jar"/>
 	<classpathentry kind="lib" path="lib/nzmetool/aspose-words-15.7.0.jar"/>
 	<classpathentry kind="lib" path="lib/nzmetool/bcmail-jdk16-1.46.jar"/>
 	<classpathentry kind="lib" path="lib/nzmetool/bcprov-jdk16-1.46.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/bfj220.jar"/>
 	<classpathentry kind="lib" path="lib/nzmetool/poi-3.12.jar"/>
 	<classpathentry kind="lib" path="lib/nzmetool/poi-ooxml-3.12.jar"/>
 	<classpathentry kind="lib" path="lib/nzmetool/commons-httpclient-3.1.jar"/>
@@ -77,10 +56,32 @@
 	<classpathentry kind="lib" path="lib/nzmetool/jwat-gzip-1.0.0.jar"/>
 	<classpathentry kind="lib" path="lib/nzmetool/jwat-warc-1.0.0.jar"/>
 	<classpathentry kind="lib" path="lib/nzmetool/oro-2.0.8.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/PDFBox-0.7.3.jar"/>
 	<classpathentry kind="lib" path="lib/nzmetool/poi-3.0-FINAL.jar"/>
 	<classpathentry kind="lib" path="lib/nzmetool/serializer.jar"/>
 	<classpathentry kind="lib" path="lib/nzmetool/xalan.jar"/>
 	<classpathentry kind="lib" path="lib/nzmetool/xml-apis.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/bmp_adapter_1_0.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/excel_adapter_1_0.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/gif_adapter_1_0.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/html_adapter_1_0.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/jpg_adapter_1_1.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/mp3_adapter_1_0.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/msworks_adapter_1_0.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/openoffice_adapter_1_0.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/pdf_adapter_1_0.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/pdfbox_adapter_1_0.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/powerpoint_adapter_1_0.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/tiff_adapter_1_0.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/wave_adapter_1_0.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/wordperfect_adapter_1_0.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/xml_adapter_1_0.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/arc_adapter_1_0.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/flac_adapter_1_1.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/jID3LibMp3_adapter_1_0.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/mpeg4_adapter_1_0.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/warc_adapter_1_0.jar"/>
+	<classpathentry kind="lib" path="lib/nzmetool/adapters/msword_adapter_2_0.jar"/>
 	<classpathentry kind="lib" path="lib/droid/aopalliance-1.0.jar"/>
 	<classpathentry kind="lib" path="lib/droid/asm-2.2.3.jar"/>
 	<classpathentry kind="lib" path="lib/droid/bcmail-jdk14-138.jar"/>
@@ -169,6 +170,5 @@
 	<classpathentry kind="lib" path="lib/droid/jwat-warc-1.0.2.jar"/>
 	<classpathentry kind="lib" path="lib/droid/poi-3.13.jar"/>
 	<classpathentry kind="lib" path="lib/droid/trove4j-3.0.3.jar"/>
-	<classpathentry kind="lib" path="lib/ots-1.0.50.jar"/>
-	<classpathentry kind="output" path="build"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 /build_local
 *.class
-CVS
-TAGS
+/fitsBasicTestOutput.xml
 
 # Directory created by fits-blackbox-tester
 .bb-testing/
@@ -15,3 +14,4 @@ TAGS
 /fits-tests.log
 /javadoc/
 /target/
+/version.properties
diff --git a/.project b/.project
@@ -4,20 +4,20 @@
 	<comment></comment>
 	<projects>
 	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>net.sourceforge.metrics.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>net.sourceforge.metrics.nature</nature>
-	</natures>
+    <buildSpec>
+        <buildCommand>
+            <name>org.eclipse.jdt.core.javabuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+        <buildCommand>
+            <name>org.eclipse.m2e.core.maven2Builder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+    </buildSpec>
+    <natures>
+        <nature>org.eclipse.jdt.core.javanature</nature>
+        <nature>org.eclipse.m2e.core.maven2Nature</nature>
+    </natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -9,4 +9,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.source=1.7
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.8"/>
+</faceted-project>
diff --git a/Licenses/SAXON-LICENSE.txt b/Licenses/SAXON-LICENSE.txt
@@ -1,6 +1,6 @@
-The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); 
+The contents of this file are subject to the Mozilla Public License Version 2.0 (the "License"); 
 you may not use this file except in compliance with the License. You may obtain a copy of the 
-License at http://www.mozilla.org/MPL/
+License at https://www.mozilla.org/en-US/MPL/2.0/
 
 Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND,
  either express or implied. See the License for the specific language governing rights and limitations under the License.

diff --git a/README.md b/README.md
@@ -5,9 +5,23 @@ System Requirements
 -------------------
 FITS is a Java program and requires Java version 1.7 or higher. To find out your Java version type java -version in a command-line window.
 
+Building FITS
+-------------
+As of release 1.3.0 FITS is built using [Apache Maven](https://maven.apache.org/).
+The build artifacts are fits-<version>.jar and fits-<version>.zip. The JAR file contains the compiled Java source files contained in this project whereas the ZIP file contains the final artifact which can be extracted and used to process input files for analysis.
+The ZIP file can be built with the following command, which will also run the entire test suite:
+
+    mvn clean package
+
+To build yet skip the tests, use the following command:
+
+    mvn clean package -DskipTests
+
+NOTE: A few Maven dependencies are not in public repositories. These are within the source tree in the lib-local directory. Other dependencies are within the lib directory for use by the FITS custom classloader.
+
 Installation
 ------------
-Download the latest official release from our [Downloads](http://fitstool.org/downloads) page.
+Download the latest official binary release from our [Downloads](http://fitstool.org/downloads) page.
 
 **IMPORTANT NOTE**: The code on this GitHub site is not meant for direct installation since it does NOT include the necessary fits.jar file (which is a primary build artifact of this project). If you want to use this GitHub site for installing FITS, you must first download (or Git clone) the code then build the project using the Ant 'release' target.
 
@@ -19,7 +33,7 @@ If this is your first time downloading FITS, create a directory for FITS, for ex
 
 Extract the contents of your ZIP file to your FITS directory. You should end up with a another directory under your top-level FITS directory that has a version number embedded in it, for example on Windows:
 
-    C:\Program Files\Fits\fits-1.0.0
+    C:\Program Files\Fits\fits-1.3.0
 
 Running FITS
 ------------