Skip to content

Commit

Permalink
Backport to branch(3.9) : Fix CVE-2024-7254, CVE-2024-25638, and CVE-…
Browse files Browse the repository at this point in the history
…2024-34156 (#2281)

Co-authored-by: Toshihiro <[email protected]>
  • Loading branch information
feeblefakie and brfrn169 authored Oct 11, 2024
1 parent adfdc55 commit 34e45f9
Show file tree
Hide file tree
Showing 108 changed files with 848 additions and 723 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ subprojects {
oracleDriverVersion = '21.9.0.0'
sqlserverDriverVersion = '11.2.3.jre8'
sqliteDriverVersion = '3.42.0.0'
grpcVersion = '1.60.0'
protobufVersion = '3.21.12'
grpcVersion = '1.67.1'
protobufVersion = '3.25.5'
annotationVersion = '1.3.2'
picocliVersion = '4.7.3'
scalarAdminVersion = '2.1.0'
scalarAdminVersion = '2.2.1'
dropwizardMetricsVersion = '4.2.18'
prometheusVersion = '0.16.0'
commonsTextVersion = '1.10.0'
Expand Down
1 change: 1 addition & 0 deletions rpc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ dependencies {
api "io.grpc:grpc-protobuf:${grpcVersion}"
api "io.grpc:grpc-stub:${grpcVersion}"
api "io.grpc:grpc-services:${grpcVersion}"
implementation "com.google.protobuf:protobuf-java:${protobufVersion}"
implementation "javax.annotation:javax.annotation-api:${annotationVersion}"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/**
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.60.0)",
value = "by gRPC proto compiler (version 1.67.1)",
comments = "Source: scalardb.proto")
@io.grpc.stub.annotations.GrpcGenerated
public final class DistributedStorageAdminGrpc {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/**
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.60.0)",
value = "by gRPC proto compiler (version 1.67.1)",
comments = "Source: scalardb.proto")
@io.grpc.stub.annotations.GrpcGenerated
public final class DistributedStorageGrpc {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/**
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.60.0)",
value = "by gRPC proto compiler (version 1.67.1)",
comments = "Source: scalardb.proto")
@io.grpc.stub.annotations.GrpcGenerated
public final class DistributedTransactionAdminGrpc {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/**
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.60.0)",
value = "by gRPC proto compiler (version 1.67.1)",
comments = "Source: scalardb.proto")
@io.grpc.stub.annotations.GrpcGenerated
public final class DistributedTransactionGrpc {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/**
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.60.0)",
value = "by gRPC proto compiler (version 1.67.1)",
comments = "Source: scalardb.proto")
@io.grpc.stub.annotations.GrpcGenerated
public final class TwoPhaseCommitTransactionGrpc {
Expand Down
8 changes: 3 additions & 5 deletions rpc/src/main/java/com/scalar/db/rpc/AbortRequest.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions rpc/src/main/java/com/scalar/db/rpc/AbortResponse.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 9 additions & 10 deletions rpc/src/main/java/com/scalar/db/rpc/Column.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion rpc/src/main/java/com/scalar/db/rpc/ColumnOrBuilder.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 34e45f9

Please sign in to comment.