Skip to content

Commit 185648f

Browse files
fjssilvafjssilva
committed
WL#17009, Upgrade 3rd party libraries and tools.
Change-Id: Ib4962d88d7418c198a6f2c7ce790808d60df9df6
1 parent aed62b7 commit 185648f

File tree

14 files changed

+676
-720
lines changed

14 files changed

+676
-720
lines changed

‎CHANGES‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
Version 9.4.0
55

6+
- WL#17009, Upgrade 3rd party libraries and tools.
7+
68
- Fix for Bug#118201 (Bug#37971552), A potential bug in Mysql Connector/J.
79

810
- Fix for Bug#44791 (Bug#11753361), Setting/getting holdability on connection does not work properly.

‎src/build/misc/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@
6262
<dependency>
6363
<groupId>com.google.protobuf</groupId>
6464
<artifactId>protobuf-java</artifactId>
65-
<version>4.29.0</version>
65+
<version>4.31.1</version>
6666
</dependency>
6767

6868
<dependency>
6969
<groupId>com.oracle.oci.sdk</groupId>
7070
<artifactId>oci-java-sdk-common</artifactId>
71-
<version>3.54.0</version>
71+
<version>3.66.0</version>
7272
<optional>true</optional>
7373
</dependency>
7474
</dependencies>

‎src/generated/java/com/mysql/cj/x/protobuf/Mysqlx.java‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,17 @@
2323
// Generated by the protocol buffer compiler. DO NOT EDIT!
2424
// NO CHECKED-IN PROTOBUF GENCODE
2525
// source: mysqlx.proto
26-
// Protobuf Java Version: 4.29.0
26+
// Protobuf Java Version: 4.31.1
2727

