diff --git a/Core/manifest.mf b/Core/manifest.mf
index 768877763a..31bfec73de 100644
--- a/Core/manifest.mf
+++ b/Core/manifest.mf
@@ -1,10 +1,10 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.core/8
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/core/Bundle.properties
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/core/layer.xml
-OpenIDE-Module-Implementation-Version: 8
-OpenIDE-Module-Requires: org.openide.windows.WindowManager, org.netbeans.api.javahelp.Help
-AutoUpdate-Show-In-Client: true
-AutoUpdate-Essential-Module: true
-OpenIDE-Module-Install: org/sleuthkit/autopsy/core/Installer.class
-
+Manifest-Version: 1.0
+OpenIDE-Module: org.sleuthkit.autopsy.core/9
+OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/core/Bundle.properties
+OpenIDE-Module-Layer: org/sleuthkit/autopsy/core/layer.xml
+OpenIDE-Module-Implementation-Version: 9
+OpenIDE-Module-Requires: org.openide.windows.WindowManager, org.netbeans.api.javahelp.Help
+AutoUpdate-Show-In-Client: true
+AutoUpdate-Essential-Module: true
+OpenIDE-Module-Install: org/sleuthkit/autopsy/core/Installer.class
+
diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index cf83ac4ca0..6acd5c8087 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -6,5 +6,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=6.0
+spec.version.base=7.0
diff --git a/ExifParser/manifest.mf b/ExifParser/manifest.mf
index 842aedafa9..dbf05fee2f 100644
--- a/ExifParser/manifest.mf
+++ b/ExifParser/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.sleuthkit.autopsy.exifparser/3
-OpenIDE-Module-Implementation-Version: 8
+OpenIDE-Module-Implementation-Version: 9
OpenIDE-Module-Layer: org/sleuthkit/autopsy/exifparser/layer.xml
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/exifparser/Bundle.properties
diff --git a/ExifParser/nbproject/project.xml b/ExifParser/nbproject/project.xml
index fc1fa65a03..b5d8819e79 100644
--- a/ExifParser/nbproject/project.xml
+++ b/ExifParser/nbproject/project.xml
@@ -1,30 +1,30 @@
-
-
- org.netbeans.modules.apisupport.project
-
-
- org.sleuthkit.autopsy.exifparser
-
-
-
- org.sleuthkit.autopsy.core
-
-
-
- 8
- 6.0
-
-
-
-
-
- ext/xmpcore.jar
- release/modules/ext/xmpcore.jar
-
-
- ext/metadata-extractor-2.6.2.jar
- release/modules/ext/metadata-extractor-2.6.2.jar
-
-
-
-
+
+
+ org.netbeans.modules.apisupport.project
+
+
+ org.sleuthkit.autopsy.exifparser
+
+
+
+ org.sleuthkit.autopsy.core
+
+
+
+ 9
+ 7.0
+
+
+
+
+
+ ext/xmpcore.jar
+ release/modules/ext/xmpcore.jar
+
+
+ ext/metadata-extractor-2.6.2.jar
+ release/modules/ext/metadata-extractor-2.6.2.jar
+
+
+
+
diff --git a/HashDatabase/manifest.mf b/HashDatabase/manifest.mf
index 4509a133fc..ba201a294c 100644
--- a/HashDatabase/manifest.mf
+++ b/HashDatabase/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.sleuthkit.autopsy.hashdatabase/3
-OpenIDE-Module-Implementation-Version: 8
+OpenIDE-Module-Implementation-Version: 9
OpenIDE-Module-Layer: org/sleuthkit/autopsy/hashdatabase/layer.xml
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/hashdatabase/Bundle.properties
diff --git a/HashDatabase/nbproject/project.properties b/HashDatabase/nbproject/project.properties
index 0735c621fa..88f75855cb 100644
--- a/HashDatabase/nbproject/project.properties
+++ b/HashDatabase/nbproject/project.properties
@@ -1,6 +1,6 @@
-javac.source=1.7
-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
+javac.source=1.7
+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.3
diff --git a/HashDatabase/nbproject/project.xml b/HashDatabase/nbproject/project.xml
index 9c0d4236d3..3a743f01d0 100644
--- a/HashDatabase/nbproject/project.xml
+++ b/HashDatabase/nbproject/project.xml
@@ -77,8 +77,8 @@
- 8
- 6.0
+ 9
+ 7.0
diff --git a/KeywordSearch/manifest.mf b/KeywordSearch/manifest.mf
index 784a32e6cd..dd9e48a200 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: 8
+OpenIDE-Module-Implementation-Version: 9
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 080c464e8a..140caac79c 100644
--- a/KeywordSearch/nbproject/project.properties
+++ b/KeywordSearch/nbproject/project.properties
@@ -1,6 +1,6 @@
-javac.source=1.7
-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
+javac.source=1.7
+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
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index 463608b102..215c6068ba 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -95,8 +95,8 @@
- 8
- 6.0
+ 9
+ 7.0
diff --git a/NEWS.txt b/NEWS.txt
index bae082a63e..0fd41075bf 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,23 +1,27 @@
----------------- VERSION Current (development) --------------
+---------------- VERSION 3.0.7 --------------
New features:
- 64-bit support (JavaFX for video)
- Multi-select
- different sized thumbnails
-- Custom tags persist accross runs of the app
+- Custom tags persist across runs of the app
- RegRipper is run on each hive and raw output is available.
+- Metadata content viewer
+- Basic sanity check when adding images to see if parts could be missing.
Improvements:
- EXIF module uses only signatures
-- File size view does not show unalloc files
+- File size View does not show unalloc files
- Tagged files in report show more data
- Updated test scripts
+- Better OS X look and feel
Bugfixes:
- Several -> Didn't keep good track in this file.
-
+- Error messages from adding disk to database are better displayed.
+- RecentActivity better reports errors parsing data
---------------- VERSION 3.0.6 --------------
diff --git a/RecentActivity/manifest.mf b/RecentActivity/manifest.mf
index dfcdd7d5e4..14b58804be 100644
--- a/RecentActivity/manifest.mf
+++ b/RecentActivity/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.recentactivity/4
-OpenIDE-Module-Implementation-Version: 8
+OpenIDE-Module: org.sleuthkit.autopsy.recentactivity/5
+OpenIDE-Module-Implementation-Version: 9
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 8f5a495086..4ce77193f7 100644
--- a/RecentActivity/nbproject/project.properties
+++ b/RecentActivity/nbproject/project.properties
@@ -1,7 +1,7 @@
-file.reference.gson-2.1.jar=release/modules/ext/gson-2.1.jar
-javac.source=1.7
-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=2.1
+file.reference.gson-2.1.jar=release/modules/ext/gson-2.1.jar
+javac.source=1.7
+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.0
diff --git a/RecentActivity/nbproject/project.xml b/RecentActivity/nbproject/project.xml
index 5a2da5d144..8da413bbc9 100644
--- a/RecentActivity/nbproject/project.xml
+++ b/RecentActivity/nbproject/project.xml
@@ -1,52 +1,52 @@
-
-
- org.netbeans.modules.apisupport.project
-
-
- org.sleuthkit.autopsy.recentactivity
-
-
-
- org.openide.awt
-
-
-
- 7.46.1
-
-
-
- org.openide.modules
-
-
-
- 7.23.1
-
-
-
- org.openide.nodes
-
-
-
- 7.21.1
-
-
-
- org.sleuthkit.autopsy.core
-
-
-
- 8
- 6.0
-
-
-
-
- org.sleuthkit.autopsy.recentactivity
-
-
- ext/gson-2.1.jar
- release/modules/ext/gson-2.1.jar
-
-
-
-
+
+
+ org.netbeans.modules.apisupport.project
+
+
+ org.sleuthkit.autopsy.recentactivity
+
+
+
+ org.openide.awt
+
+
+
+ 7.46.1
+
+
+
+ org.openide.modules
+
+
+
+ 7.23.1
+
+
+
+ org.openide.nodes
+
+
+
+ 7.21.1
+
+
+
+ org.sleuthkit.autopsy.core
+
+
+
+ 9
+ 7.0
+
+
+
+
+ org.sleuthkit.autopsy.recentactivity
+
+
+ ext/gson-2.1.jar
+ release/modules/ext/gson-2.1.jar
+
+
+
+
diff --git a/ScalpelCarver/nbproject/project.xml b/ScalpelCarver/nbproject/project.xml
index 4d0c3c54c8..d0f610f870 100644
--- a/ScalpelCarver/nbproject/project.xml
+++ b/ScalpelCarver/nbproject/project.xml
@@ -1,22 +1,22 @@
-
-
- org.netbeans.modules.apisupport.project
-
-
- org.sleuthkit.autopsy.scalpel
-
-
-
- org.sleuthkit.autopsy.core
-
-
-
- 8
- 6.0
-
-
-
-
-
-
-
+
+
+ org.netbeans.modules.apisupport.project
+
+
+ org.sleuthkit.autopsy.scalpel
+
+
+
+ org.sleuthkit.autopsy.core
+
+
+
+ 9
+ 7.0
+
+
+
+
+
+
+
diff --git a/SevenZip/manifest.mf b/SevenZip/manifest.mf
index cf3c7b17ca..9989549bec 100644
--- a/SevenZip/manifest.mf
+++ b/SevenZip/manifest.mf
@@ -1,6 +1,6 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.sevenzip/1
-OpenIDE-Module-Implementation-Version: 2
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/sevenzip/Bundle.properties
-
-
+Manifest-Version: 1.0
+OpenIDE-Module: org.sleuthkit.autopsy.sevenzip/1
+OpenIDE-Module-Implementation-Version: 3
+OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/sevenzip/Bundle.properties
+
+
diff --git a/SevenZip/nbproject/project.xml b/SevenZip/nbproject/project.xml
index 673cf1f747..2a2f30e675 100644
--- a/SevenZip/nbproject/project.xml
+++ b/SevenZip/nbproject/project.xml
@@ -1,48 +1,48 @@
-
-
- org.netbeans.modules.apisupport.project
-
-
- org.sleuthkit.autopsy.sevenzip
-
-
-
- org.netbeans.api.progress
-
-
-
- 1
- 1.32.1
-
-
-
- org.sleuthkit.autopsy.core
-
-
-
- 8
- 6.0
-
-
-
- org.sleuthkit.autopsy.corelibs
-
-
-
- 3
- 1.0
-
-
-
-
-
- ext/sevenzipjbinding.jar
- release/modules/ext/sevenzipjbinding.jar
-
-
- ext/sevenzipjbinding-AllPlatforms.jar
- release/modules/ext/sevenzipjbinding-AllPlatforms.jar
-
-
-
-
+
+
+ org.netbeans.modules.apisupport.project
+
+
+ org.sleuthkit.autopsy.sevenzip
+
+
+
+ org.netbeans.api.progress
+
+
+
+ 1
+ 1.32.1
+
+
+
+ org.sleuthkit.autopsy.core
+
+
+
+ 9
+ 7.0
+
+
+
+ org.sleuthkit.autopsy.corelibs
+
+
+
+ 3
+ 1.1
+
+
+
+
+
+ ext/sevenzipjbinding.jar
+ release/modules/ext/sevenzipjbinding.jar
+
+
+ ext/sevenzipjbinding-AllPlatforms.jar
+ release/modules/ext/sevenzipjbinding-AllPlatforms.jar
+
+
+
+
diff --git a/Testing/manifest.mf b/Testing/manifest.mf
index 8c10f74029..53c457afbb 100644
--- a/Testing/manifest.mf
+++ b/Testing/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.sleuthkit.autopsy.testing/3
-OpenIDE-Module-Implementation-Version: 6
+OpenIDE-Module-Implementation-Version: 7
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/testing/Bundle.properties
diff --git a/Testing/nbproject/project.xml b/Testing/nbproject/project.xml
index 6e09006977..e9621dd78b 100644
--- a/Testing/nbproject/project.xml
+++ b/Testing/nbproject/project.xml
@@ -1,69 +1,69 @@
-
-
- org.netbeans.modules.apisupport.project
-
-
- org.sleuthkit.autopsy.testing
-
-
-
- org.sleuthkit.autopsy.core
-
-
-
- 8
- 6.0
-
-
-
- org.sleuthkit.autopsy.keywordsearch
-
-
-
- 5
- 3.0
-
-
-
-
-
- qa-functional
-
- org.netbeans.libs.junit4
-
-
-
- org.netbeans.modules.jellytools.java
-
-
-
- org.netbeans.modules.jellytools.platform
-
-
-
- org.netbeans.modules.jemmy
-
-
-
- org.netbeans.modules.nbjunit
-
-
-
-
-
- unit
-
- org.netbeans.libs.junit4
-
-
-
- org.netbeans.modules.nbjunit
-
-
-
-
-
-
-
-
-
+
+
+ org.netbeans.modules.apisupport.project
+
+
+ org.sleuthkit.autopsy.testing
+
+
+
+ org.sleuthkit.autopsy.core
+
+
+
+ 9
+ 7.0
+
+
+
+ org.sleuthkit.autopsy.keywordsearch
+
+
+
+ 5
+ 3.2
+
+
+
+
+
+ qa-functional
+
+ org.netbeans.libs.junit4
+
+
+
+ org.netbeans.modules.jellytools.java
+
+
+
+ org.netbeans.modules.jellytools.platform
+
+
+
+ org.netbeans.modules.jemmy
+
+
+
+ org.netbeans.modules.nbjunit
+
+
+
+
+
+ unit
+
+ org.netbeans.libs.junit4
+
+
+
+ org.netbeans.modules.nbjunit
+
+
+
+
+
+
+
+
+
diff --git a/Testing/src/org/sleuthkit/autopsy/testing/Bundle.properties b/Testing/src/org/sleuthkit/autopsy/testing/Bundle.properties
index 125ec1c485..023a96d380 100644
--- a/Testing/src/org/sleuthkit/autopsy/testing/Bundle.properties
+++ b/Testing/src/org/sleuthkit/autopsy/testing/Bundle.properties
@@ -1 +1 @@
-OpenIDE-Module-Name=Testing
+OpenIDE-Module-Name=Testing
diff --git a/Timeline/manifest.mf b/Timeline/manifest.mf
index 7534b1a53c..3210242336 100644
--- a/Timeline/manifest.mf
+++ b/Timeline/manifest.mf
@@ -1,7 +1,7 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.timeline/1
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/timeline/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/timeline/Bundle.properties
-OpenIDE-Module-Requires: org.openide.windows.WindowManager
-OpenIDE-Module-Implementation-Version: 2
-
+Manifest-Version: 1.0
+OpenIDE-Module: org.sleuthkit.autopsy.timeline/1
+OpenIDE-Module-Layer: org/sleuthkit/autopsy/timeline/layer.xml
+OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/timeline/Bundle.properties
+OpenIDE-Module-Requires: org.openide.windows.WindowManager
+OpenIDE-Module-Implementation-Version: 3
+
diff --git a/Timeline/nbproject/project.xml b/Timeline/nbproject/project.xml
index 1fb39e7230..f21e7f63ba 100644
--- a/Timeline/nbproject/project.xml
+++ b/Timeline/nbproject/project.xml
@@ -1,113 +1,113 @@
-
-
- org.netbeans.modules.apisupport.project
-
-
- org.sleuthkit.autopsy.timeline
-
-
-
- org.netbeans.api.progress
-
-
-
- 1
- 1.32.1
-
-
-
- org.netbeans.modules.settings
-
-
-
- 1
- 1.35.1
-
-
-
- org.openide.actions
-
-
-
- 6.26.1
-
-
-
- org.openide.awt
-
-
-
- 7.46.1
-
-
-
- org.openide.dialogs
-
-
-
- 7.25.1
-
-
-
- org.openide.modules
-
-
-
- 7.32.1
-
-
-
- org.openide.nodes
-
-
-
- 7.28.1
-
-
-
- org.openide.util
-
-
-
- 8.25.2
-
-
-
- org.openide.util.lookup
-
-
-
- 8.15.2
-
-
-
- org.openide.windows
-
-
-
- 6.55.2
-
-
-
- org.sleuthkit.autopsy.core
-
-
-
- 8
- 6.0
-
-
-
- org.sleuthkit.autopsy.corelibs
-
-
-
- 3
- 1.0
-
-
-
-
-
-
-
+
+
+ org.netbeans.modules.apisupport.project
+
+
+ org.sleuthkit.autopsy.timeline
+
+
+
+ org.netbeans.api.progress
+
+
+
+ 1
+ 1.32.1
+
+
+
+ org.netbeans.modules.settings
+
+
+
+ 1
+ 1.35.1
+
+
+
+ org.openide.actions
+
+
+
+ 6.26.1
+
+
+
+ org.openide.awt
+
+
+
+ 7.46.1
+
+
+
+ org.openide.dialogs
+
+
+
+ 7.25.1
+
+
+
+ org.openide.modules
+
+
+
+ 7.32.1
+
+
+
+ org.openide.nodes
+
+
+
+ 7.28.1
+
+
+
+ org.openide.util
+
+
+
+ 8.25.2
+
+
+
+ org.openide.util.lookup
+
+
+
+ 8.15.2
+
+
+
+ org.openide.windows
+
+
+
+ 6.55.2
+
+
+
+ org.sleuthkit.autopsy.core
+
+
+
+ 9
+ 7.0
+
+
+
+ org.sleuthkit.autopsy.corelibs
+
+
+
+ 3
+ 1.1
+
+
+
+
+
+
+
diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
index 7f1ae45f90..4744f62146 100644
--- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
+++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
@@ -1,5 +1,5 @@
#Updated by build script
-#Wed, 25 Sep 2013 12:13:40 -0400
+#Wed, 25 Sep 2013 13:55:37 -0400
LBL_splash_window_title=Starting Autopsy
SPLASH_HEIGHT=288
SPLASH_WIDTH=538
@@ -8,4 +8,4 @@ SplashRunningTextBounds=5,266,530,17
SplashRunningTextColor=0x0
SplashRunningTextFontSize=18
-currentVersion=Autopsy 20130925
+currentVersion=Autopsy 3.0.7
diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
index 60a0ac7dc0..0dbd5e9a00 100644
--- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
+++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
@@ -1,5 +1,5 @@
#Updated by build script
-#Wed, 25 Sep 2013 12:13:40 -0400
+#Wed, 25 Sep 2013 13:55:37 -0400
-CTL_MainWindow_Title=Autopsy 20130925
-CTL_MainWindow_Title_No_Project=Autopsy 20130925
+CTL_MainWindow_Title=Autopsy 3.0.7
+CTL_MainWindow_Title_No_Project=Autopsy 3.0.7
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 6bb00c7198..e70fffba4b 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,46 +1,46 @@
-app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif
-### Title of the application
-app.title=Autopsy
-### lowercase version of above
-app.name=autopsy
-### if left unset, version will default to today's date
-#app.version=3.0.2
-### Build type isn't used at this point, but it may be useful
-### Must be one of: DEVELOPMENT, RELEASE
-#build.type=RELEASE
-build.type=DEVELOPMENT
-update_versions=false
-#custom JVM options
-#Note: can be higher on 64 bit systems, should be in sync with build.xml
-run.args.extra=-J-Xms24m -J-XX:MaxPermSize=128M -J-Xverify:none
-auxiliary.org-netbeans-modules-apisupport-installer.license-type=apache.v2
-auxiliary.org-netbeans-modules-apisupport-installer.os-linux=false
-auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=false
-auxiliary.org-netbeans-modules-apisupport-installer.os-solaris=false
-auxiliary.org-netbeans-modules-apisupport-installer.os-windows=true
-auxiliary.org-netbeans-modules-apisupport-installer.pack200-enabled=false
-branding.token=${app.name}
-modules=\
- ${project.org.sleuthkit.autopsy.keywordsearch}:\
- ${project.org.sleuthkit.autopsy.hashdatabase}:\
- ${project.org.sleuthkit.autopsy.recentactivity}:\
- ${project.org.sleuthkit.autopsy.testing}:\
- ${project.org.sleuthkit.autopsy.thunderbirdparser}:\
- ${project.org.sleuthkit.autopsy.exifparser}:\
- ${project.org.sleuthkit.autopsy.core}:\
- ${project.org.sleuthkit.autopsy.corelibs}:\
- ${project.org.sleuthkit.autopsy.sevenzip}:\
- ${project.org.sleuthkit.autopsy.scalpel}:\
- ${project.org.sleuthkit.autopsy.timeline}
-project.org.sleuthkit.autopsy.core=Core
-project.org.sleuthkit.autopsy.corelibs=CoreLibs
-project.org.sleuthkit.autopsy.hashdatabase=HashDatabase
-project.org.sleuthkit.autopsy.keywordsearch=KeywordSearch
-project.org.sleuthkit.autopsy.recentactivity=RecentActivity
-project.org.sleuthkit.autopsy.testing=Testing
-project.org.sleuthkit.autopsy.thunderbirdparser=thunderbirdparser
-project.org.sleuthkit.autopsy.exifparser=ExifParser
-project.org.sleuthkit.autopsy.sevenzip=SevenZip
-project.org.sleuthkit.autopsy.scalpel=ScalpelCarver
-project.org.sleuthkit.autopsy.timeline=Timeline
-
+app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif
+### Title of the application
+app.title=Autopsy
+### lowercase version of above
+app.name=autopsy
+### if left unset, version will default to today's date
+app.version=3.0.7
+### Build type isn't used at this point, but it may be useful
+### Must be one of: DEVELOPMENT, RELEASE
+build.type=RELEASE
+#build.type=DEVELOPMENT
+update_versions=false
+#custom JVM options
+#Note: can be higher on 64 bit systems, should be in sync with build.xml
+run.args.extra=-J-Xms24m -J-XX:MaxPermSize=128M -J-Xverify:none
+auxiliary.org-netbeans-modules-apisupport-installer.license-type=apache.v2
+auxiliary.org-netbeans-modules-apisupport-installer.os-linux=false
+auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=false
+auxiliary.org-netbeans-modules-apisupport-installer.os-solaris=false
+auxiliary.org-netbeans-modules-apisupport-installer.os-windows=true
+auxiliary.org-netbeans-modules-apisupport-installer.pack200-enabled=false
+branding.token=${app.name}
+modules=\
+ ${project.org.sleuthkit.autopsy.keywordsearch}:\
+ ${project.org.sleuthkit.autopsy.hashdatabase}:\
+ ${project.org.sleuthkit.autopsy.recentactivity}:\
+ ${project.org.sleuthkit.autopsy.testing}:\
+ ${project.org.sleuthkit.autopsy.thunderbirdparser}:\
+ ${project.org.sleuthkit.autopsy.exifparser}:\
+ ${project.org.sleuthkit.autopsy.core}:\
+ ${project.org.sleuthkit.autopsy.corelibs}:\
+ ${project.org.sleuthkit.autopsy.sevenzip}:\
+ ${project.org.sleuthkit.autopsy.scalpel}:\
+ ${project.org.sleuthkit.autopsy.timeline}
+project.org.sleuthkit.autopsy.core=Core
+project.org.sleuthkit.autopsy.corelibs=CoreLibs
+project.org.sleuthkit.autopsy.hashdatabase=HashDatabase
+project.org.sleuthkit.autopsy.keywordsearch=KeywordSearch
+project.org.sleuthkit.autopsy.recentactivity=RecentActivity
+project.org.sleuthkit.autopsy.testing=Testing
+project.org.sleuthkit.autopsy.thunderbirdparser=thunderbirdparser
+project.org.sleuthkit.autopsy.exifparser=ExifParser
+project.org.sleuthkit.autopsy.sevenzip=SevenZip
+project.org.sleuthkit.autopsy.scalpel=ScalpelCarver
+project.org.sleuthkit.autopsy.timeline=Timeline
+
diff --git a/thunderbirdparser/manifest.mf b/thunderbirdparser/manifest.mf
index ed23afad76..c16a2f4c01 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: 8
+OpenIDE-Module-Implementation-Version: 9
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 f278b6de1b..6a243df466 100644
--- a/thunderbirdparser/nbproject/project.properties
+++ b/thunderbirdparser/nbproject/project.properties
@@ -1,6 +1,6 @@
-javac.source=1.7
-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.1
+javac.source=1.7
+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
diff --git a/thunderbirdparser/nbproject/project.xml b/thunderbirdparser/nbproject/project.xml
index 61557a9353..aec76cd632 100644
--- a/thunderbirdparser/nbproject/project.xml
+++ b/thunderbirdparser/nbproject/project.xml
@@ -1,31 +1,31 @@
-
-
- org.netbeans.modules.apisupport.project
-
-
- org.sleuthkit.autopsy.thunderbirdparser
-
-
-
- org.sleuthkit.autopsy.core
-
-
-
- 8
- 6.0
-
-
-
- org.sleuthkit.autopsy.keywordsearch
-
-
-
- 5
- 3.1
-
-
-
-
-
-
-
+
+
+ org.netbeans.modules.apisupport.project
+
+
+ org.sleuthkit.autopsy.thunderbirdparser
+
+
+
+ org.sleuthkit.autopsy.core
+
+
+
+ 9
+ 7.0
+
+
+
+ org.sleuthkit.autopsy.keywordsearch
+
+
+
+ 5
+ 3.2
+
+
+
+
+
+
+