Skip to content

Commit

Permalink
[Java]: Bump mysql-connector-java version from 8.0.33 to mysql-connec…
Browse files Browse the repository at this point in the history
…tor-j 8.4.0 (#17522)

Signed-off-by: Harshit Gangal <harshit@planetscale.com>
  • Loading branch information
harshit-gangal authored Jan 15, 2025
1 parent db4fca3 commit 0bcbe4c
Showing 8 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions java/example/pom.xml
Original file line number Diff line number Diff line change
@@ -31,8 +31,8 @@

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.33</version>
<artifactId>mysql-connector-j</artifactId>
<version>8.4.0</version>
<optional>false</optional>
</dependency>

2 changes: 1 addition & 1 deletion java/jdbc/src/main/java/io/vitess/jdbc/VitessJDBCUrl.java
Original file line number Diff line number Diff line change
@@ -218,7 +218,7 @@ private static Properties getURLParamProperties(String paramString, Properties i
}
}

// Per the mysql-connector-java docs, passed in Properties values should take precedence
// Per the mysql-connector-j docs, passed in Properties values should take precedence
// over
// those in the URL. See javadoc for NonRegisteringDriver#connect
if ((null != value && value.length() > 0) && (parameter.length() > 0) && null == info
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ public class VitessParameterMetaData implements ParameterMetaData {
private final int parameterCount;

/**
* This implementation (and defaults below) is equivalent to mysql-connector-java's "simple"
* This implementation (and defaults below) is equivalent to mysql-connector-j's "simple"
* (non-server) statement metadata
*/
VitessParameterMetaData(int count) {
Original file line number Diff line number Diff line change
@@ -426,7 +426,7 @@ public ParameterMetaData getParameterMetaData() throws SQLException {
}

/**
* This function was ported from mysql-connector-java ParseInfo object and greatly simplified to
* This function was ported from mysql-connector-j ParseInfo object and greatly simplified to
* just the parts for counting parameters
*/
private int calculateParameterCount() throws SQLException {
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
import java.util.Map;

/**
* These classes were pulled from mysql-connector-java and simplified to just the parts supporting
* These classes were pulled from mysql-connector-j and simplified to just the parts supporting
* the statically available charsets
*/
public class CharsetMapping {
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
package io.vitess.util.charset;

/**
* These classes were pulled from mysql-connector-java and simplified to just the parts supporting
* These classes were pulled from mysql-connector-j and simplified to just the parts supporting
* the statically available charsets
*/
class Collation {
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
import java.util.Set;

/**
* These classes were pulled from mysql-connector-java and simplified to just the parts supporting
* These classes were pulled from mysql-connector-j and simplified to just the parts supporting
* the statically available charsets
*/
class MysqlCharset {
2 changes: 1 addition & 1 deletion java/pom.xml
Original file line number Diff line number Diff line change
@@ -252,7 +252,7 @@
<failOnWarning>true</failOnWarning>
<outputXML>true</outputXML>
<ignoredUnusedDeclaredDependencies>
<dependency>mysql:mysql-connector-java</dependency>
<dependency>mysql:mysql-connector-j</dependency>
<dependency>io.grpc:grpc-context</dependency>
</ignoredUnusedDeclaredDependencies>
</configuration>

0 comments on commit 0bcbe4c

Please sign in to comment.