From 69c35704cfc5ec7483ff8a985032fff164c8586e Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Fri, 31 Oct 2014 12:17:50 -0400
Subject: [PATCH] updated to version 3.1.1 and associated Library versions

---
 Core/manifest.mf                                   |  2 +-
 Core/nbproject/project.properties                  |  2 +-
 KeywordSearch/manifest.mf                          |  2 +-
 KeywordSearch/nbproject/project.properties         |  2 +-
 NEWS.txt                                           | 14 ++++++++++++++
 Testing/manifest.mf                                |  2 +-
 .../org/netbeans/core/startup/Bundle.properties    |  4 ++--
 .../core/windows/view/ui/Bundle.properties         |  6 +++---
 nbproject/project.properties                       |  6 +++---
 thunderbirdparser/manifest.mf                      |  2 +-
 10 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/Core/manifest.mf b/Core/manifest.mf
index 87c1152d7a..10bd758bba 100644
--- a/Core/manifest.mf
+++ b/Core/manifest.mf
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 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: 11
+OpenIDE-Module-Implementation-Version: 12
 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 5463e77dc0..048f04de74 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -14,5 +14,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=10.0
+spec.version.base=10.1
 
diff --git a/KeywordSearch/manifest.mf b/KeywordSearch/manifest.mf
index 16d2e4fe86..9f4369b992 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/6
-OpenIDE-Module-Implementation-Version: 11
+OpenIDE-Module-Implementation-Version: 12
 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 1b2f416df4..67b69be73b 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=6.0
+spec.version.base=6.1
diff --git a/NEWS.txt b/NEWS.txt
index 3230683339..6481a39362 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,3 +1,17 @@
+---------------- VERSION 3.1.1  --------------
+Improvements:
+- New time line feature
+- New Interesting Files module
+- Added support for Python modules
+- Updated HTML report
+- Media Content viewer uses blackboard artifacts and detects PNG by sig.
+- New logo
+
+Bug Fixes:
+- Adding local disk errors
+- ZIP files inside of RAR files are properly extracted
+ 
+
 ---------------- VERSION 3.1.0  --------------
 Numerous changes have gone into this long-awaited major release.
 
diff --git a/Testing/manifest.mf b/Testing/manifest.mf
index 381f4bb133..7f246db06f 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: 7
+OpenIDE-Module-Implementation-Version: 8
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/testing/Bundle.properties
 
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 a16d8e667b..4a62f13fab 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, 22 Oct 2014 12:03:43 -0400
+#Fri, 31 Oct 2014 12:13:36 -0400
 LBL_splash_window_title=Starting Autopsy
 SPLASH_HEIGHT=560
 SPLASH_WIDTH=960
@@ -8,4 +8,4 @@ SplashRunningTextBounds=0,517,957,25
 SplashRunningTextColor=0x0
 SplashRunningTextFontSize=27
 
-currentVersion=Autopsy 3.1.0
+currentVersion=Autopsy 3.1.1
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 2ee2c7f43d..f0109bc92b 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, 03 Sep 2014 09:52:11 -0400
+#Fri, 31 Oct 2014 12:13:36 -0400
 
-CTL_MainWindow_Title=Autopsy 3.1.0
-CTL_MainWindow_Title_No_Project=Autopsy 3.1.0
+CTL_MainWindow_Title=Autopsy 3.1.1
+CTL_MainWindow_Title_No_Project=Autopsy 3.1.1
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 23c64998d0..fea6aaf7ff 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -4,11 +4,11 @@ app.title=Autopsy
 ### lowercase version of above
 app.name=${branding.token}
 ### if left unset, version will default to today's date
-app.version=3.1.0
+app.version=3.1.1
 ### 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
+build.type=RELEASE
+#build.type=DEVELOPMENT
 
 update_versions=false
 #custom JVM options
diff --git a/thunderbirdparser/manifest.mf b/thunderbirdparser/manifest.mf
index 746a00fbfb..e8df3d7e79 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/4
-OpenIDE-Module-Implementation-Version: 11
+OpenIDE-Module-Implementation-Version: 12
 OpenIDE-Module-Layer: org/sleuthkit/autopsy/thunderbirdparser/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties
 
-- 
GitLab