apache/celeborn
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[CELEBORN-1708] Bump protobuf version from 3.21.7 to 3.25.5

Browse Source 
### What changes were proposed in this pull request?

Bump protobuf from 3.21.7 to 3.25.5.

### Why are the changes needed?

To fix CVE: https://github.com/advisories/GHSA-735f-pc8j-v9w8

### Does this PR introduce _any_ user-facing change?
No.

### How was this patch tested?

GA.

Closes #2898 from turboFei/bump_protobuf.

Authored-by: Wang, Fei <fwang12@ebay.com>
Signed-off-by: mingji <fengmingxiao.fmx@alibaba-inc.com>
This commit is contained in:
Wang, Fei 2024-11-11 17:02:23 +08:00 committed by mingji
parent 09ffee0365
commit 330b2a094e
19 changed files with 55 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/deps/dependencies-client-flink-1.14
View File

@ -72,7 +72,7 @@ netty-transport-sctp/4.1.109.Final//netty-transport-sctp-4.1.109.Final.jar
netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
paranamer/2.8//paranamer-2.8.jar
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
protobuf-java/3.25.5//protobuf-java-3.25.5.jar
scala-library/2.12.18//scala-library-2.12.18.jar
scala-reflect/2.12.18//scala-reflect-2.12.18.jar
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

2
dev/deps/dependencies-client-flink-1.15
View File

@ -72,7 +72,7 @@ netty-transport-sctp/4.1.109.Final//netty-transport-sctp-4.1.109.Final.jar
netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
paranamer/2.8//paranamer-2.8.jar
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
protobuf-java/3.25.5//protobuf-java-3.25.5.jar
scala-library/2.12.18//scala-library-2.12.18.jar
scala-reflect/2.12.18//scala-reflect-2.12.18.jar
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

2
dev/deps/dependencies-client-flink-1.16
View File

@ -72,7 +72,7 @@ netty-transport-sctp/4.1.109.Final//netty-transport-sctp-4.1.109.Final.jar
netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
paranamer/2.8//paranamer-2.8.jar
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
protobuf-java/3.25.5//protobuf-java-3.25.5.jar
scala-library/2.12.18//scala-library-2.12.18.jar
scala-reflect/2.12.18//scala-reflect-2.12.18.jar
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

2
dev/deps/dependencies-client-flink-1.17
View File

@ -72,7 +72,7 @@ netty-transport-sctp/4.1.109.Final//netty-transport-sctp-4.1.109.Final.jar
netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
paranamer/2.8//paranamer-2.8.jar
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
protobuf-java/3.25.5//protobuf-java-3.25.5.jar
scala-library/2.12.18//scala-library-2.12.18.jar
scala-reflect/2.12.18//scala-reflect-2.12.18.jar
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

2
dev/deps/dependencies-client-flink-1.18
View File

@ -72,7 +72,7 @@ netty-transport-sctp/4.1.109.Final//netty-transport-sctp-4.1.109.Final.jar
netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
paranamer/2.8//paranamer-2.8.jar
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
protobuf-java/3.25.5//protobuf-java-3.25.5.jar
scala-library/2.12.18//scala-library-2.12.18.jar
scala-reflect/2.12.18//scala-reflect-2.12.18.jar
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

2
dev/deps/dependencies-client-flink-1.19
View File

@ -72,7 +72,7 @@ netty-transport-sctp/4.1.109.Final//netty-transport-sctp-4.1.109.Final.jar
netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
paranamer/2.8//paranamer-2.8.jar
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
protobuf-java/3.25.5//protobuf-java-3.25.5.jar
scala-library/2.12.18//scala-library-2.12.18.jar
scala-reflect/2.12.18//scala-reflect-2.12.18.jar
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

2
dev/deps/dependencies-client-flink-1.20
View File

@ -72,7 +72,7 @@ netty-transport-sctp/4.1.109.Final//netty-transport-sctp-4.1.109.Final.jar
netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
paranamer/2.8//paranamer-2.8.jar
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
protobuf-java/3.25.5//protobuf-java-3.25.5.jar
scala-library/2.12.18//scala-library-2.12.18.jar
scala-reflect/2.12.18//scala-reflect-2.12.18.jar
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

2
dev/deps/dependencies-client-mr
View File

@ -179,7 +179,7 @@ nimbus-jose-jwt/9.8.1//nimbus-jose-jwt-9.8.1.jar
okhttp/4.9.3//okhttp-4.9.3.jar
okio/2.8.0//okio-2.8.0.jar
paranamer/2.8//paranamer-2.8.jar
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
protobuf-java/3.25.5//protobuf-java-3.25.5.jar
re2j/1.1//re2j-1.1.jar
reload4j/1.2.22//reload4j-1.2.22.jar
scala-library/2.12.18//scala-library-2.12.18.jar

2
dev/deps/dependencies-client-spark-2.4
View File

@ -72,7 +72,7 @@ netty-transport-sctp/4.1.109.Final//netty-transport-sctp-4.1.109.Final.jar
netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
paranamer/2.8//paranamer-2.8.jar
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
protobuf-java/3.25.5//protobuf-java-3.25.5.jar
scala-library/2.11.12//scala-library-2.11.12.jar
scala-reflect/2.11.12//scala-reflect-2.11.12.jar
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

2
dev/deps/dependencies-client-spark-3.0
View File

