This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.20 by this push:
new a7c2a059f5d Update mysql java connector version to 8.4.0 (matching
version for MySQL 8.4) (#12640)
a7c2a059f5d is described below
commit a7c2a059f5d7517db78310bab48dcb2a6acd0924
Author: Suresh Kumar Anaparti <[email protected]>
AuthorDate: Mon May 4 14:47:27 2026 +0530
Update mysql java connector version to 8.4.0 (matching version for MySQL
8.4) (#12640)
* MySQL 8.4 support / update mysql java connector version to 8.4.0
* Remove separate connector version
* Update cloud spec
* Update authentication plugin to caching_sha2_password
(mysql_native_password is deprecated)
---
.github/workflows/ci.yml | 2 +-
engine/storage/snapshot/pom.xml | 4 ++--
framework/db/pom.xml | 4 ++--
packaging/systemd/cloudstack-management.default | 2 +-
packaging/systemd/cloudstack-usage.default | 2 +-
plugins/network-elements/globodns/pom.xml | 4 ++--
plugins/network-elements/tungsten/pom.xml | 4 ++--
pom.xml | 12 +++---------
setup/db/deploy-db-dev.sh | 5 +++--
tools/docker/Dockerfile | 2 +-
tools/marvin/setup.py | 2 +-
usage/src/main/java/com/cloud/usage/UsageSanityChecker.java | 2 +-
12 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1c64df86cba..efd71b5da5d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -278,7 +278,7 @@ jobs:
#
https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2004-Readme.md#mysql
sudo apt-get install -y mysql-server
sudo systemctl start mysql
- sudo mysql -uroot -proot -e "ALTER USER 'root'@'localhost'
IDENTIFIED WITH mysql_native_password BY ''; FLUSH PRIVILEGES;"
+ sudo mysql -uroot -proot -e "ALTER USER 'root'@'localhost'
IDENTIFIED WITH caching_sha2_password BY ''; FLUSH PRIVILEGES;"
sudo systemctl restart mysql
sudo mysql -uroot -e "SELECT VERSION();"
diff --git a/engine/storage/snapshot/pom.xml b/engine/storage/snapshot/pom.xml
index a6db00995c2..523d82e4565 100644
--- a/engine/storage/snapshot/pom.xml
+++ b/engine/storage/snapshot/pom.xml
@@ -57,8 +57,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/framework/db/pom.xml b/framework/db/pom.xml
index a71e467a23b..1e83e2f9b93 100644
--- a/framework/db/pom.xml
+++ b/framework/db/pom.xml
@@ -53,8 +53,8 @@
<artifactId>commons-pool2</artifactId>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
diff --git a/packaging/systemd/cloudstack-management.default
b/packaging/systemd/cloudstack-management.default
index 994a1ee8699..a41338beda6 100644
--- a/packaging/systemd/cloudstack-management.default
+++ b/packaging/systemd/cloudstack-management.default
@@ -17,7 +17,7 @@
JAVA_OPTS="-Djava.security.properties=/etc/cloudstack/management/java.security.ciphers
-Djava.awt.headless=true -Xmx2G -XX:+UseParallelGC -XX:MaxGCPauseMillis=500
-XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=/var/log/cloudstack/management/
-XX:ErrorFile=/var/log/cloudstack/management/cloudstack-management.err
--add-opens=java.base/java.lang=ALL-UNNAMED
--add-exports=java.base/sun.security.x509=ALL-UNNAMED"
-CLASSPATH="/usr/share/cloudstack-management/lib/*:/etc/cloudstack/management:/usr/share/cloudstack-common:/usr/share/cloudstack-management/setup:/usr/share/cloudstack-management:/usr/share/java/mysql-connector-java.jar:/usr/share/cloudstack-mysql-ha/lib/*"
+CLASSPATH="/usr/share/cloudstack-management/lib/*:/etc/cloudstack/management:/usr/share/cloudstack-common:/usr/share/cloudstack-management/setup:/usr/share/cloudstack-management:/usr/share/cloudstack-mysql-ha/lib/*"
BOOTSTRAP_CLASS=org.apache.cloudstack.ServerDaemon
diff --git a/packaging/systemd/cloudstack-usage.default
b/packaging/systemd/cloudstack-usage.default
index 493f40c277a..36b71ac3e0d 100644
--- a/packaging/systemd/cloudstack-usage.default
+++ b/packaging/systemd/cloudstack-usage.default
@@ -17,7 +17,7 @@
JAVA_OPTS="-Xms256m -Xmx2048m --add-opens=java.base/java.lang=ALL-UNNAMED"
-CLASSPATH="/usr/share/cloudstack-usage/*:/usr/share/cloudstack-usage/lib/*:/usr/share/cloudstack-mysql-ha/lib/*:/etc/cloudstack/usage:/usr/share/java/mysql-connector-java.jar"
+CLASSPATH="/usr/share/cloudstack-usage/*:/usr/share/cloudstack-usage/lib/*:/usr/share/cloudstack-mysql-ha/lib/*:/etc/cloudstack/usage"
JAVA_CLASS=com.cloud.usage.UsageServer
diff --git a/plugins/network-elements/globodns/pom.xml
b/plugins/network-elements/globodns/pom.xml
index 8aeb86bf7ee..abe8fc0d186 100644
--- a/plugins/network-elements/globodns/pom.xml
+++ b/plugins/network-elements/globodns/pom.xml
@@ -33,8 +33,8 @@
<artifactId>globodns-client</artifactId>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/plugins/network-elements/tungsten/pom.xml
b/plugins/network-elements/tungsten/pom.xml
index b71609e7a25..5038d51fa3d 100644
--- a/plugins/network-elements/tungsten/pom.xml
+++ b/plugins/network-elements/tungsten/pom.xml
@@ -41,8 +41,8 @@
<artifactId>reload4j</artifactId>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 3843dc6817c..e5d7d3e5775 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,7 +170,7 @@
<cs.libvirt-java.version>0.5.3</cs.libvirt-java.version>
<cs.mail.version>1.5.0-b01</cs.mail.version>
<cs.mustache.version>0.9.14</cs.mustache.version>
- <cs.mysql.version>8.0.33</cs.mysql.version>
+ <cs.mysql.version>8.4.0</cs.mysql.version>
<cs.neethi.version>2.0.4</cs.neethi.version>
<cs.nitro.version>10.1</cs.nitro.version>
<cs.opensaml.version>2.6.6</cs.opensaml.version>
@@ -465,8 +465,8 @@
<version>${cs.reload4j.version}</version>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
<version>${cs.mysql.version}</version>
<scope>test</scope>
</dependency>
@@ -481,12 +481,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.mysql</groupId>
- <artifactId>mysql-connector-j</artifactId>
- <version>${cs.mysql.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
diff --git a/setup/db/deploy-db-dev.sh b/setup/db/deploy-db-dev.sh
index 7896276f8f9..4e0814e0c3f 100755
--- a/setup/db/deploy-db-dev.sh
+++ b/setup/db/deploy-db-dev.sh
@@ -104,9 +104,10 @@ CP=./
CP=${CP}$PATHSEP$CATALINA_HOME/conf
-# Add mysql jar from mysql-connector-java package to CP
+# Add mysql jar from mysql-connector-j package to CP
# for Jenkins
-CP=${CP}${PATHSEP}/usr/share/java/mysql-connector-java.jar
+MYSQL_CONNECTOR_VERSION = '8.4.0'
+CP=${CP}${PATHSEP}/usr/share/java/mysql-connector-j-${MYSQL_CONNECTOR_VERSION}.jar
for file in $CATALINA_HOME/webapps/client/WEB-INF/lib/*.jar
do
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 7b617249baa..8e7e43b842f 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -58,7 +58,7 @@ RUN mvn -Pdeveloper -Dsimulator -DskipTests clean install
RUN find /var/lib/mysql -type f -exec touch {} \; && \
(/usr/bin/mysqld_safe &) && \
sleep 5; \
- mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH
mysql_native_password by ''" --connect-expired-password; \
+ mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH
caching_sha2_password by ''" --connect-expired-password; \
mvn -Pdeveloper -pl developer -Ddeploydb; \
mvn -Pdeveloper -pl developer -Ddeploydb-simulator; \
MARVIN_FILE=`find /root/tools/marvin/dist/ -name "Marvin*.tar.gz"`; \
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index c7f58131f16..919b544d133 100644
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@ -46,7 +46,7 @@ setup(name="Marvin",
"marvin.sandbox.basic"],
license="LICENSE.txt",
install_requires=[
- "mysql-connector-python <= 8.0.30",
+ "mysql-connector-python <= 8.4.0",
"requests >= 2.2.1",
"paramiko >= 1.13.0",
"nose >= 1.3.3",
diff --git a/usage/src/main/java/com/cloud/usage/UsageSanityChecker.java
b/usage/src/main/java/com/cloud/usage/UsageSanityChecker.java
index d5dee9b00bc..77f626246cc 100644
--- a/usage/src/main/java/com/cloud/usage/UsageSanityChecker.java
+++ b/usage/src/main/java/com/cloud/usage/UsageSanityChecker.java
@@ -289,7 +289,7 @@ public class UsageSanityChecker {
}
/**
- * usage something like: /usr/bin/java -Xmx2G -cp
/usr/share/cloudstack-usage/*:/usr/share/cloudstack-usage/lib/*:/usr/share/cloudstack-mysql-ha/lib/*:/etc/cloudstack/usage:/usr/share/java/mysql-connector-java.jar:/usr/share/cloudstack-common
com.cloud.usage.UsageSanityChecker
+ * usage something like: /usr/bin/java -Xmx2G -cp
/usr/share/cloudstack-usage/*:/usr/share/cloudstack-usage/lib/*:/usr/share/cloudstack-mysql-ha/lib/*:/etc/cloudstack/usage:/usr/share/cloudstack-common
com.cloud.usage.UsageSanityChecker
* @param args none
*/
public static void main(String[] args) {
