Skip to content

Commit

Permalink
WL#16558, Upgrade 3rd party libraries and tools.
Browse files Browse the repository at this point in the history
Change-Id: I4e89ab47edd22535fcee2b67a6921cd53e4db33b
  • Loading branch information
fjssilva committed Dec 2, 2024
1 parent eccdf6c commit 8f12103
Show file tree
Hide file tree
Showing 14 changed files with 250 additions and 236 deletions.
2 changes: 2 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

Version 9.2.0

- WL#16558, Upgrade 3rd party libraries and tools.

- Fix for Bug#37125271, RPM depends on java-headless 1:1.8.0 which makes java8 unnessessarily be installed.

- Fix for Bug#115586 (Bug#36850047), When upgrading to mysql connetor/j-8.4.0, creating a connection becomes too slow.
Expand Down
4 changes: 2 additions & 2 deletions src/build/misc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>4.26.1</version>
<version>4.29.0</version>
</dependency>

<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-common</artifactId>
<version>3.41.2</version>
<version>3.54.0</version>
<optional>true</optional>
</dependency>
</dependencies>
Expand Down
35 changes: 18 additions & 17 deletions src/generated/java/com/mysql/cj/x/protobuf/Mysqlx.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,18 @@
package com.mysql.cj.x.protobuf;

// Generated by the protocol buffer compiler. DO NOT EDIT!
// NO CHECKED-IN PROTOBUF GENCODE
// source: mysqlx.proto
// Protobuf Java Version: 4.26.1
// Protobuf Java Version: 4.29.0

public final class Mysqlx {
private Mysqlx() {}
static {
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
/* major= */ 4,
/* minor= */ 26,
/* patch= */ 1,
/* minor= */ 29,
/* patch= */ 0,
/* suffix= */ "",
Mysqlx.class.getName());
}
Expand Down Expand Up @@ -72,8 +73,8 @@ public static final class ClientMessages extends
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
/* major= */ 4,
/* minor= */ 26,
/* patch= */ 1,
/* minor= */ 29,
/* patch= */ 0,
/* suffix= */ "",
ClientMessages.class.getName());
}
Expand Down Expand Up @@ -204,8 +205,8 @@ public enum Type
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
/* major= */ 4,
/* minor= */ 26,
/* patch= */ 1,
/* minor= */ 29,
/* patch= */ 0,
/* suffix= */ "",
Type.class.getName());
}
Expand Down Expand Up @@ -750,8 +751,8 @@ public static final class ServerMessages extends
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
/* major= */ 4,
/* minor= */ 26,
/* patch= */ 1,
/* minor= */ 29,
/* patch= */ 0,
/* suffix= */ "",
ServerMessages.class.getName());
}
Expand Down Expand Up @@ -846,8 +847,8 @@ public enum Type
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
/* major= */ 4,
/* minor= */ 26,
/* patch= */ 1,
/* minor= */ 29,
/* patch= */ 0,
/* suffix= */ "",
Type.class.getName());
}
Expand Down Expand Up @@ -1353,8 +1354,8 @@ public static final class Ok extends
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
/* major= */ 4,
/* minor= */ 26,
/* patch= */ 1,
/* minor= */ 29,
/* patch= */ 0,
/* suffix= */ "",
Ok.class.getName());
}
Expand Down Expand Up @@ -1974,8 +1975,8 @@ public static final class Error extends
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
/* major= */ 4,
/* minor= */ 26,
/* patch= */ 1,
/* minor= */ 29,
/* patch= */ 0,
/* suffix= */ "",
Error.class.getName());
}
Expand Down Expand Up @@ -2021,8 +2022,8 @@ public enum Severity
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
/* major= */ 4,
/* minor= */ 26,
/* patch= */ 1,
/* minor= */ 29,
/* patch= */ 0,
/* suffix= */ "",
Severity.class.getName());
}
Expand Down
31 changes: 16 additions & 15 deletions src/generated/java/com/mysql/cj/x/protobuf/MysqlxConnection.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,18 @@
package com.mysql.cj.x.protobuf;

// Generated by the protocol buffer compiler. DO NOT EDIT!
// NO CHECKED-IN PROTOBUF GENCODE
// source: mysqlx_connection.proto
// Protobuf Java Version: 4.26.1
// Protobuf Java Version: 4.29.0

public final class MysqlxConnection {
private MysqlxConnection() {}
static {
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
/* major= */ 4,
/* minor= */ 26,
/* patch= */ 1,
/* minor= */ 29,
/* patch= */ 0,
/* suffix= */ "",
MysqlxConnection.class.getName());
}
Expand Down Expand Up @@ -99,8 +100,8 @@ public static final class Capability extends
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
/* major= */ 4,
/* minor= */ 26,
/* patch= */ 1,
/* minor= */ 29,
/* patch= */ 0,
/* suffix= */ "",
Capability.class.getName());
}
Expand Down Expand Up @@ -873,8 +874,8 @@ public static final class Capabilities extends
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
/* major= */ 4,
/* minor= */ 26,
/* patch= */ 1,
/* minor= */ 29,
/* patch= */ 0,
/* suffix= */ "",
Capabilities.class.getName());
}
Expand Down Expand Up @@ -1614,8 +1615,8 @@ public static final class CapabilitiesGet extends
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
/* major= */ 4,
/* minor= */ 26,
/* patch= */ 1,
/* minor= */ 29,
/* patch= */ 0,
/* suffix= */ "",
CapabilitiesGet.class.getName());
}
Expand Down Expand Up @@ -2003,8 +2004,8 @@ public static final class CapabilitiesSet extends
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
/* major= */ 4,
/* minor= */ 26,
/* patch= */ 1,
/* minor= */ 29,
/* patch= */ 0,
/* suffix= */ "",
CapabilitiesSet.class.getName());
}
Expand Down Expand Up @@ -2593,8 +2594,8 @@ public static final class Close extends
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
/* major= */ 4,
/* minor= */ 26,
/* patch= */ 1,
/* minor= */ 29,
/* patch= */ 0,
/* suffix= */ "",
Close.class.getName());
}
Expand Down Expand Up @@ -3001,8 +3002,8 @@ public static final class Compression extends
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
/* major= */ 4,
/* minor= */ 26,
/* patch= */ 1,
/* minor= */ 29,
/* patch= */ 0,
/* suffix= */ "",
Compression.class.getName());
}
Expand Down
Loading

0 comments on commit 8f12103

Please sign in to comment.