diff --git a/Core/manifest.mf b/Core/manifest.mf
index 9c9ba779188000278d9e9684a201a9439b0f0aa5..87c1152d7a8a0a3d26f9484415aaa21061de05ad 100644
--- a/Core/manifest.mf
+++ b/Core/manifest.mf
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.core/9
+OpenIDE-Module: org.sleuthkit.autopsy.core/10
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/core/Bundle.properties
OpenIDE-Module-Layer: org/sleuthkit/autopsy/core/layer.xml
-OpenIDE-Module-Implementation-Version: 10
+OpenIDE-Module-Implementation-Version: 11
OpenIDE-Module-Requires: org.openide.windows.WindowManager, org.netbeans.api.javahelp.Help
AutoUpdate-Show-In-Client: true
AutoUpdate-Essential-Module: true
diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index 984792fc91c5bc6e889eaa1dcdcd9779be0dd3ae..a3977b7197abf1fd0a75acea387264935e63b745 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -11,5 +11,5 @@ license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/
nbm.module.author=Brian Carrier
nbm.needs.restart=true
-spec.version.base=7.1
+spec.version.base=10.0
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index a70456a44a29fbeed288a4acb29b6ebcb0f477a1..d5e7aa87ab376063d02b880143efc80a907ef4f0 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -201,9 +201,11 @@
<package>org.sleuthkit.autopsy.coreutils</package>
<package>org.sleuthkit.autopsy.datamodel</package>
<package>org.sleuthkit.autopsy.directorytree</package>
+ <package>org.sleuthkit.autopsy.externalresults</package>
<package>org.sleuthkit.autopsy.filesearch</package>
<package>org.sleuthkit.autopsy.ingest</package>
<package>org.sleuthkit.autopsy.menuactions</package>
+ <package>org.sleuthkit.autopsy.modules.hashdatabase</package>
<package>org.sleuthkit.autopsy.report</package>
<package>org.sleuthkit.datamodel</package>
</public-packages>
diff --git a/KeywordSearch/manifest.mf b/KeywordSearch/manifest.mf
index 3f6b74acf7c502efd5dfa961349b3cacae198de6..16d2e4fe8610c68ae6f373c73a44f46a6746ef5f 100644
--- a/KeywordSearch/manifest.mf
+++ b/KeywordSearch/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: true
-OpenIDE-Module: org.sleuthkit.autopsy.keywordsearch/5
-OpenIDE-Module-Implementation-Version: 10
+OpenIDE-Module: org.sleuthkit.autopsy.keywordsearch/6
+OpenIDE-Module-Implementation-Version: 11
OpenIDE-Module-Install: org/sleuthkit/autopsy/keywordsearch/Installer.class
OpenIDE-Module-Layer: org/sleuthkit/autopsy/keywordsearch/layer.xml
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/keywordsearch/Bundle.properties
diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties
index 4f3228693fea5989f8a4f47d9810719c11eb5746..1b2f416df415eb91879ce5c42a1cb205cba1cc44 100644
--- a/KeywordSearch/nbproject/project.properties
+++ b/KeywordSearch/nbproject/project.properties
@@ -3,4 +3,4 @@ javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/autopsy/
nbm.needs.restart=true
-spec.version.base=3.2
+spec.version.base=6.0
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index 847ad2aeaa3ae9521f88e4c1e1dea53aec04cfdc..bdb5f4486a599222c96fcb1bc2f21dedfa9d20ef 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -95,8 +95,8 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <release-version>9</release-version>
- <specification-version>7.1</specification-version>
+ <release-version>10</release-version>
+ <specification-version>10.0</specification-version>
</run-dependency>
</dependency>
</module-dependencies>
diff --git a/RecentActivity/manifest.mf b/RecentActivity/manifest.mf
index bf165767bfd54633f66b2ea9d868775a0a926ae9..c04ae806df5665b9d5ff30583138a27bed7e1250 100644
--- a/RecentActivity/manifest.mf
+++ b/RecentActivity/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.recentactivity/5
-OpenIDE-Module-Implementation-Version: 10
+OpenIDE-Module: org.sleuthkit.autopsy.recentactivity/6
+OpenIDE-Module-Implementation-Version: 11
OpenIDE-Module-Layer: org/sleuthkit/autopsy/recentactivity/layer.xml
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/recentactivity/Bundle.properties
OpenIDE-Module-Requires:
diff --git a/RecentActivity/nbproject/project.properties b/RecentActivity/nbproject/project.properties
index 2203f2cbc18199f6916ce49463a52cc6b14a3852..a31b0c2f01b785b5ed9c10e8b9f97f9ecde75f61 100644
--- a/RecentActivity/nbproject/project.properties
+++ b/RecentActivity/nbproject/project.properties
@@ -4,4 +4,4 @@ javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/autopsy/
nbm.needs.restart=true
-spec.version.base=3.1
+spec.version.base=6.0
diff --git a/RecentActivity/nbproject/project.xml b/RecentActivity/nbproject/project.xml
index f953130b5362e539a909ca534662d2c2f9dcb291..bf7bb93662d8e3ec89b76d7e3060894fbe2a29e4 100644
--- a/RecentActivity/nbproject/project.xml
+++ b/RecentActivity/nbproject/project.xml
@@ -31,19 +31,19 @@
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
+ <code-name-base>org.openide.util</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>8.19.1</specification-version>
+ <specification-version>8.25.1</specification-version>
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.openide.util</code-name-base>
+ <code-name-base>org.openide.util.lookup</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>8.25.1</specification-version>
+ <specification-version>8.19.1</specification-version>
</run-dependency>
</dependency>
<dependency>
@@ -51,8 +51,8 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <release-version>9</release-version>
- <specification-version>7.1</specification-version>
+ <release-version>10</release-version>
+ <specification-version>10.0</specification-version>
</run-dependency>
</dependency>
</module-dependencies>
diff --git a/ScalpelCarver/nbproject/project.properties b/ScalpelCarver/nbproject/project.properties
index 6c99604533a3c27cb3e439cfd7f645eb167b3a40..cafb7bf34e2c07efe55198c5093eb2c86d08b28c 100644
--- a/ScalpelCarver/nbproject/project.properties
+++ b/ScalpelCarver/nbproject/project.properties
@@ -1,4 +1,4 @@
-javac.source=1.6
+javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/autopsy/
diff --git a/ScalpelCarver/nbproject/project.xml b/ScalpelCarver/nbproject/project.xml
index 6437d6f3d191a3965def281688b507f46a85f0d0..a1951a32d91094eb6fa8b8ccd0b2e73c5743de49 100644
--- a/ScalpelCarver/nbproject/project.xml
+++ b/ScalpelCarver/nbproject/project.xml
@@ -7,19 +7,19 @@
<suite-component/>
<module-dependencies>
<dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
+ <code-name-base>org.openide.util</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>8.19.1</specification-version>
+ <specification-version>8.25.1</specification-version>
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.openide.util</code-name-base>
+ <code-name-base>org.openide.util.lookup</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>8.25.1</specification-version>
+ <specification-version>8.19.1</specification-version>
</run-dependency>
</dependency>
<dependency>
@@ -27,8 +27,8 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <release-version>9</release-version>
- <specification-version>7.0</specification-version>
+ <release-version>10</release-version>
+ <specification-version>10.0</specification-version>
</run-dependency>
</dependency>
</module-dependencies>
diff --git a/Testing/nbproject/project.xml b/Testing/nbproject/project.xml
index f685034d4ad83c770df2bee1a2059264b05271b9..eac0450c0ac884b2028c4f12aee6315e132de74e 100644
--- a/Testing/nbproject/project.xml
+++ b/Testing/nbproject/project.xml
@@ -11,8 +11,8 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <release-version>9</release-version>
- <specification-version>7.0</specification-version>
+ <release-version>10</release-version>
+ <specification-version>10.0</specification-version>
</run-dependency>
</dependency>
<dependency>
@@ -20,8 +20,8 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <release-version>5</release-version>
- <specification-version>3.2</specification-version>
+ <release-version>6</release-version>
+ <specification-version>6.0</specification-version>
</run-dependency>
</dependency>
</module-dependencies>
diff --git a/thunderbirdparser/manifest.mf b/thunderbirdparser/manifest.mf
index f25afa6886765f67981394fe87907f5e71413b85..746a00fbfb672bd0412a2865051192c736c20f69 100644
--- a/thunderbirdparser/manifest.mf
+++ b/thunderbirdparser/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: true
-OpenIDE-Module: org.sleuthkit.autopsy.thunderbirdparser/3
-OpenIDE-Module-Implementation-Version: 10
+OpenIDE-Module: org.sleuthkit.autopsy.thunderbirdparser/4
+OpenIDE-Module-Implementation-Version: 11
OpenIDE-Module-Layer: org/sleuthkit/autopsy/thunderbirdparser/layer.xml
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties
diff --git a/thunderbirdparser/nbproject/project.properties b/thunderbirdparser/nbproject/project.properties
index ff2f7c230d30f7cfa4907f1aace3f9030596795e..0fd53bef25f3ab7643607798ef04d8bea7e628cd 100644
--- a/thunderbirdparser/nbproject/project.properties
+++ b/thunderbirdparser/nbproject/project.properties
@@ -8,4 +8,4 @@ javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/autopsy/
nbm.needs.restart=true
-spec.version.base=1.2
+spec.version.base=4.0
diff --git a/thunderbirdparser/nbproject/project.xml b/thunderbirdparser/nbproject/project.xml
index 884056d668f36323c4986f7f2c6d6198c24bec40..d28caa4d6ff9986886a5af6e36789b2a43eb0de7 100644
--- a/thunderbirdparser/nbproject/project.xml
+++ b/thunderbirdparser/nbproject/project.xml
@@ -7,19 +7,19 @@
<suite-component/>
<module-dependencies>
<dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
+ <code-name-base>org.openide.util</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>8.19.1</specification-version>
+ <specification-version>8.25.1</specification-version>
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.openide.util</code-name-base>
+ <code-name-base>org.openide.util.lookup</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>8.25.1</specification-version>
+ <specification-version>8.19.1</specification-version>
</run-dependency>
</dependency>
<dependency>
@@ -27,8 +27,8 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <release-version>9</release-version>
- <specification-version>7.1</specification-version>
+ <release-version>10</release-version>
+ <specification-version>10.0</specification-version>
</run-dependency>
</dependency>
<dependency>
@@ -36,8 +36,8 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <release-version>5</release-version>
- <specification-version>3.2</specification-version>
+ <release-version>6</release-version>
+ <specification-version>6.0</specification-version>
</run-dependency>
</dependency>
</module-dependencies>
diff --git a/update_versions.py b/update_versions.py
index 3cd6e85ffd8fb3c997c08d0f9a6dfc5c2e113296..507419d688a51cdff7cf56a50574544a622fe5c4 100755
--- a/update_versions.py
+++ b/update_versions.py
@@ -631,18 +631,18 @@ def print_version_updates(modules):
versions = module.versions
if module.ret == COMPATIBLE:
output = (module.name + ":\n")
+ output += ("\tMajor Release:\tNo Change.\n")
output += ("\tSpecification:\t" + str(versions[0]) + "\t->\t" + str(versions[0].increment()) + "\n")
- output += ("\tImplementation:\t" + str(versions[1]) + "\t->\t" + str(versions[1] + 1) + "\n")
- output += ("\tRelease:\tNo Change.\n")
+ output += ("\tImplementation:\t" + str(versions[1]) + "\t->\t" + str(versions[1] + 1) + "\n")
output += ("\n")
print(output)
sys.stdout.flush()
f.write(output)
elif module.ret == NON_COMPATIBLE:
output = (module.name + ":\n")
+ output += ("\Major Release:\t" + str(versions[2]) + "\t->\t" + str(versions[2] + 1) + "\n")
output += ("\tSpecification:\t" + str(versions[0]) + "\t->\t" + str(versions[0].overflow()) + "\n")
output += ("\tImplementation:\t" + str(versions[1]) + "\t->\t" + str(versions[1] + 1) + "\n")
- output += ("\tRelease:\t" + str(versions[2]) + "\t->\t" + str(versions[2] + 1) + "\n")
output += ("\n")
print(output)
sys.stdout.flush()
@@ -650,9 +650,9 @@ def print_version_updates(modules):
elif module.ret == ERROR:
output = (module.name + ":\n")
output += ("\t*Unable to detect necessary changes\n")
+ output += ("\Major Release:\t\t" + str(versions[2]) + "\n")
output += ("\tSpecification:\t" + str(versions[0]) + "\n")
output += ("\tImplementation:\t" + str(versions[1]) + "\n")
- output += ("\tRelease:\t\t" + str(versions[2]) + "\n")
output += ("\n")
print(output)
f.write(output)
@@ -669,15 +669,15 @@ def print_version_updates(modules):
f.write(output)
elif module.ret is None:
output = ("Added " + module.name + ":\n")
+ if module.release() != 1 and module.release() != 0:
+ output += ("Major Release:\t\t" + str(module.release()) + "\t->\t" + "1\n")
+ output += ("\n")
if module.spec() != "1.0" and module.spec() != "0.0":
output += ("\tSpecification:\t" + str(module.spec()) + "\t->\t" + "1.0\n")
output += ("\n")
if module.impl() != 1:
output += ("\tImplementation:\t" + str(module.impl()) + "\t->\t" + "1\n")
output += ("\n")
- if module.release() != 1 and module.release() != 0:
- output += ("Release:\t\t" + str(module.release()) + "\t->\t" + "1\n")
- output += ("\n")
print(output)
sys.stdout.flush()
f.write(output)