diff --git a/.gitignore b/.gitignore
index faa1b92a945d5aa98e91272211df022525c4ff68..20b24939bf017eda2e6e7dcea46fbe17fd6aa8df 100755
--- a/.gitignore
+++ b/.gitignore
@@ -69,6 +69,7 @@ genfiles.properties
*~
/netbeans-plat
/docs/doxygen-user/user-docs
+/docs/doxygen-dev/build-docs
/jdiff-javadocs/*
/jdiff-logs/*
/gen_version.txt
diff --git a/Core/manifest.mf b/Core/manifest.mf
index da946df7b83fd630714fd3dbd87abcfb15336bfe..9225bd195e7c5280077e60800f8f82f749a3cb49 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: 34
+OpenIDE-Module-Implementation-Version: 35
OpenIDE-Module-Requires: org.openide.windows.WindowManager
AutoUpdate-Show-In-Client: true
AutoUpdate-Essential-Module: true
diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index cd50517eab9e8233d8c350f9888305e71952d84e..59ce5ec683d7bee8253fdcd62d9741e9a423c5f7 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -108,8 +108,8 @@ file.reference.protobuf-java-util-3.7.0.jar=release\\modules\\ext\\protobuf-java
file.reference.Rejistry-1.1-SNAPSHOT.jar=release\\modules\\ext\\Rejistry-1.1-SNAPSHOT.jar
file.reference.sevenzipjbinding-AllPlatforms.jar=release\\modules\\ext\\sevenzipjbinding-AllPlatforms.jar
file.reference.sevenzipjbinding.jar=release\\modules\\ext\\sevenzipjbinding.jar
-file.reference.sleuthkit-4.10.1.jar=release/modules/ext/sleuthkit-4.10.1.jar
-file.reference.sleuthkit-caseuco-4.10.1.jar=release/modules/ext/sleuthkit-caseuco-4.10.1.jar
+file.reference.sleuthkit-4.10.2.jar=release/modules/ext/sleuthkit-4.10.2.jar
+file.reference.sleuthkit-caseuco-4.10.2.jar=release/modules/ext/sleuthkit-caseuco-4.10.2.jar
file.reference.slf4j-api-1.7.6.jar=release\\modules\\ext\\slf4j-api-1.7.6.jar
file.reference.slf4j-log4j12-1.7.6.jar=release\\modules\\ext\\slf4j-log4j12-1.7.6.jar
file.reference.SparseBitSet-1.1.jar=release\\modules\\ext\\SparseBitSet-1.1.jar
@@ -127,4 +127,4 @@ nbm.homepage=http://www.sleuthkit.org/
nbm.module.author=Brian Carrier
nbm.needs.restart=true
source.reference.curator-recipes-2.8.0.jar=release/modules/ext/curator-recipes-2.8.0-sources.jar
-spec.version.base=10.22
+spec.version.base=10.23
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index 074d930725212177241972bd730ae7ef503ad3ef..a3c524ca7dff4e3644485542c06cd586a10299da 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -674,8 +674,8 @@
<binary-origin>release\modules\ext\grpc-alts-1.19.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/sleuthkit-caseuco-4.10.1.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/sleuthkit-caseuco-4.10.1.jar</binary-origin>
+ <runtime-relative-path>ext/sleuthkit-caseuco-4.10.2.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/sleuthkit-caseuco-4.10.2.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jdom-2.0.5.jar</runtime-relative-path>
@@ -798,8 +798,8 @@
<binary-origin>release\modules\ext\sevenzipjbinding-AllPlatforms.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/sleuthkit-4.10.1.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/sleuthkit-4.10.1.jar</binary-origin>
+ <runtime-relative-path>ext/sleuthkit-4.10.2.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/sleuthkit-4.10.2.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jutf7-1.0.0.jar</runtime-relative-path>
diff --git a/Experimental/manifest.mf b/Experimental/manifest.mf
index 15ed8c19f7c68de25b7534990a897223fc5c3bf4..ddddfe9c5822455aeae745941d96b4703ee39686 100644
--- a/Experimental/manifest.mf
+++ b/Experimental/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: true
-OpenIDE-Module: org.sleuthkit.autopsy.experimental
+OpenIDE-Module: org.sleuthkit.autopsy.experimental/1
+OpenIDE-Module-Implementation-Version: 1
OpenIDE-Module-Layer: org/sleuthkit/autopsy/experimental/autoingest/layer.xml
OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties
OpenIDE-Module-Requires: org.openide.windows.WindowManager
-OpenIDE-Module-Specification-Version: 1.0
\ No newline at end of file
diff --git a/Experimental/nbproject/project.properties b/Experimental/nbproject/project.properties
index 731535afff4a84ae34f4ca4ff1cf7ebe9cde2be5..0df575faba3fb02c0142c9601aad16255f50bfad 100644
--- a/Experimental/nbproject/project.properties
+++ b/Experimental/nbproject/project.properties
@@ -8,3 +8,4 @@ javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
javadoc.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1-javadoc.jar
source.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1-sources.jar
+spec.version.base=1.0
diff --git a/Experimental/nbproject/project.xml b/Experimental/nbproject/project.xml
index 3259799a2a9f87f4007330d521c0e47707017421..41343b8d2309e4fac96bb790ecbe324c06739804 100644
--- a/Experimental/nbproject/project.xml
+++ b/Experimental/nbproject/project.xml
@@ -144,7 +144,7 @@
<compile-dependency/>
<run-dependency>
<release-version>10</release-version>
- <specification-version>10.22</specification-version>
+ <specification-version>10.23</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git a/ImageGallery/nbproject/project.xml b/ImageGallery/nbproject/project.xml
index 569fe45afcf581bee49db3ed52fe937ba54b89bb..61f94648d41601767bd02ff0cf172bfcede156c9 100644
--- a/ImageGallery/nbproject/project.xml
+++ b/ImageGallery/nbproject/project.xml
@@ -127,7 +127,7 @@
<compile-dependency/>
<run-dependency>
<release-version>10</release-version>
- <specification-version>10.22</specification-version>
+ <specification-version>10.23</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index 618855997ef5f2ad394f5bcb18b6a5171d688cba..c94da5eb380905630160e50827d9986ee2b7255a 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -128,7 +128,7 @@
<compile-dependency/>
<run-dependency>
<release-version>10</release-version>
- <specification-version>10.22</specification-version>
+ <specification-version>10.23</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git a/RecentActivity/nbproject/project.xml b/RecentActivity/nbproject/project.xml
index 5ebd78e0cdef2a3321f265f4a78ffcac1723ccdf..af8c2edace68d6a0b8b52f08a71e4978cafa5baf 100644
--- a/RecentActivity/nbproject/project.xml
+++ b/RecentActivity/nbproject/project.xml
@@ -60,7 +60,7 @@
<compile-dependency/>
<run-dependency>
<release-version>10</release-version>
- <specification-version>10.22</specification-version>
+ <specification-version>10.23</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git a/TSKVersion.xml b/TSKVersion.xml
index 106dd8f94f1b9bf9e4c413ff65ae217cc0113ffb..c0fece937305cc709e7f8408809bc725865aa75f 100644
--- a/TSKVersion.xml
+++ b/TSKVersion.xml
@@ -1,3 +1,3 @@
<project name="TSK_VERSION">
- <property name="TSK_VERSION" value="4.10.1"/>
+ <property name="TSK_VERSION" value="4.10.2"/>
</project>
diff --git a/Testing/nbproject/project.xml b/Testing/nbproject/project.xml
index 0e02fc1fbaab75faf60da7879ab9228a8bc1344d..acf97c4ddfc16d77ed9cb39de4ba9422c602515f 100644
--- a/Testing/nbproject/project.xml
+++ b/Testing/nbproject/project.xml
@@ -47,7 +47,7 @@
<compile-dependency/>
<run-dependency>
<release-version>10</release-version>
- <specification-version>10.22</specification-version>
+ <specification-version>10.23</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git a/thunderbirdparser/nbproject/project.xml b/thunderbirdparser/nbproject/project.xml
index 94e45a2cc8d23cd98ca5d97716d0d4c202ccd73b..9a1249b6972db25be99561ed003d3efa5b2c56c0 100644
--- a/thunderbirdparser/nbproject/project.xml
+++ b/thunderbirdparser/nbproject/project.xml
@@ -54,7 +54,7 @@
<compile-dependency/>
<run-dependency>
<release-version>10</release-version>
- <specification-version>10.22</specification-version>
+ <specification-version>10.23</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git a/unix_setup.sh b/unix_setup.sh
index 63e2daee9a9515157d1abfaee5363a747363fcad..93a5eb4bea8526de477992347f104785a0d407e0 100644
--- a/unix_setup.sh
+++ b/unix_setup.sh
@@ -5,7 +5,7 @@
# NOTE: update_sleuthkit_version.pl updates this value and relies
# on it keeping the same name and whitespace. Don't change it.
-TSK_VERSION=4.10.1
+TSK_VERSION=4.10.2
# In the beginning...