diff --git a/.gitignore b/.gitignore
index 5e4866a207d88b19a01dbb1a0c084874eecb5a28..dc88052299a04f8a3261a6151ef6c3188f2423f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,3 +77,5 @@ Core/src/org/sleuthkit/autopsy/casemodule/docs/screenshot.png
.DS_Store
.*.swp
Core/src/org/sleuthkit/autopsy/datamodel/ranges.csv
+
+thunderbirdparser/release/modules/ext
diff --git a/KeywordSearch/build.xml b/KeywordSearch/build.xml
index a9b2d0fe4c7d5c1763ff44e6fd7449c55e5d64a0..e35f12956ac6004c0dd446e212be38c9e5e2b826 100644
--- a/KeywordSearch/build.xml
+++ b/KeywordSearch/build.xml
@@ -53,5 +53,4 @@
<target name="clean-all" depends="clean" description="Clear Ivy cache.">
<ivy:cleancache/>
</target>
-
-</project>
+ </project>
diff --git a/thunderbirdparser/build.xml b/thunderbirdparser/build.xml
index c6442bd82ff0a34b9768f1dabb3df3a6cc961b53..d6c5554abf2481a18a68920970a230b94ce18735 100644
--- a/thunderbirdparser/build.xml
+++ b/thunderbirdparser/build.xml
@@ -2,7 +2,47 @@
<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
<!-- for some information on what you could do (e.g. targets to override). -->
<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.thunderbirdparser" default="netbeans" basedir=".">
+<project name="org.sleuthkit.autopsy.thunderbirdparser" default="netbeans" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
<description>Builds, tests, and runs the project org.sleuthkit.autopsy.thunderbirdparser.</description>
<import file="nbproject/build-impl.xml"/>
+
+
+ <property name="ivy.install.version" value="2.3.0-rc2" />
+ <condition property="ivy.home" value="${env.IVY_HOME}">
+ <isset property="env.IVY_HOME" />
+ </condition>
+ <property name="ivy.home" value="${user.home}/.ant" />
+ <property name="ivy.jar.dir" value="${ivy.home}/lib" />
+ <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
+
+ <target name="download-ivy" unless="offline">
+ <available file="${ivy.jar.file}" property="ivy.available"/>
+ <antcall target="-download-ivy" />
+ </target>
+
+ <target name="-download-ivy" unless="ivy.available">
+ <mkdir dir="${ivy.jar.dir}"/>
+ <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+ dest="${ivy.jar.file}" usetimestamp="true"/>
+ </target>
+
+ <!-- init-ivy will bootstrap Ivy if the user doesn't have it already -->
+ <target name="init-ivy" depends="download-ivy" unless="ivy.lib.path">
+ <path id="ivy.lib.path">
+ <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+ </path>
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+ uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+ </target>
+
+
+
+
+ <target name="init" depends="basic-init,files-init,build-init,-javac-init,init-ivy">
+
+ <!-- fetch all the dependencies from Ivy and stick them in the right places -->
+ <ivy:resolve/>
+ <ivy:retrieve conf="autopsy" sync="true" pattern="release/modules/ext/[artifact]-[revision](-[classifier]).[ext]" />
+ </target>
</project>
+
diff --git a/thunderbirdparser/ivy.xml b/thunderbirdparser/ivy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2e671961d48d6fbb0213db35e9ffb6fdfb415376
--- /dev/null
+++ b/thunderbirdparser/ivy.xml
@@ -0,0 +1,16 @@
+
+<ivy-module version="2.0">
+ <info organisation="org.sleuthkit.autopsy" module="emailparser"/>
+ <configurations >
+ <!-- module dependencies -->
+ <conf name="autopsy"/>
+
+ </configurations>
+ <dependencies>
+ <dependency conf="autopsy->default" org="org.apache.james" name="apache-mime4j-core" rev="0.8.0"/>
+ <dependency conf="autopsy->default" org="org.apache.james" name="apache-mime4j-dom" rev="0.8.0"/>
+ <dependency conf="autopsy->default" org="org.apache.james" name="apache-mime4j-mbox-iterator" rev="0.8.0"/>
+ <dependency conf="autopsy->default" org="org.apache.james" name="apache-mime4j-mbox-iterator" rev="0.8.0"/>
+ <dependency conf="autopsy->default" org="com.pff" name="java-libpst" rev="0.9.3"/>
+ </dependencies>
+</ivy-module>
diff --git a/thunderbirdparser/ivysettings.xml b/thunderbirdparser/ivysettings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c27d9052550c0f9eec0df0bb4411b325bbc8ea8b
--- /dev/null
+++ b/thunderbirdparser/ivysettings.xml
@@ -0,0 +1,9 @@
+<ivysettings>
+ <settings defaultResolver="main"/>
+ <resolvers>
+ <chain name="main">
+ <ibiblio name="central" m2compatible="true"/>
+ <ibiblio name="maven.restlet.org" root="http://maven.restlet.com" m2compatible="true" />
+ </chain>
+ </resolvers>
+</ivysettings>
diff --git a/thunderbirdparser/nbproject/project.properties b/thunderbirdparser/nbproject/project.properties
index fbdabd0fc12e5370dbf411bedaa8a7d0397293f6..1b8df06408506d3adfe76fa5e2c5e79cce430cb1 100644
--- a/thunderbirdparser/nbproject/project.properties
+++ b/thunderbirdparser/nbproject/project.properties
@@ -1,8 +1,7 @@
-file.reference.apache-mime4j-core-0.8.0-SNAPSHOT-sources.jar=release/modules/ext/apache-mime4j-core-0.8.0-SNAPSHOT-sources.jar
-file.reference.apache-mime4j-core-0.8.0-SNAPSHOT.jar=release/modules/ext/apache-mime4j-core-0.8.0-SNAPSHOT.jar
-file.reference.apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT-sources.jar=release/modules/ext/apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT-sources.jar
-file.reference.apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT.jar=release/modules/ext/apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT.jar
-file.reference.java-libpst-1.0-SNAPSHOT.jar=release/modules/ext/java-libpst-1.0-SNAPSHOT.jar
+file.reference.apache-mime4j-core-0.8.0.jar=release/modules/ext/apache-mime4j-core-0.8.0.jar
+file.reference.apache-mime4j-dom-0.8.0.jar=release/modules/ext/apache-mime4j-dom-0.8.0.jar
+file.reference.apache-mime4j-mbox-iterator-0.8.0.jar=release/modules/ext/apache-mime4j-mbox-iterator-0.8.0.jar
+file.reference.java-libpst-0.9.3.jar=release/modules/ext/java-libpst-0.9.3.jar
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt
diff --git a/thunderbirdparser/nbproject/project.xml b/thunderbirdparser/nbproject/project.xml
index 84f4663022a51a6d4a7865137cbebca1617d2f5c..34acbcc50154bb15957712b3ca9d3c9ca5acde4b 100644
--- a/thunderbirdparser/nbproject/project.xml
+++ b/thunderbirdparser/nbproject/project.xml
@@ -51,32 +51,20 @@
</module-dependencies>
<public-packages/>
<class-path-extension>
- <runtime-relative-path>ext/apache-mime4j-dom-0.8.0-SNAPSHOT-sources.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/apache-mime4j-dom-0.8.0-SNAPSHOT-sources.jar</binary-origin>
+ <runtime-relative-path>ext/apache-mime4j-core-0.8.0.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/apache-mime4j-core-0.8.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/apache-mime4j-core-0.8.0-SNAPSHOT-sources.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/apache-mime4j-core-0.8.0-SNAPSHOT-sources.jar</binary-origin>
+ <runtime-relative-path>ext/apache-mime4j-dom-0.8.0.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/apache-mime4j-dom-0.8.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT.jar</binary-origin>
+ <runtime-relative-path>ext/java-libpst-0.9.3.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/java-libpst-0.9.3.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/apache-mime4j-core-0.8.0-SNAPSHOT.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/apache-mime4j-core-0.8.0-SNAPSHOT.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/apache-mime4j-dom-0.8.0-SNAPSHOT.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/apache-mime4j-dom-0.8.0-SNAPSHOT.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/java-libpst-1.0-SNAPSHOT.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/java-libpst-1.0-SNAPSHOT.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT-sources.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT-sources.jar</binary-origin>
+ <runtime-relative-path>ext/apache-mime4j-mbox-iterator-0.8.0.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/apache-mime4j-mbox-iterator-0.8.0.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/thunderbirdparser/release/modules/ext/apache-mime4j-core-0.8.0-SNAPSHOT-sources.jar b/thunderbirdparser/release/modules/ext/apache-mime4j-core-0.8.0-SNAPSHOT-sources.jar
deleted file mode 100755
index 9e6f5b463e677c6f31bb654ceb188563d1135870..0000000000000000000000000000000000000000
Binary files a/thunderbirdparser/release/modules/ext/apache-mime4j-core-0.8.0-SNAPSHOT-sources.jar and /dev/null differ
diff --git a/thunderbirdparser/release/modules/ext/apache-mime4j-core-0.8.0-SNAPSHOT.jar b/thunderbirdparser/release/modules/ext/apache-mime4j-core-0.8.0-SNAPSHOT.jar
deleted file mode 100755
index 0aff45bb7de325854a352dfd5d800d961b373ea3..0000000000000000000000000000000000000000
Binary files a/thunderbirdparser/release/modules/ext/apache-mime4j-core-0.8.0-SNAPSHOT.jar and /dev/null differ
diff --git a/thunderbirdparser/release/modules/ext/apache-mime4j-dom-0.8.0-SNAPSHOT-sources.jar b/thunderbirdparser/release/modules/ext/apache-mime4j-dom-0.8.0-SNAPSHOT-sources.jar
deleted file mode 100755
index 206408ba738c2b9311df3a07b10d3f52fc67f787..0000000000000000000000000000000000000000
Binary files a/thunderbirdparser/release/modules/ext/apache-mime4j-dom-0.8.0-SNAPSHOT-sources.jar and /dev/null differ
diff --git a/thunderbirdparser/release/modules/ext/apache-mime4j-dom-0.8.0-SNAPSHOT.jar b/thunderbirdparser/release/modules/ext/apache-mime4j-dom-0.8.0-SNAPSHOT.jar
deleted file mode 100755
index 773ab544ca35e19e1bfa988bf0490687f123a5e6..0000000000000000000000000000000000000000
Binary files a/thunderbirdparser/release/modules/ext/apache-mime4j-dom-0.8.0-SNAPSHOT.jar and /dev/null differ
diff --git a/thunderbirdparser/release/modules/ext/apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT-sources.jar b/thunderbirdparser/release/modules/ext/apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT-sources.jar
deleted file mode 100755
index f7248bd03e61b43d712e0abb5c3cee2bf7ec3728..0000000000000000000000000000000000000000
Binary files a/thunderbirdparser/release/modules/ext/apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT-sources.jar and /dev/null differ
diff --git a/thunderbirdparser/release/modules/ext/apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT.jar b/thunderbirdparser/release/modules/ext/apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT.jar
deleted file mode 100755
index bb7d15da6152420977faefe014f9533b5efff035..0000000000000000000000000000000000000000
Binary files a/thunderbirdparser/release/modules/ext/apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT.jar and /dev/null differ
diff --git a/thunderbirdparser/release/modules/ext/apache-mime4j-project-0.8.0-SNAPSHOT.jar b/thunderbirdparser/release/modules/ext/apache-mime4j-project-0.8.0-SNAPSHOT.jar
deleted file mode 100755
index 70beac46b5b9079056118fdb6fa66bb4257876cd..0000000000000000000000000000000000000000
Binary files a/thunderbirdparser/release/modules/ext/apache-mime4j-project-0.8.0-SNAPSHOT.jar and /dev/null differ
diff --git a/thunderbirdparser/release/modules/ext/java-libpst-1.0-SNAPSHOT.jar b/thunderbirdparser/release/modules/ext/java-libpst-1.0-SNAPSHOT.jar
deleted file mode 100755
index 8489f660b9957e302c8156af3b7d84106be77a0b..0000000000000000000000000000000000000000
Binary files a/thunderbirdparser/release/modules/ext/java-libpst-1.0-SNAPSHOT.jar and /dev/null differ