28+
@com.google.protobuf.Generated
2829
public final class Mysqlx {
2930
private Mysqlx() {}
3031
static {
3132
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
3233
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
3334
/* major= */ 4,
34-
/* minor= */ 29,
35-
/* patch= */ 0,
35+
/* minor= */ 31,
36+
/* patch= */ 1,
3637
/* suffix= */ "",
3738
Mysqlx.class.getName());
3839
}
@@ -73,8 +74,8 @@ public static final class ClientMessages extends
7374
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
7475
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
7576
/* major= */ 4,
76-
/* minor= */ 29,
77-
/* patch= */ 0,
77+
/* minor= */ 31,
78+
/* patch= */ 1,
7879
/* suffix= */ "",
7980
ClientMessages.class.getName());
8081
}
@@ -205,8 +206,8 @@ public enum Type
205206
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
206207
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
207208
/* major= */ 4,
208-
/* minor= */ 29,
209-
/* patch= */ 0,
209+
/* minor= */ 31,
210+
/* patch= */ 1,
210211
/* suffix= */ "",
211212
Type.class.getName());
212213
}
@@ -376,7 +377,7 @@ public Type findValueByNumber(int number) {
376377
getDescriptorForType() {
377378
return getDescriptor();
378379
}
379-
public static final com.google.protobuf.Descriptors.EnumDescriptor
380+
public static com.google.protobuf.Descriptors.EnumDescriptor
380381
getDescriptor() {
381382
return com.mysql.cj.x.protobuf.Mysqlx.ClientMessages.getDescriptor().getEnumTypes().get(0);
382383
}
@@ -751,8 +752,8 @@ public static final class ServerMessages extends
751752
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
752753
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
753754
/* major= */ 4,
754-
/* minor= */ 29,
755-
/* patch= */ 0,
755+
/* minor= */ 31,
756+
/* patch= */ 1,
756757
/* suffix= */ "",
757758
ServerMessages.class.getName());
758759
}
@@ -847,8 +848,8 @@ public enum Type
847848
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
848849
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
849850
/* major= */ 4,
850-
/* minor= */ 29,
851-
/* patch= */ 0,
851+
/* minor= */ 31,
852+
/* patch= */ 1,
852853
/* suffix= */ "",
853854
Type.class.getName());
854855
}
@@ -972,7 +973,7 @@ public Type findValueByNumber(int number) {
972973
getDescriptorForType() {
973974
return getDescriptor();
974975
}
975-
public static final com.google.protobuf.Descriptors.EnumDescriptor
976+
public static com.google.protobuf.Descriptors.EnumDescriptor
976977
getDescriptor() {
977978
return com.mysql.cj.x.protobuf.Mysqlx.ServerMessages.getDescriptor().getEnumTypes().get(0);
978979
}
@@ -1354,8 +1355,8 @@ public static final class Ok extends
13541355
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
13551356
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
13561357
/* major= */ 4,
1357-
/* minor= */ 29,
1358-
/* patch= */ 0,
1358+
/* minor= */ 31,
1359+
/* patch= */ 1,
13591360
/* suffix= */ "",
13601361
Ok.class.getName());
13611362
}
@@ -1975,8 +1976,8 @@ public static final class Error extends
19751976
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
19761977
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
19771978
/* major= */ 4,
1978-
/* minor= */ 29,
1979-
/* patch= */ 0,
1979+
/* minor= */ 31,
1980+
/* patch= */ 1,
19801981
/* suffix= */ "",
19811982
Error.class.getName());
19821983
}
@@ -2022,8 +2023,8 @@ public enum Severity
20222023
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
20232024
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
20242025
/* major= */ 4,
2025-
/* minor= */ 29,
2026-
/* patch= */ 0,
2026+
/* minor= */ 31,
2027+
/* patch= */ 1,
20272028
/* suffix= */ "",
20282029
Severity.class.getName());
20292030
}
@@ -2083,7 +2084,7 @@ public Severity findValueByNumber(int number) {
20832084
getDescriptorForType() {
20842085
return getDescriptor();
20852086
}
2086-
public static final com.google.protobuf.Descriptors.EnumDescriptor
2087+
public static com.google.protobuf.Descriptors.EnumDescriptor
20872088
getDescriptor() {
20882089
return com.mysql.cj.x.protobuf.Mysqlx.Error.getDescriptor().getEnumTypes().get(0);
20892090
}
@@ -2736,9 +2737,7 @@ public com.mysql.cj.x.protobuf.Mysqlx.Error.Severity getSeverity() {
27362737
* @return This builder for chaining.
27372738
*/
27382739
public Builder setSeverity(com.mysql.cj.x.protobuf.Mysqlx.Error.Severity value) {
2739-
if (value == null) {
2740-
throw new NullPointerException();
2741-
}
2740+
if (value == null) { throw new NullPointerException(); }
27422741
bitField0_ |= 0x00000001;
27432742
severity_ = value.getNumber();
27442743
onChanged();

‎src/generated/java/com/mysql/cj/x/protobuf/MysqlxConnection.java‎

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,17 @@
2323
// Generated by the protocol buffer compiler. DO NOT EDIT!
2424
// NO CHECKED-IN PROTOBUF GENCODE
2525
// source: mysqlx_connection.proto
26-
// Protobuf Java Version: 4.29.0
26+
// Protobuf Java Version: 4.31.1
2727

28+
@com.google.protobuf.Generated
2829
public final class MysqlxConnection {
2930
private MysqlxConnection() {}
3031
static {
3132
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
3233
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
3334
/* major= */ 4,
34-
/* minor= */ 29,
35-
/* patch= */ 0,
35+
/* minor= */ 31,
36+
/* patch= */ 1,
3637
/* suffix= */ "",
3738
MysqlxConnection.class.getName());
3839
}
@@ -100,8 +101,8 @@ public static final class Capability extends
100101
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
101102
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
102103
/* major= */ 4,
103-
/* minor= */ 29,
104-
/* patch= */ 0,
104+
/* minor= */ 31,
105+
/* patch= */ 1,
105106
/* suffix= */ "",
106107
Capability.class.getName());
107108
}
@@ -431,7 +432,7 @@ private Builder(
431432
private void maybeForceBuilderInitialization() {
432433
if (com.google.protobuf.GeneratedMessage
433434
.alwaysUseFieldBuilders) {
434-
getValueFieldBuilder();
435+
internalGetValueFieldBuilder();
435436
}
436437
}
437438
@java.lang.Override
@@ -553,7 +554,7 @@ public Builder mergeFrom(
553554
} // case 10
554555
case 18: {
555556
input.readMessage(
556-
getValueFieldBuilder().getBuilder(),
557+
internalGetValueFieldBuilder().getBuilder(),
557558
extensionRegistry);
558559
bitField0_ |= 0x00000002;
559560
break;
@@ -746,7 +747,7 @@ public Builder clearValue() {
746747
public com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder getValueBuilder() {
747748
bitField0_ |= 0x00000002;
748749
onChanged();
749-
return getValueFieldBuilder().getBuilder();
750+
return internalGetValueFieldBuilder().getBuilder();
750751
}
751752
/**
752753
* <code>required .Mysqlx.Datatypes.Any value = 2;</code>
@@ -764,7 +765,7 @@ public com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder getValueOrBuilder()
764765
*/
765766
private com.google.protobuf.SingleFieldBuilder<
766767
com.mysql.cj.x.protobuf.MysqlxDatatypes.Any, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder>
767-
getValueFieldBuilder() {
768+
internalGetValueFieldBuilder() {
768769
if (valueBuilder_ == null) {
769770
valueBuilder_ = new com.google.protobuf.SingleFieldBuilder<
770771
com.mysql.cj.x.protobuf.MysqlxDatatypes.Any, com.mysql.cj.x.protobuf.MysqlxDatatypes.Any.Builder, com.mysql.cj.x.protobuf.MysqlxDatatypes.AnyOrBuilder>(
@@ -874,8 +875,8 @@ public static final class Capabilities extends
874875
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
875876
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
876877
/* major= */ 4,
877-
/* minor= */ 29,
878-
/* patch= */ 0,
878+
/* minor= */ 31,
879+
/* patch= */ 1,
879880
/* suffix= */ "",
880881
Capabilities.class.getName());
881882
}
@@ -1234,7 +1235,7 @@ public Builder mergeFrom(com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities o
12341235
bitField0_ = (bitField0_ & ~0x00000001);
12351236
capabilitiesBuilder_ =
12361237
com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
1237-
getCapabilitiesFieldBuilder() : null;
1238+
internalGetCapabilitiesFieldBuilder() : null;
12381239
} else {
12391240
capabilitiesBuilder_.addAllMessages(other.capabilities_);
12401241
}
@@ -1481,7 +1482,7 @@ public Builder removeCapabilities(int index) {
14811482
*/
14821483
public com.mysql.cj.x.protobuf.MysqlxConnection.Capability.Builder getCapabilitiesBuilder(
14831484
int index) {
1484-
return getCapabilitiesFieldBuilder().getBuilder(index);
1485+
return internalGetCapabilitiesFieldBuilder().getBuilder(index);
14851486
}
14861487
/**
14871488
* <code>repeated .Mysqlx.Connection.Capability capabilities = 1;</code>
@@ -1508,27 +1509,27 @@ public com.mysql.cj.x.protobuf.MysqlxConnection.CapabilityOrBuilder getCapabilit
15081509
* <code>repeated .Mysqlx.Connection.Capability capabilities = 1;</code>
15091510
*/
15101511
public com.mysql.cj.x.protobuf.MysqlxConnection.Capability.Builder addCapabilitiesBuilder() {
1511-
return getCapabilitiesFieldBuilder().addBuilder(
1512+
return internalGetCapabilitiesFieldBuilder().addBuilder(
15121513
com.mysql.cj.x.protobuf.MysqlxConnection.Capability.getDefaultInstance());
15131514
}
15141515
/**
15151516
* <code>repeated .Mysqlx.Connection.Capability capabilities = 1;</code>
15161517
*/
15171518
public com.mysql.cj.x.protobuf.MysqlxConnection.Capability.Builder addCapabilitiesBuilder(
15181519
int index) {
1519-
return getCapabilitiesFieldBuilder().addBuilder(
1520+
return internalGetCapabilitiesFieldBuilder().addBuilder(
15201521
index, com.mysql.cj.x.protobuf.MysqlxConnection.Capability.getDefaultInstance());
15211522
}
15221523
/**
15231524
* <code>repeated .Mysqlx.Connection.Capability capabilities = 1;</code>
15241525
*/
15251526
public java.util.List<com.mysql.cj.x.protobuf.MysqlxConnection.Capability.Builder>
15261527
getCapabilitiesBuilderList() {
1527-
return getCapabilitiesFieldBuilder().getBuilderList();
1528+
return internalGetCapabilitiesFieldBuilder().getBuilderList();
15281529
}
15291530
private com.google.protobuf.RepeatedFieldBuilder<
15301531
com.mysql.cj.x.protobuf.MysqlxConnection.Capability, com.mysql.cj.x.protobuf.MysqlxConnection.Capability.Builder, com.mysql.cj.x.protobuf.MysqlxConnection.CapabilityOrBuilder>
1531-
getCapabilitiesFieldBuilder() {
1532+
internalGetCapabilitiesFieldBuilder() {
15321533
if (capabilitiesBuilder_ == null) {
15331534
capabilitiesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
15341535
com.mysql.cj.x.protobuf.MysqlxConnection.Capability, com.mysql.cj.x.protobuf.MysqlxConnection.Capability.Builder, com.mysql.cj.x.protobuf.MysqlxConnection.CapabilityOrBuilder>(
@@ -1615,8 +1616,8 @@ public static final class CapabilitiesGet extends
16151616
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
16161617
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
16171618
/* major= */ 4,
1618-
/* minor= */ 29,
1619-
/* patch= */ 0,
1619+
/* minor= */ 31,
1620+
/* patch= */ 1,
16201621
/* suffix= */ "",
16211622
CapabilitiesGet.class.getName());
16221623
}
@@ -2004,8 +2005,8 @@ public static final class CapabilitiesSet extends
20042005
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
20052006
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
20062007
/* major= */ 4,
2007-
/* minor= */ 29,
2008-
/* patch= */ 0,
2008+
/* minor= */ 31,
2009+
/* patch= */ 1,
20092010
/* suffix= */ "",
20102011
CapabilitiesSet.class.getName());
20112012
}
@@ -2271,7 +2272,7 @@ private Builder(
22712272
private void maybeForceBuilderInitialization() {
22722273
if (com.google.protobuf.GeneratedMessage
22732274
.alwaysUseFieldBuilders) {
2274-
getCapabilitiesFieldBuilder();
2275+
internalGetCapabilitiesFieldBuilder();
22752276
}
22762277
}
22772278
@java.lang.Override
@@ -2375,7 +2376,7 @@ public Builder mergeFrom(
23752376
break;
23762377
case 10: {
23772378
input.readMessage(
2378-
getCapabilitiesFieldBuilder().getBuilder(),
2379+
internalGetCapabilitiesFieldBuilder().getBuilder(),
23792380
extensionRegistry);
23802381
bitField0_ |= 0x00000001;
23812382
break;
@@ -2488,7 +2489,7 @@ public Builder clearCapabilities() {
24882489
public com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.Builder getCapabilitiesBuilder() {
24892490
bitField0_ |= 0x00000001;
24902491
onChanged();
2491-
return getCapabilitiesFieldBuilder().getBuilder();
2492+
return internalGetCapabilitiesFieldBuilder().getBuilder();
24922493
}
24932494
/**
24942495
* <code>required .Mysqlx.Connection.Capabilities capabilities = 1;</code>
@@ -2506,7 +2507,7 @@ public com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesOrBuilder getCapabil
25062507
*/
25072508
private com.google.protobuf.SingleFieldBuilder<
25082509
com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities, com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.Builder, com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesOrBuilder>
2509-
getCapabilitiesFieldBuilder() {
2510+
internalGetCapabilitiesFieldBuilder() {
25102511
if (capabilitiesBuilder_ == null) {
25112512
capabilitiesBuilder_ = new com.google.protobuf.SingleFieldBuilder<
25122513
com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities, com.mysql.cj.x.protobuf.MysqlxConnection.Capabilities.Builder, com.mysql.cj.x.protobuf.MysqlxConnection.CapabilitiesOrBuilder>(
@@ -2594,8 +2595,8 @@ public static final class Close extends
25942595
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
25952596
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
25962597
/* major= */ 4,
2597-
/* minor= */ 29,
2598-
/* patch= */ 0,
2598+
/* minor= */ 31,
2599+
/* patch= */ 1,
25992600
/* suffix= */ "",
26002601
Close.class.getName());
26012602
}
@@ -3002,8 +3003,8 @@ public static final class Compression extends
30023003
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
30033004
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
30043005
/* major= */ 4,
3005-
/* minor= */ 29,
3006-
/* patch= */ 0,
3006+
/* minor= */ 31,
3007+
/* patch= */ 1,
30073008
/* suffix= */ "",
30083009
Compression.class.getName());
30093010
}
@@ -3576,9 +3577,7 @@ public com.mysql.cj.x.protobuf.Mysqlx.ServerMessages.Type getServerMessages() {
35763577
* @return This builder for chaining.
35773578
*/
35783579
public Builder setServerMessages(com.mysql.cj.x.protobuf.Mysqlx.ServerMessages.Type value) {
3579-
if (value == null) {
3580-
throw new NullPointerException();
3581-
}
3580+
if (value == null) { throw new NullPointerException(); }
35823581
bitField0_ |= 0x00000002;
35833582
serverMessages_ = value.getNumber();
35843583
onChanged();
@@ -3618,9 +3617,7 @@ public com.mysql.cj.x.protobuf.Mysqlx.ClientMessages.Type getClientMessages() {
36183617
* @return This builder for chaining.
36193618
*/
36203619
public Builder setClientMessages(com.mysql.cj.x.protobuf.Mysqlx.ClientMessages.Type value) {
3621-
if (value == null) {
3622-
throw new NullPointerException();
3623-
}
3620+
if (value == null) { throw new NullPointerException(); }
36243621
bitField0_ |= 0x00000004;
36253622
clientMessages_ = value.getNumber();
36263623
onChanged();

0 commit comments

Comments
 (0)