From 0bdd31f45be5d5b6993becadcc3ca29e1b19d59b Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Fri, 26 Oct 2018 11:12:26 -0400
Subject: [PATCH] Updated versions for release
---
ImageGallery/manifest.mf | 2 +-
.../org/sleuthkit/autopsy/imagegallery/Bundle.properties | 2 +-
NEWS.txt | 6 ++++++
TSKVersion.xml | 2 +-
docs/doxygen-user/Doxyfile | 2 +-
docs/doxygen/Doxyfile | 2 +-
nbproject/project.properties | 2 +-
7 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ImageGallery/manifest.mf b/ImageGallery/manifest.mf
index 38081388f4..21dea51481 100644
--- a/ImageGallery/manifest.mf
+++ b/ImageGallery/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.sleuthkit.autopsy.imagegallery/2
-OpenIDE-Module-Implementation-Version: 4
+OpenIDE-Module-Implementation-Version: 5
OpenIDE-Module-Layer: org/sleuthkit/autopsy/imagegallery/layer.xml
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/imagegallery/Bundle.properties
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle.properties b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle.properties
index 1df8a62921..95eaf6042c 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle.properties
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle.properties
@@ -11,4 +11,4 @@ ImageGalleryOptionsPanel.descriptionLabel.text=<html>To minimize its startup tim
ImageGalleryOptionsPanel.furtherDescriptionArea.text=If Image Gallery is disabled, only the fact that an update is needed is recorded. If Image Gallery is enabled after ingest, it will do one bulk update based on the results from ingest. If Image Gallery is disabled, you will be prompted to enable it when attempting to open its window.
ImageGalleryOptionsPanel.unavailableDuringInjestLabel.text=This setting is unavailable during ingest.
ImageGalleryOptionsPanel.groupCategorizationWarningBox.text=Don't show a warning when overwriting categories, by acting on an entire group.
-CTL_OpenAction=Open Image/Video
\ No newline at end of file
+CTL_OpenAction=Open Image/Video
diff --git a/NEWS.txt b/NEWS.txt
index f0414d48ba..f93db10f9c 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,3 +1,9 @@
+---------------- VERSION 4.9.0 --------------
+Bug Fixes:
+- Fixed possible ingest deadlock from Image Gallery database inserts
+- Image Gallery does not need lock on Case DB during pre-population, which makes UI more responsive
+- Other misc Image Gallery fixes
+
---------------- VERSION 4.9.0 --------------
New Features:
diff --git a/TSKVersion.xml b/TSKVersion.xml
index d909ae3b26..f820b13d68 100644
--- a/TSKVersion.xml
+++ b/TSKVersion.xml
@@ -1,3 +1,3 @@
<project name="TSK_VERSION">
- <property name="TSK_VERSION" value="4.6.3"/>
+ <property name="TSK_VERSION" value="4.6.4"/>
</project>
diff --git a/docs/doxygen-user/Doxyfile b/docs/doxygen-user/Doxyfile
index 21e14a3e46..f059ec6a9d 100755
--- a/docs/doxygen-user/Doxyfile
+++ b/docs/doxygen-user/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME = "Autopsy User Documentation"
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 4.9.0
+PROJECT_NUMBER = 4.9.1
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile
index e83d4b6735..30e1b38fff 100755
--- a/docs/doxygen/Doxyfile
+++ b/docs/doxygen/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME = "Autopsy"
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 4.9.0
+PROJECT_NUMBER = 4.9.1
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears a the top of each page and should give viewer a
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 6b846f5808..96658e548c 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -4,7 +4,7 @@ app.title=Autopsy
### lowercase version of above
app.name=${branding.token}
### if left unset, version will default to today's date
-app.version=4.9.0
+app.version=4.9.1
### build.type must be one of: DEVELOPMENT, RELEASE
#build.type=RELEASE
build.type=DEVELOPMENT
--
GitLab