Updated version numbers for 3.1.0

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

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
 

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>

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

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

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>

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: 

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

RecentActivity/nbproject/project.xml

@@ -30,14 +30,6 @@
                         <specification-version>7.21.1</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.19.1</specification-version>
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.openide.util</code-name-base>
                     <build-prerequisite/>
@@ -46,13 +38,21 @@
                         <specification-version>8.25.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.openide.util.lookup</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>8.19.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
                     <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>

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/

ScalpelCarver/nbproject/project.xml

@@ -6,14 +6,6 @@
             <code-name-base>org.sleuthkit.autopsy.scalpel</code-name-base>
             <suite-component/>
             <module-dependencies>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.19.1</specification-version>
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.openide.util</code-name-base>
                     <build-prerequisite/>
@@ -22,13 +14,21 @@
                         <specification-version>8.25.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.openide.util.lookup</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>8.19.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
                     <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>

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>

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
 

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

thunderbirdparser/nbproject/project.xml

@@ -6,14 +6,6 @@
             <code-name-base>org.sleuthkit.autopsy.thunderbirdparser</code-name-base>
             <suite-component/>
             <module-dependencies>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.19.1</specification-version>
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.openide.util</code-name-base>
                     <build-prerequisite/>
@@ -22,13 +14,21 @@
                         <specification-version>8.25.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.openide.util.lookup</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>8.19.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
                     <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>

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)