SCADA-LTS
diff --git a/‎mysql_start.sh‎
Lines changed: 2 additions & 2 deletions b/‎mysql_start.sh‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎tomcat64/Scada-LTS.war‎ ‎tomcat/Scada-LTS.war‎tomcat64/Scada-LTS.war renamed to tomcat/Scada-LTS.war b/‎tomcat64/Scada-LTS.war‎ ‎tomcat/Scada-LTS.war‎tomcat64/Scada-LTS.war renamed to tomcat/Scada-LTS.war
diff --git a/‎tomcat64/context.xml‎ ‎tomcat/context.xml‎tomcat64/context.xml renamed to tomcat/context.xml b/‎tomcat64/context.xml‎ ‎tomcat/context.xml‎tomcat64/context.xml renamed to tomcat/context.xml
diff --git a/‎tomcat64/lib/activation.jar‎ ‎tomcat/lib/activation.jar‎tomcat64/lib/activation.jar renamed to tomcat/lib/activation.jar b/‎tomcat64/lib/activation.jar‎ ‎tomcat/lib/activation.jar‎tomcat64/lib/activation.jar renamed to tomcat/lib/activation.jar
diff --git a/‎…at64/lib/jaxb-api-2.4.0-b180830.0359.jar‎ ‎…mcat/lib/jaxb-api-2.4.0-b180830.0359.jar‎tomcat64/lib/jaxb-api-2.4.0-b180830.0359.jar renamed to tomcat/lib/jaxb-api-2.4.0-b180830.0359.jar b/‎…at64/lib/jaxb-api-2.4.0-b180830.0359.jar‎ ‎…mcat/lib/jaxb-api-2.4.0-b180830.0359.jar‎tomcat64/lib/jaxb-api-2.4.0-b180830.0359.jar renamed to 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‎tomcat64/lib/jaxb-core-3.0.2.jar renamed to 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‎tomcat64/lib/jaxb-core-3.0.2.jar renamed to tomcat/lib/jaxb-core-3.0.2.jar
diff --git a/‎…/lib/jaxb-runtime-2.4.0-b180830.0438.jar‎ ‎…/lib/jaxb-runtime-2.4.0-b180830.0438.jar‎tomcat64/lib/jaxb-runtime-2.4.0-b180830.0438.jar renamed to tomcat/lib/jaxb-runtime-2.4.0-b180830.0438.jar b/‎…/lib/jaxb-runtime-2.4.0-b180830.0438.jar‎ ‎…/lib/jaxb-runtime-2.4.0-b180830.0438.jar‎tomcat64/lib/jaxb-runtime-2.4.0-b180830.0438.jar renamed to tomcat/lib/jaxb-runtime-2.4.0-b180830.0438.jar
diff --git a/‎…at64/lib/mysql-connector-java-5.1.49.jar‎ ‎…mcat/lib/mysql-connector-java-5.1.49.jar‎tomcat64/lib/mysql-connector-java-5.1.49.jar renamed to tomcat/lib/mysql-connector-java-5.1.49.jar b/‎…at64/lib/mysql-connector-java-5.1.49.jar‎ ‎…mcat/lib/mysql-connector-java-5.1.49.jar‎tomcat64/lib/mysql-connector-java-5.1.49.jar renamed to tomcat/lib/mysql-connector-java-5.1.49.jar
diff --git a/‎tomcat64/replace-1.0.jar‎ ‎tomcat/replace-1.0.jar‎tomcat64/replace-1.0.jar renamed to tomcat/replace-1.0.jar b/‎tomcat64/replace-1.0.jar‎ ‎tomcat/replace-1.0.jar‎tomcat64/replace-1.0.jar renamed to tomcat/replace-1.0.jar
diff --git a/‎tomcat64/setenv.sh‎ ‎tomcat/setenv.sh‎tomcat64/setenv.sh renamed to tomcat/setenv.sh b/‎tomcat64/setenv.sh‎ ‎tomcat/setenv.sh‎tomcat64/setenv.sh renamed to tomcat/setenv.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")")