diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index 563d49c7f8e8cbc75c038a5d8e54d1844ba36b1d..4c9bd7c95d61ade41d2d2ce0e2603f695569d931 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -14,7 +14,7 @@ <!-- for viewers --> <dependency conf="autopsy_core->*" org="org.freedesktop.gstreamer" name="gst1-java-core" rev="1.0.0"/> - <dependency conf="autopsy_core->*" org="net.java.dev.jna" name="jna-platform" rev="5.9.0"/> + <dependency conf="autopsy_core->*" org="net.java.dev.jna" name="jna-platform" rev="5.10.0"/> <!-- for file search --> <dependency conf="autopsy_core->*" org="com.github.lgooddatepicker" name="LGoodDatePicker" rev="10.3.1"/> diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index e9a54d6d1e9503748e86172a86b0d834a25f58ee..65e740fc47bed0e9982989d3f50c79e1caf577da 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -42,8 +42,8 @@ file.reference.javassist-3.12.1.GA.jar=release/modules/ext/javassist-3.12.1.GA.j file.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4.jar file.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4.jar file.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4.jar -file.reference.jna-5.9.0.jar=release/modules/ext/jna-5.9.0.jar -file.reference.jna-platform-5.9.0.jar=release/modules/ext/jna-platform-5.9.0.jar +file.reference.jna-5.10.0.jar=release/modules/ext/jna-5.10.0.jar +file.reference.jna-platform-5.10.0.jar=release/modules/ext/jna-platform-5.10.0.jar file.reference.joda-time-2.4.jar=release/modules/ext/joda-time-2.4.jar file.reference.jsr305-1.3.9.jar=release/modules/ext/jsr305-1.3.9.jar file.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1.jar diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index b26152055f72b74efc0bfb298bcecf96f4615287..8bc464da72f7f78aeeb906577d70fc12b60ce7c0 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -923,8 +923,8 @@ <binary-origin>release/modules/ext/commons-compress-1.18.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/jna-platform-5.9.0.jar</runtime-relative-path> - <binary-origin>release\modules\ext\jna-platform-5.9.0.jar</binary-origin> + <runtime-relative-path>ext/jna-platform-5.10.0.jar</runtime-relative-path> + <binary-origin>release\modules\ext\jna-platform-5.10.0.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/opencv-248.jar</runtime-relative-path> @@ -951,8 +951,8 @@ <binary-origin>release/modules/ext/imageio-bmp-3.2.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/jna-5.9.0.jar</runtime-relative-path> - <binary-origin>release\modules\ext\jna-5.9.0.jar</binary-origin> + <runtime-relative-path>ext/jna-5.10.0.jar</runtime-relative-path> + <binary-origin>release\modules\ext\jna-5.10.0.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/commons-lang-2.6.jar</runtime-relative-path> diff --git a/KeywordSearch/solr/server/lib/ext/log4j-1.2-api-2.13.2.jar b/KeywordSearch/solr/server/lib/ext/log4j-1.2-api-2.13.2.jar deleted file mode 100755 index d0e6b7fffed17568ec193fac4d351421587d3a6e..0000000000000000000000000000000000000000 Binary files a/KeywordSearch/solr/server/lib/ext/log4j-1.2-api-2.13.2.jar and /dev/null differ diff --git a/KeywordSearch/solr/server/lib/ext/log4j-1.2-api-2.15.0.jar b/KeywordSearch/solr/server/lib/ext/log4j-1.2-api-2.15.0.jar new file mode 100755 index 0000000000000000000000000000000000000000..03c6466f8708f90a0859c360f595e9ccb51d8df3 Binary files /dev/null and b/KeywordSearch/solr/server/lib/ext/log4j-1.2-api-2.15.0.jar differ diff --git a/KeywordSearch/solr/server/lib/ext/log4j-api-2.13.2.jar b/KeywordSearch/solr/server/lib/ext/log4j-api-2.13.2.jar deleted file mode 100755 index afc89ff0d588806a99993909014c260116ef19c4..0000000000000000000000000000000000000000 Binary files a/KeywordSearch/solr/server/lib/ext/log4j-api-2.13.2.jar and /dev/null differ diff --git a/KeywordSearch/solr/server/lib/ext/log4j-api-2.15.0.jar b/KeywordSearch/solr/server/lib/ext/log4j-api-2.15.0.jar new file mode 100755 index 0000000000000000000000000000000000000000..77f6b2bef41351590d6abd62f16b13d818a9be69 Binary files /dev/null and b/KeywordSearch/solr/server/lib/ext/log4j-api-2.15.0.jar differ diff --git a/KeywordSearch/solr/server/lib/ext/log4j-core-2.13.2.jar b/KeywordSearch/solr/server/lib/ext/log4j-core-2.13.2.jar deleted file mode 100755 index 9b6bdff8e2c392fe8adcf1eb04c6e50d549326ce..0000000000000000000000000000000000000000 Binary files a/KeywordSearch/solr/server/lib/ext/log4j-core-2.13.2.jar and /dev/null differ diff --git a/KeywordSearch/solr/server/lib/ext/log4j-core-2.15.0.jar b/KeywordSearch/solr/server/lib/ext/log4j-core-2.15.0.jar new file mode 100755 index 0000000000000000000000000000000000000000..5d6a73a65473e02884f412e0414dd8b4f6a663ce Binary files /dev/null and b/KeywordSearch/solr/server/lib/ext/log4j-core-2.15.0.jar differ diff --git a/KeywordSearch/solr/server/lib/ext/log4j-slf4j-impl-2.13.2.jar b/KeywordSearch/solr/server/lib/ext/log4j-slf4j-impl-2.13.2.jar deleted file mode 100755 index 19e257cae8f550a8b2dfd7dcd9036f6ed284d521..0000000000000000000000000000000000000000 Binary files a/KeywordSearch/solr/server/lib/ext/log4j-slf4j-impl-2.13.2.jar and /dev/null differ diff --git a/KeywordSearch/solr/server/lib/ext/log4j-slf4j-impl-2.15.0.jar b/KeywordSearch/solr/server/lib/ext/log4j-slf4j-impl-2.15.0.jar new file mode 100755 index 0000000000000000000000000000000000000000..8d30d8f8d4fd7acece1f85f8ebe7c196c0b553fe Binary files /dev/null and b/KeywordSearch/solr/server/lib/ext/log4j-slf4j-impl-2.15.0.jar differ diff --git a/KeywordSearch/solr/server/lib/ext/log4j-web-2.13.2.jar b/KeywordSearch/solr/server/lib/ext/log4j-web-2.13.2.jar deleted file mode 100755 index c96dc2e23884cd01f45ff4128350f090988d8579..0000000000000000000000000000000000000000 Binary files a/KeywordSearch/solr/server/lib/ext/log4j-web-2.13.2.jar and /dev/null differ diff --git a/KeywordSearch/solr/server/lib/ext/log4j-web-2.15.0.jar b/KeywordSearch/solr/server/lib/ext/log4j-web-2.15.0.jar new file mode 100755 index 0000000000000000000000000000000000000000..a4db2470413cfa13936412ae7deecc656e01caca Binary files /dev/null and b/KeywordSearch/solr/server/lib/ext/log4j-web-2.15.0.jar differ diff --git a/nbproject/project.properties b/nbproject/project.properties index 872c92042abbb5781affddc543bacdaaa5e9d464..630ba24c215768f930f71373513a8cb0b6666c02 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -4,10 +4,10 @@ app.title=Autopsy ### lowercase version of above app.name=${branding.token} ### if left unset, version will default to today's date -app.version=4.19.2 +app.version=4.19.3 ### build.type must be one of: DEVELOPMENT, RELEASE -#build.type=RELEASE -build.type=DEVELOPMENT +build.type=RELEASE +#build.type=DEVELOPMENT project.org.netbeans.progress=org-netbeans-api-progress project.org.sleuthkit.autopsy.experimental=Experimental