diff --git a/Core/manifest.mf b/Core/manifest.mf
index c93cac723ec1c37bc4d5bbc42bf0ca9c5f41d4b8..c38806aaa084270e8b58bad0c821035026b6a7fb 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: 18
+OpenIDE-Module-Implementation-Version: 19
OpenIDE-Module-Requires: org.openide.windows.WindowManager
AutoUpdate-Show-In-Client: true
AutoUpdate-Essential-Module: true
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java b/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java
index 19933f8247889bc06374141266ad64e2201be0d9..25ee380a7e6cdec9e02221f6517169aa480e4566 100755
--- a/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java
@@ -138,7 +138,7 @@ public class ImageUtils {
SUPPORTED_IMAGE_EXTENSIONS.addAll(Arrays.asList(ImageIO.getReaderFileSuffixes()));
SUPPORTED_IMAGE_EXTENSIONS.add("tec"); // Add JFIF .tec files
SUPPORTED_IMAGE_EXTENSIONS.removeIf("db"::equals); // remove db files
-
+
SUPPORTED_IMAGE_MIME_TYPES = new TreeSet<>(Arrays.asList(ImageIO.getReaderMIMETypes()));
/*
* special cases and variants that we support, but don't get registered
@@ -213,7 +213,7 @@ public static boolean thumbnailSupported(Content content) {
* @param file the AbstractFile to test
*
* @return true if the file is an image we can read and generate thumbnail
- * for.
+ * for.
*/
public static boolean isImageThumbnailSupported(AbstractFile file) {
return isMediaThumbnailSupported(file, "image/", SUPPORTED_IMAGE_MIME_TYPES, SUPPORTED_IMAGE_EXTENSIONS) || hasImageFileHeader(file);//NON-NLS
@@ -239,17 +239,16 @@ public static boolean isGIF(AbstractFile file) {
* VideoUtils both implement/extend some base interface/abstract class. That
* would be the natural place to put this.
*
- * @param file the AbstractFile to test
- * @param mimeTypePrefix a MIME 'top-level type name' such as "image/",
- * including the "/". In addition to the list of
- * supported MIME types, any type that starts with
- * this prefix will be regarded as supported
+ * @param file the AbstractFile to test
+ * @param mimeTypePrefix a MIME 'top-level type name' such as "image/",
+ * including the "/". In addition to the list of supported MIME types, any
+ * type that starts with this prefix will be regarded as supported
* @param supportedMimeTypes a collection of mimetypes that are supported
* @param supportedExtension a collection of extensions that are supported
*
* @return true if a thumbnail can be generated for the given file based on
- * the given MIME type prefix and lists of supported MIME types and
- * extensions
+ * the given MIME type prefix and lists of supported MIME types and
+ * extensions
*/
static boolean isMediaThumbnailSupported(AbstractFile file, String mimeTypePrefix, final Collection<String> supportedMimeTypes, final List<String> supportedExtension) {
if (false == file.isFile() || file.getSize() <= 0) {
@@ -283,7 +282,7 @@ static boolean isMediaThumbnailSupported(AbstractFile file, String mimeTypePrefi
* @return a FileTypeDetector
*
* @throws FileTypeDetectorInitException if initializing the
- * FileTypeDetector failed.
+ * FileTypeDetector failed.
*/
synchronized private static FileTypeDetector getFileTypeDetector() throws FileTypeDetector.FileTypeDetectorInitException {
if (fileTypeDetector == null) {
@@ -296,11 +295,11 @@ synchronized private static FileTypeDetector getFileTypeDetector() throws FileTy
* Get a thumbnail of a specified size for the given image. Generates the
* thumbnail if it is not already cached.
*
- * @param content the content to generate a thumbnail for
+ * @param content the content to generate a thumbnail for
* @param iconSize the size (one side of a square) in pixels to generate
*
* @return A thumbnail for the given image or a default one if there was a
- * problem making a thumbnail.
+ * problem making a thumbnail.
*/
public static BufferedImage getThumbnail(Content content, int iconSize) {
if (content instanceof AbstractFile) {
@@ -339,7 +338,7 @@ public static BufferedImage getThumbnail(Content content, int iconSize) {
* @param file The AbstractFile to get a stream for.
*
* @return A BufferedInputStream wrapped around a ReadContentStream for the
- * given AbstractFile
+ * given AbstractFile
*/
private static BufferedInputStream getBufferedReadContentStream(AbstractFile file) {
return new BufferedInputStream(new ReadContentInputStream(file));
@@ -349,11 +348,11 @@ private static BufferedInputStream getBufferedReadContentStream(AbstractFile fil
* Get a thumbnail of a specified size for the given image. Generates the
* thumbnail if it is not already cached.
*
- * @param content the content to generate a thumbnail for
+ * @param content the content to generate a thumbnail for
* @param iconSize the size (one side of a square) in pixels to generate
*
* @return File object for cached image. Is guaranteed to exist, as long as
- * there was not an error generating or saving the thumbnail.
+ * there was not an error generating or saving the thumbnail.
*/
@Nullable
public static File getCachedThumbnailFile(Content content, int iconSize) {
@@ -368,8 +367,8 @@ public static File getCachedThumbnailFile(Content content, int iconSize) {
* @param fileID the fileID to get the cached thumbnail location for
*
* @return A File object representing the location of the cached thumbnail.
- * This file may not actually exist(yet). Returns null if there was
- * any problem getting the file, such as no case was open.
+ * This file may not actually exist(yet). Returns null if there was any
+ * problem getting the file, such as no case was open.
*/
private static File getCachedThumbnailLocation(long fileID) {
return cacheFileMap.computeIfAbsent(fileID, id -> {
@@ -427,7 +426,7 @@ public static boolean isJpegFileHeader(AbstractFile file) {
* @param file the AbstractFile to parse
*
* @return Offset of first Start Of Image marker, or 0 if none found. This
- * will let ImageIO try to open it from offset 0.
+ * will let ImageIO try to open it from offset 0.
*/
private static long getJfifStartOfImageOffset(AbstractFile file) {
byte[] fileHeaderBuffer;
@@ -507,7 +506,7 @@ private static byte[] readHeader(AbstractFile file, int buffLength) throws TskCo
* @return the width in pixels
*
* @throws IOException If the file is not a supported image or the width
- * could not be determined.
+ * could not be determined.
*/
static public int getImageWidth(AbstractFile file) throws IOException {
return getImageProperty(file,
@@ -524,7 +523,7 @@ static public int getImageWidth(AbstractFile file) throws IOException {
* @return the height in pixels
*
* @throws IOException If the file is not a supported image or the height
- * could not be determined.
+ * could not be determined.
*/
static public int getImageHeight(AbstractFile file) throws IOException {
return getImageProperty(file,
@@ -537,8 +536,8 @@ static public int getImageHeight(AbstractFile file) throws IOException {
/**
* Functional interface for methods that extract a property out of an
* ImageReader. Initially created to abstract over
- * {@link #getImageHeight(org.sleuthkit.datamodel.AbstractFile)} and
- * {@link #getImageWidth(org.sleuthkit.datamodel.AbstractFile)}
+ * getImageHeight(org.sleuthkit.datamodel.AbstractFile) and
+ * getImageWidth(org.sleuthkit.datamodel.AbstractFile)
*
* @param <T> The type of the property.
*/
@@ -553,18 +552,17 @@ private static interface PropertyExtractor<T> {
* public methods that pull particular (usually meta-)data out of a image
* file.
*
- * @param file the file to extract the data from
- * @param errorTemplate a message template used to log errors. Should
- * take one parameter: the file's unique path or
- * name.
+ * @param file the file to extract the data from
+ * @param errorTemplate a message template used to log errors. Should take
+ * one parameter: the file's unique path or name.
* @param propertyExtractor an implementation of {@link PropertyExtractor}
- * used to retrieve the specific property.
+ * used to retrieve the specific property.
*
* @return the the value of the property extracted by the given
- * propertyExtractor
+ * propertyExtractor
*
* @throws IOException if there was a problem reading the property from the
- * file.
+ * file.
*
* @see PropertyExtractor
* @see #getImageHeight(org.sleuthkit.datamodel.AbstractFile)
@@ -608,8 +606,8 @@ private static <T> T getImageProperty(AbstractFile file, final String errorTempl
* but is not started automatically. Clients are responsible for running the
* task, monitoring its progress, and using its result.
*
- * @param file The file to create a thumbnail for.
- * @param iconSize The size of the thumbnail.
+ * @param file The file to create a thumbnail for.
+ * @param iconSize The size of the thumbnail.
* @param defaultOnFailure Whether or not to default on failure.
*
* @return a new Task that returns a thumbnail as its result.
@@ -978,10 +976,10 @@ public static File getFile(long id) {
* @param iconSize
*
* @return a thumbnail for the given image or a default one if there was a
- * problem making a thumbnail.
+ * problem making a thumbnail.
*
- * @deprecated use {@link #getThumbnail(org.sleuthkit.datamodel.Content, int)
- * } instead.
+ * @deprecated use getThumbnail(org.sleuthkit.datamodel.Content, int)
+ * instead.
*/
@Nonnull
@Deprecated
@@ -997,10 +995,10 @@ public static BufferedImage getIcon(Content content, int iconSize) {
* @param iconSize
*
* @return File object for cached image. Is guaranteed to exist, as long as
- * there was not an error generating or saving the thumbnail.
+ * there was not an error generating or saving the thumbnail.
*
- * @deprecated use {@link #getCachedThumbnailFile(org.sleuthkit.datamodel.Content, int)
- * } instead.
+ * @deprecated use getCachedThumbnailFile(org.sleuthkit.datamodel.Content,
+ * int) instead.
*
*/
@Nullable
diff --git a/Experimental/manifest.mf b/Experimental/manifest.mf
index 80010b9686b6567b6ef27e41d17e99f68771da0a..75f8aa63f50c890b58d4077d3e1b5db7a74e1ca2 100644
--- a/Experimental/manifest.mf
+++ b/Experimental/manifest.mf
@@ -1,6 +1,7 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: true
-OpenIDE-Module: org.sleuthkit.autopsy.experimental
+OpenIDE-Module: org.sleuthkit.autopsy.experimental/10
+OpenIDE-Module-Implementation-Version: 2
OpenIDE-Module-Layer: org/sleuthkit/autopsy/experimental/autoingest/layer.xml
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties
OpenIDE-Module-Specification-Version: 1.0
diff --git a/ImageGallery/manifest.mf b/ImageGallery/manifest.mf
index 79c24ee687133d3e9c802fcea83b94c7c365c66c..9e4c8299d48236026359ba10b60eee4e5b5309cf 100644
--- a/ImageGallery/manifest.mf
+++ b/ImageGallery/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.sleuthkit.autopsy.imagegallery/2
-OpenIDE-Module-Implementation-Version: 2
+OpenIDE-Module-Implementation-Version: 3
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/imagegallery/Bundle.properties
diff --git a/KeywordSearch/manifest.mf b/KeywordSearch/manifest.mf
index 8d282392646a7050147511d74a7cce57a213b95a..56e7a721f2d9857c33f1a9670282e8723ac15c31 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: 16
+OpenIDE-Module-Implementation-Version: 17
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/RecentActivity/nbproject/project.xml b/RecentActivity/nbproject/project.xml
index e3559b4155b177e2f854d5835d9a8c983e74eef5..70c6b42471a2fb61acfbb7c83fea8cd6cc5c1e44 100644
--- a/RecentActivity/nbproject/project.xml
+++ b/RecentActivity/nbproject/project.xml
@@ -63,6 +63,24 @@
<specification-version>10.7</specification-version>
</run-dependency>
</dependency>
+ <dependency>
+ <code-name-base>org.sleuthkit.autopsy.corelibs</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>3</release-version>
+ <specification-version>1.1</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.sleuthkit.autopsy.keywordsearch</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>6</release-version>
+ <specification-version>6.3</specification-version>
+ </run-dependency>
+ </dependency>
</module-dependencies>
<public-packages>
<package>org.sleuthkit.autopsy.recentactivity</package>
diff --git a/Testing/manifest.mf b/Testing/manifest.mf
index 51d75b7ab63b721e6560c329b56505fcd9b0e6c4..e6829a2a04341120810c17d03b81587f5899ca97 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: 9
+OpenIDE-Module-Implementation-Version: 10
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/testing/Bundle.properties