Skip to content

Commit a7c2a05

Browse files
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)
1 parent 08b1d38 commit a7c2a05

12 files changed

Lines changed: 20 additions & 25 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ jobs:
278278
# https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2004-Readme.md#mysql
279279
sudo apt-get install -y mysql-server
280280
sudo systemctl start mysql
281-
sudo mysql -uroot -proot -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY ''; FLUSH PRIVILEGES;"
281+
sudo mysql -uroot -proot -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH caching_sha2_password BY ''; FLUSH PRIVILEGES;"
282282
sudo systemctl restart mysql
283283
sudo mysql -uroot -e "SELECT VERSION();"
284284

engine/storage/snapshot/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
<scope>compile</scope>
5858
</dependency>
5959
<dependency>
60-
<groupId>mysql</groupId>
61-
<artifactId>mysql-connector-java</artifactId>
60+
<groupId>com.mysql</groupId>
61+
<artifactId>mysql-connector-j</artifactId>
6262
<scope>test</scope>
6363
</dependency>
6464
</dependencies>

framework/db/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
<artifactId>commons-pool2</artifactId>
5454
</dependency>
5555
<dependency>
56-
<groupId>mysql</groupId>
57-
<artifactId>mysql-connector-java</artifactId>
56+
<groupId>com.mysql</groupId>
57+
<artifactId>mysql-connector-j</artifactId>
5858
</dependency>
5959
<dependency>
6060
<groupId>org.apache.cloudstack</groupId>

packaging/systemd/cloudstack-management.default

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
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"
1919

20-
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/*"
20+
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/*"
2121

2222
BOOTSTRAP_CLASS=org.apache.cloudstack.ServerDaemon
2323

packaging/systemd/cloudstack-usage.default

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
JAVA_OPTS="-Xms256m -Xmx2048m --add-opens=java.base/java.lang=ALL-UNNAMED"
1919

20-
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"
20+
CLASSPATH="/usr/share/cloudstack-usage/*:/usr/share/cloudstack-usage/lib/*:/usr/share/cloudstack-mysql-ha/lib/*:/etc/cloudstack/usage"
2121

2222
JAVA_CLASS=com.cloud.usage.UsageServer
2323

plugins/network-elements/globodns/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<artifactId>globodns-client</artifactId>
3434
</dependency>
3535
<dependency>
36-
<groupId>mysql</groupId>
37-
<artifactId>mysql-connector-java</artifactId>
36+
<groupId>com.mysql</groupId>
37+
<artifactId>mysql-connector-j</artifactId>
3838
<scope>test</scope>
3939
</dependency>
4040
</dependencies>

plugins/network-elements/tungsten/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
<artifactId>reload4j</artifactId>
4242
</dependency>
4343
<dependency>
44-
<groupId>mysql</groupId>
45-
<artifactId>mysql-connector-java</artifactId>
44+
<groupId>com.mysql</groupId>
45+
<artifactId>mysql-connector-j</artifactId>
4646
<scope>test</scope>
4747
</dependency>
4848
</dependencies>

pom.xml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
<cs.libvirt-java.version>0.5.3</cs.libvirt-java.version>
171171
<cs.mail.version>1.5.0-b01</cs.mail.version>
172172
<cs.mustache.version>0.9.14</cs.mustache.version>
173-
<cs.mysql.version>8.0.33</cs.mysql.version>
173+
<cs.mysql.version>8.4.0</cs.mysql.version>
174174
<cs.neethi.version>2.0.4</cs.neethi.version>
175175
<cs.nitro.version>10.1</cs.nitro.version>
176176
<cs.opensaml.version>2.6.6</cs.opensaml.version>
@@ -465,8 +465,8 @@
465465
<version>${cs.reload4j.version}</version>
466466
</dependency>
467467
<dependency>
468-
<groupId>mysql</groupId>
469-
<artifactId>mysql-connector-java</artifactId>
468+
<groupId>com.mysql</groupId>
469+
<artifactId>mysql-connector-j</artifactId>
470470
<version>${cs.mysql.version}</version>
471471
<scope>test</scope>
472472
</dependency>
@@ -481,12 +481,6 @@
481481
</exclusion>
482482
</exclusions>
483483
</dependency>
484-
<dependency>
485-
<groupId>com.mysql</groupId>
486-
<artifactId>mysql-connector-j</artifactId>
487-
<version>${cs.mysql.version}</version>
488-
<scope>test</scope>
489-
</dependency>
490484
<dependency>
491485
<groupId>net.sf.ehcache</groupId>
492486
<artifactId>ehcache-core</artifactId>

setup/db/deploy-db-dev.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,10 @@ CP=./
104104

105105
CP=${CP}$PATHSEP$CATALINA_HOME/conf
106106

107-
# Add mysql jar from mysql-connector-java package to CP
107+
# Add mysql jar from mysql-connector-j package to CP
108108
# for Jenkins
109-
CP=${CP}${PATHSEP}/usr/share/java/mysql-connector-java.jar
109+
MYSQL_CONNECTOR_VERSION = '8.4.0'
110+
CP=${CP}${PATHSEP}/usr/share/java/mysql-connector-j-${MYSQL_CONNECTOR_VERSION}.jar
110111

111112
for file in $CATALINA_HOME/webapps/client/WEB-INF/lib/*.jar
112113
do

tools/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ RUN mvn -Pdeveloper -Dsimulator -DskipTests clean install
5858
RUN find /var/lib/mysql -type f -exec touch {} \; && \
5959
(/usr/bin/mysqld_safe &) && \
6060
sleep 5; \
61-
mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password by ''" --connect-expired-password; \
61+
mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH caching_sha2_password by ''" --connect-expired-password; \
6262
mvn -Pdeveloper -pl developer -Ddeploydb; \
6363
mvn -Pdeveloper -pl developer -Ddeploydb-simulator; \
6464
MARVIN_FILE=`find /root/tools/marvin/dist/ -name "Marvin*.tar.gz"`; \

0 commit comments

Comments
 (0)