Merge pull request #2033 from sleuthkit/develop

Merge develop into release-4.10.1

case-uco/java/nbproject/project.properties

@@ -35,14 +35,14 @@ dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
 file.reference.gson-2.8.5.jar=lib/gson-2.8.5.jar
-file.reference.sleuthkit-4.10.1.jar=lib/sleuthkit-4.10.1.jar
+file.reference.sleuthkit-4.10.1.jar=lib/sleuthkit-4.10.1.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
 jar.index=${jnlp.enabled}
 javac.classpath=\
     ${file.reference.gson-2.8.5.jar}:\
-${file.reference.sleuthkit-4.10.1.jar}
+    ${file.reference.sleuthkit-4.10.1.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint
 javac.deprecation=false
@@ -63,6 +63,7 @@ javac.test.processorpath=\
 javadoc.additionalparam=
 javadoc.author=false
 javadoc.encoding=${source.encoding}
+javadoc.html5=false
 javadoc.noindex=false
 javadoc.nonavbar=false
 javadoc.notree=false
@@ -71,6 +72,8 @@ javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
+jlink.launcher=false
+jlink.launcher.name=SleuthkitCaseUco
 jnlp.codebase.type=no.codebase
 jnlp.descriptor=application
 jnlp.enabled=false