Merge pull request #4953 from matthiasblaesing/connector_j_bump2

db.metadata.model: Bump connector/j version to prevent unittest failures ran against newer mysql server
apache · Nov 10, 2022 · c69515d · c69515d
2 parents 9104077 + 2add704
commit c69515d
Show file tree

Hide file tree

Showing 6 changed files with 1,399 additions and 320 deletions.
diff --git a/ide/db.metadata.model/external/binaries-list b/ide/db.metadata.model/external/binaries-list
@@ -16,4 +16,4 @@
 # under the License.
 
 7EFAD40EF52FBB1F08142F07A83B42D29E47D8CE org.apache.derby:derby:10.14.2.0
-9140BE77AAFA5050BF4BB936D560CBACB5A6B5C1 mysql:mysql-connector-java:5.1.48
+3FD5850719D7E82D50705D34CC6A0037FAB5731F com.mysql:mysql-connector-j:8.0.31
diff --git a/ide/db.metadata.model/external/mysql-connector-j-8.0.31-license.txt b/ide/db.metadata.model/external/mysql-connector-j-8.0.31-license.txt
diff --git a/ide/db.metadata.model/external/mysql-connector-java-5.1.48-license.txt b/ide/db.metadata.model/external/mysql-connector-java-5.1.48-license.txt
diff --git a/ide/db.metadata.model/nbproject/project.properties b/ide/db.metadata.model/nbproject/project.properties
@@ -18,7 +18,7 @@
 javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 
-test.unit.cp.extra=external/derby-10.14.2.0.jar\:external/mysql-connector-java-5.1.48.jar
+test.unit.cp.extra=external/derby-10.14.2.0.jar\:external/mysql-connector-j-8.0.31.jar
 
 test.config.stableBTD.includes=**/*Test.class
 test.config.stableBTD.excludes=\

diff --git a/...odel/test/unit/src/org/netbeans/modules/db/metadata/model/jdbc/JDBCMetadataMySQLTest.java b/...odel/test/unit/src/org/netbeans/modules/db/metadata/model/jdbc/JDBCMetadataMySQLTest.java
@@ -77,7 +77,7 @@ public JDBCMetadataMySQLTest(String name) {
     @Override
     public boolean canRun() {
         try {
-            Class.forName("com.mysql.jdbc.Driver");
+            Class.forName("com.mysql.cj.jdbc.Driver");
             return super.canRun();
         } catch (ClassNotFoundException e) {
             LOG.warning(String.format("Test %s in %s disabled, %s not available", this.getName(), this.getClass().getName(), e.getMessage()));
@@ -93,7 +93,7 @@ public void setUp() throws Exception {
         mysqlUser = System.getProperty("mysql.user", "test");
         mysqlPassword = System.getProperty("mysql.password", "test");
         clearWorkDir();
-        Class.forName("com.mysql.jdbc.Driver");
+        Class.forName("com.mysql.cj.jdbc.Driver");
         conn = DriverManager.getConnection("jdbc:mysql://" + mysqlHost + ":" + mysqlPort, mysqlUser, mysqlPassword);
         stmt = conn.createStatement();
         stmt.executeUpdate("DROP DATABASE IF EXISTS test");