@ -72,7 +72,7 @@ netty-transport-sctp/4.1.109.Final//netty-transport-sctp-4.1.109.Final.jar
netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
paranamer/2.8//paranamer-2.8.jar
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
protobuf-java/3.25.5//protobuf-java-3.25.5.jar
scala-library/2.12.10//scala-library-2.12.10.jar
scala-reflect/2.12.10//scala-reflect-2.12.10.jar
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

2
dev/deps/dependencies-client-spark-3.1
View File

@ -72,7 +72,7 @@ netty-transport-sctp/4.1.109.Final//netty-transport-sctp-4.1.109.Final.jar
netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
paranamer/2.8//paranamer-2.8.jar
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
protobuf-java/3.25.5//protobuf-java-3.25.5.jar
scala-library/2.12.10//scala-library-2.12.10.jar
scala-reflect/2.12.10//scala-reflect-2.12.10.jar
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

2
dev/deps/dependencies-client-spark-3.2
View File

@ -72,7 +72,7 @@ netty-transport-sctp/4.1.109.Final//netty-transport-sctp-4.1.109.Final.jar
netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
paranamer/2.8//paranamer-2.8.jar
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
protobuf-java/3.25.5//protobuf-java-3.25.5.jar
scala-library/2.12.15//scala-library-2.12.15.jar
scala-reflect/2.12.15//scala-reflect-2.12.15.jar
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

2
dev/deps/dependencies-client-spark-3.3
View File

@ -72,7 +72,7 @@ netty-transport-sctp/4.1.109.Final//netty-transport-sctp-4.1.109.Final.jar
netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
paranamer/2.8//paranamer-2.8.jar
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
protobuf-java/3.25.5//protobuf-java-3.25.5.jar
scala-library/2.12.15//scala-library-2.12.15.jar
scala-reflect/2.12.15//scala-reflect-2.12.15.jar
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

2
dev/deps/dependencies-client-spark-3.4
View File

@ -72,7 +72,7 @@ netty-transport-sctp/4.1.109.Final//netty-transport-sctp-4.1.109.Final.jar
netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
paranamer/2.8//paranamer-2.8.jar
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
protobuf-java/3.25.5//protobuf-java-3.25.5.jar
scala-library/2.12.17//scala-library-2.12.17.jar
scala-reflect/2.12.17//scala-reflect-2.12.17.jar
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

2
dev/deps/dependencies-client-spark-3.5
View File

@ -72,7 +72,7 @@ netty-transport-sctp/4.1.109.Final//netty-transport-sctp-4.1.109.Final.jar
netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar
netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
paranamer/2.8//paranamer-2.8.jar
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
protobuf-java/3.25.5//protobuf-java-3.25.5.jar
scala-library/2.12.18//scala-library-2.12.18.jar
scala-reflect/2.12.18//scala-reflect-2.12.18.jar
slf4j-api/1.7.36//slf4j-api-1.7.36.jar

2
dev/deps/dependencies-server
View File

@ -121,7 +121,7 @@ netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar
osgi-resource-locator/1.0.3//osgi-resource-locator-1.0.3.jar
paranamer/2.8//paranamer-2.8.jar
picocli/4.7.6//picocli-4.7.6.jar
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
protobuf-java/3.25.5//protobuf-java-3.25.5.jar
ratis-client/3.1.1//ratis-client-3.1.1.jar
ratis-common/3.1.1//ratis-common-3.1.1.jar
ratis-grpc/3.1.1//ratis-grpc-3.1.1.jar

36
master/src/test/java/org/apache/celeborn/service/deploy/master/clustermeta/ha/GrpcRatisMasterStatusSystemSuiteJ.java Normal file
View File

@ -0,0 +1,36 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.celeborn.service.deploy.master.clustermeta.ha;
import org.junit.BeforeClass;
import org.apache.celeborn.common.CelebornConf;
public class GrpcRatisMasterStatusSystemSuiteJ extends RatisMasterStatusSystemSuiteJ {
@BeforeClass
public static void init() throws Exception {
resetRaftServer(
configureServerConf(
new CelebornConf().set(CelebornConf.HA_MASTER_RATIS_RPC_TYPE().key(), "grpc"), 1),
configureServerConf(
new CelebornConf().set(CelebornConf.HA_MASTER_RATIS_RPC_TYPE().key(), "grpc"), 2),
configureServerConf(
new CelebornConf().set(CelebornConf.HA_MASTER_RATIS_RPC_TYPE().key(), "grpc"), 3),
false);
}
}

2
pom.xml
View File

@ -93,7 +93,7 @@
<mockito-scalatest.version>1.17.14</mockito-scalatest.version>
<netty.version>4.1.109.Final</netty.version>
<bouncycastle.version>1.77</bouncycastle.version>
<protobuf.version>3.21.7</protobuf.version>
<protobuf.version>3.25.5</protobuf.version>
<ratis.version>3.1.1</ratis.version>
<scalatest.version>3.2.16</scalatest.version>
<slf4j.version>1.7.36</slf4j.version>

4
project/CelebornBuild.scala
View File

@ -88,8 +88,8 @@ object Dependencies {
val bouncycastleVersion = "1.77"
// Versions for proto
val protocVersion = "3.21.7"
val protoVersion = "3.21.7"
val protocVersion = "3.25.5"
val protoVersion = "3.25.5"
val apLoader = "me.bechberger" % "ap-loader-all" % apLoaderVersion
val commonsCompress = "org.apache.commons" % "commons-compress" % commonsCompressVersion