diff --git a/Core/manifest.mf b/Core/manifest.mf
index 9c9ba77918..87c1152d7a 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 984792fc91..a3977b7197 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 a70456a44a..d5e7aa87ab 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -201,9 +201,11 @@
org.sleuthkit.autopsy.coreutils
org.sleuthkit.autopsy.datamodel
org.sleuthkit.autopsy.directorytree
+ org.sleuthkit.autopsy.externalresults
org.sleuthkit.autopsy.filesearch
org.sleuthkit.autopsy.ingest
org.sleuthkit.autopsy.menuactions
+ org.sleuthkit.autopsy.modules.hashdatabase
org.sleuthkit.autopsy.report
org.sleuthkit.datamodel
diff --git a/KeywordSearch/manifest.mf b/KeywordSearch/manifest.mf
index 3f6b74acf7..16d2e4fe86 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 4f3228693f..1b2f416df4 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 847ad2aeaa..bdb5f4486a 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -95,8 +95,8 @@
- 9
- 7.1
+ 10
+ 10.0
diff --git a/RecentActivity/manifest.mf b/RecentActivity/manifest.mf
index bf165767bf..c04ae806df 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 2203f2cbc1..a31b0c2f01 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 f953130b53..bf7bb93662 100644
--- a/RecentActivity/nbproject/project.xml
+++ b/RecentActivity/nbproject/project.xml
@@ -30,14 +30,6 @@
7.21.1
-
- org.openide.util.lookup
-
-
-
- 8.19.1
-
-
org.openide.util
@@ -46,13 +38,21 @@
8.25.1
+
+ org.openide.util.lookup
+
+
+
+ 8.19.1
+
+
org.sleuthkit.autopsy.core
- 9
- 7.1
+ 10
+ 10.0
diff --git a/ScalpelCarver/nbproject/project.properties b/ScalpelCarver/nbproject/project.properties
index 6c99604533..cafb7bf34e 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 6437d6f3d1..a1951a32d9 100644
--- a/ScalpelCarver/nbproject/project.xml
+++ b/ScalpelCarver/nbproject/project.xml
@@ -6,14 +6,6 @@
org.sleuthkit.autopsy.scalpel
-
- org.openide.util.lookup
-
-
-
- 8.19.1
-
-
org.openide.util
@@ -22,13 +14,21 @@
8.25.1
+
+ org.openide.util.lookup
+
+
+
+ 8.19.1
+
+
org.sleuthkit.autopsy.core
- 9
- 7.0
+ 10
+ 10.0
diff --git a/Testing/nbproject/project.xml b/Testing/nbproject/project.xml
index f685034d4a..eac0450c0a 100644
--- a/Testing/nbproject/project.xml
+++ b/Testing/nbproject/project.xml
@@ -11,8 +11,8 @@
- 9
- 7.0
+ 10
+ 10.0
@@ -20,8 +20,8 @@
- 5
- 3.2
+ 6
+ 6.0
diff --git a/thunderbirdparser/manifest.mf b/thunderbirdparser/manifest.mf
index f25afa6886..746a00fbfb 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 ff2f7c230d..0fd53bef25 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 884056d668..d28caa4d6f 100644
--- a/thunderbirdparser/nbproject/project.xml
+++ b/thunderbirdparser/nbproject/project.xml
@@ -6,14 +6,6 @@
org.sleuthkit.autopsy.thunderbirdparser
-
- org.openide.util.lookup
-
-
-
- 8.19.1
-
-
org.openide.util
@@ -22,13 +14,21 @@
8.25.1
+
+ org.openide.util.lookup
+
+
+
+ 8.19.1
+
+
org.sleuthkit.autopsy.core
- 9
- 7.1
+ 10
+ 10.0
@@ -36,8 +36,8 @@
- 5
- 3.2
+ 6
+ 6.0
diff --git a/update_versions.py b/update_versions.py
index 3cd6e85ffd..507419d688 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)