Merge branch 'release/5.2.231215'

inspec-tests/controls/service.rb

@@ -100,7 +100,7 @@
     its('body') { should match(input('firstspirit_version_short').to_s) }
   end
 
-  describe command(' cat /opt/firstspirit5/log/fs-wrapper.log | grep "INFO: init servlet FSServlet - FirstSpirit" | sed \'s/.*FirstSpirit \([0-9]*\.[0-9]*\.[0-9]*\).*/\1/\'') do
+  describe command(' cat /opt/firstspirit5/log/fs-server.log | grep "FirstSpirit Server Version" | sed -E \'s/.*Version ([0-9.]+)\.[0-9]+.*/\1/\'') do
     its('stdout') { should match(input('firstspirit_version').to_s) }
   end
-end
+end

jdk17/Dockerfile

@@ -1,14 +1,14 @@
-ARG IMAGE_CREATED="2024-09-06T14:00:00CEST"
-ARG IMAGE_VERSION="5.2.231107"
-ARG IMAGE_VERSION_SHORT="2023.11"
-ARG IMAGE_VERSION_HASH="3e892df1"
-ARG IMAGE_VERSION_INSTALL="3.0.6"
+ARG IMAGE_CREATED="2023-11-22T14:00:00CEST"
+ARG IMAGE_VERSION="5.2.231215"
+ARG IMAGE_VERSION_SHORT="2023.12"
+ARG IMAGE_VERSION_HASH="2805ad3c"
+ARG IMAGE_VERSION_INSTALL="3.0.7"
 
 ARG FS_DOWNLOAD_SERVER
 ARG FS_DOWNLOAD_SERVER_USERNAME
 ARG FS_DOWNLOAD_SERVER_PASSWORD
 ARG FS_DOWNLOAD_SERVER_NAME="fs-isolated-server.jar"
-ARG FS_DOWNLOAD_INSTALL_NAME="fs-install-3.0.5.tar.gz"
+ARG FS_DOWNLOAD_INSTALL_NAME="fs-install-3.0.7.tar.gz"
 ARG FS_BASE_DIRECTORY="/opt/firstspirit5"
 ARG FS_INSTALL_DIRECTORY="/install/firstspirit5"
 ARG FS_DEBUG_PORT="*:8585"
@@ -112,4 +112,4 @@ ARG FS_DEBUG_PORT
 ENV FS_DEBUGPORT=${FS_DEBUG_PORT}
 
 RUN sed -i '/wrapper.java.additional.85/c\wrapper.java.additional.85=-Xdebug' ${FS_INSTALL_DIRECTORY}/conf/fs-wrapper.isolated.conf &&\
-    sed -i "/wrapper.java.additional.86/c\wrapper.java.additional.86=-Xrunjdwp:transport=dt_socket,address=$FS_DEBUGPORT,server=y,suspend=n" ${FS_INSTALL_DIRECTORY}/conf/fs-wrapper.isolated.conf
+    sed -i "/wrapper.java.additional.86/c\wrapper.java.additional.86=-Xrunjdwp:transport=dt_socket,address=$FS_DEBUGPORT,server=y,suspend=n" ${FS_INSTALL_DIRECTORY}/conf/fs-wrapper.isolated.conf