Upgrade:

- tomcat to v9.0.86; - java to v11.0.22+7; - mysql server to v8.0.36; Downgrade: - Scada-LTS v2.6.18;
SCADA-LTS · Mar 22, 2024 · 98c40c0 · 98c40c0
1 parent 48ac3cf
commit 98c40c0
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 5 deletions.
diff --git a/mysql_start.sh b/mysql_start.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 MYSQL_MAJOR_VERSION=8
 MYSQL_MINOR_VERSION=0
-MYSQL_PATCH_VERSION=33
+MYSQL_PATCH_VERSION=36
 
 INSTALLER_HOME=$(dirname "$(realpath "$0")")
 MYSQL_BASE="${INSTALLER_HOME}/mysql"
@@ -14,7 +14,7 @@ BINDIR="$MYSQL_HOME/bin"
 MYSQLD_PID="$DATADIR/mysqld.pid"
 
 #Java
-JAVA_VERSION="11.0.19"
+JAVA_VERSION="11.0.22"
 JAVA_UPDATE=7
 MACHINE_TYPE=`uname -m`
 INSTALLER_HOME=$(dirname "$(realpath "$0")")

diff --git a/tomcat64/Scada-LTS.war → tomcat/Scada-LTS.war b/tomcat64/Scada-LTS.war → tomcat/Scada-LTS.war
diff --git a/tomcat64/context.xml → tomcat/context.xml b/tomcat64/context.xml → tomcat/context.xml
diff --git a/tomcat64/lib/activation.jar → tomcat/lib/activation.jar b/tomcat64/lib/activation.jar → tomcat/lib/activation.jar
diff --git a/tomcat64/lib/jaxb-api-2.4.0-b180830.0359.jar → tomcat/lib/jaxb-api-2.4.0-b180830.0359.jar b/tomcat64/lib/jaxb-api-2.4.0-b180830.0359.jar → tomcat/lib/jaxb-api-2.4.0-b180830.0359.jar
diff --git a/tomcat64/lib/jaxb-core-3.0.2.jar → tomcat/lib/jaxb-core-3.0.2.jar b/tomcat64/lib/jaxb-core-3.0.2.jar → tomcat/lib/jaxb-core-3.0.2.jar
diff --git a/...4/lib/jaxb-runtime-2.4.0-b180830.0438.jar → ...t/lib/jaxb-runtime-2.4.0-b180830.0438.jar b/...4/lib/jaxb-runtime-2.4.0-b180830.0438.jar → ...t/lib/jaxb-runtime-2.4.0-b180830.0438.jar
diff --git a/tomcat64/lib/mysql-connector-java-5.1.49.jar → tomcat/lib/mysql-connector-java-5.1.49.jar b/tomcat64/lib/mysql-connector-java-5.1.49.jar → tomcat/lib/mysql-connector-java-5.1.49.jar
diff --git a/tomcat64/replace-1.0.jar → tomcat/replace-1.0.jar b/tomcat64/replace-1.0.jar → tomcat/replace-1.0.jar
diff --git a/tomcat64/setenv.sh → tomcat/setenv.sh b/tomcat64/setenv.sh → tomcat/setenv.sh
diff --git a/tomcat64/tomcat_config.sh → tomcat/tomcat_config.sh b/tomcat64/tomcat_config.sh → tomcat/tomcat_config.sh
diff --git a/tomcat64/tomcat_install.sh → tomcat/tomcat_install.sh b/tomcat64/tomcat_install.sh → tomcat/tomcat_install.sh
diff --git a/tomcat_start.sh b/tomcat_start.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
-JAVA_VERSION="11.0.19"
+JAVA_VERSION="11.0.22"
 JAVA_UPDATE=7
 
 TOMCAT_MAJOR_VERSION=9
 TOMCAT_MINOR_VERSION=0
-TOMCAT_PATCH_VERSION=76
+TOMCAT_PATCH_VERSION=86
 TOMCAT_VERSION="${TOMCAT_MAJOR_VERSION}.${TOMCAT_MINOR_VERSION}.${TOMCAT_PATCH_VERSION}"
 MACHINE_TYPE=`uname -m`
 
 INSTALLER_HOME=$(dirname "$(realpath "$0")")
 JAVA_BASE="${INSTALLER_HOME}/java"
-CATALINA_BASE="${INSTALLER_HOME}/tomcat64"
+CATALINA_BASE="${INSTALLER_HOME}/tomcat"
 JDK_BASE="${JAVA_BASE}/jdk"
 
 if [ ${MACHINE_TYPE} == 'arm64' ]; then