Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Java]: Bump mysql-connector-java version from 8.0.33 to mysql-connector-j 8.4.0 #17522

Merged
merged 1 commit into from
Jan 15, 2025
Merged

[Java]: Bump mysql-connector-java version from 8.0.33 to mysql-connector-j 8.4.0 #17522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions java/example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion java/jdbc/src/main/java/io/vitess/jdbc/VitessJDBCUrl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion java/jdbc/src/main/java/io/vitess/jdbc/VitessParameterMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion java/jdbc/src/main/java/io/vitess/jdbc/VitessPreparedStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion java/jdbc/src/main/java/io/vitess/util/charset/CharsetMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion java/jdbc/src/main/java/io/vitess/util/charset/Collation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion java/jdbc/src/main/java/io/vitess/util/charset/MysqlCharset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading