Skip to content

Commit 699b4db

Browse files
authored
Update protobuf-java to 3.25.5 (#24333)
### Description Update protobuf-java to 3.25.5 ### Motivation and Context To fix the [CG issue](https://aiinfra.visualstudio.com/Lotus/_componentGovernance/218239/alert/12112143?typeId=29309793&pipelinesTrackingFilter=0). Change file links - [x] java_linux_final_test.sh -> java-cuda-packaging-stage.yml (Jar_Packaging_GPU stage from Zip-Nuget) - [ ] final-jar-testing.yml (Final_Jar_Testing_$ stages)
1 parent d7c688e commit 699b4db

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

cgmanifests/cgmanifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"maven": {
1919
"GroupId": "com.google.protobuf",
2020
"ArtifactId": "protobuf-java",
21-
"Version": "3.21.7"
21+
"Version": "3.25.5"
2222
},
2323
"DevelopmentDependency": true
2424
}

java/build-android.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ artifacts {
147147
dependencies {
148148
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
149149
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
150-
testImplementation 'com.google.protobuf:protobuf-java:3.21.7'
150+
testImplementation 'com.google.protobuf:protobuf-java:3.25.5'
151151
}
152152

153153
publishing {

java/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ if (cmakeBuildDir != null) {
179179
dependencies {
180180
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
181181
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
182-
testImplementation 'com.google.protobuf:protobuf-java:3.21.7'
182+
testImplementation 'com.google.protobuf:protobuf-java:3.25.5'
183183
}
184184

185185
processTestResources {

tools/ci_build/github/azure-pipelines/stages/download-java-tools-stage.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ stages:
1515
mkdir -p java-tools
1616
pushd java-tools
1717
wget --tries=3 https://oss.sonatype.org/service/local/repositories/releases/content/org/junit/platform/junit-platform-console-standalone/1.6.2/junit-platform-console-standalone-1.6.2.jar -P ./
18-
wget --tries=3 https://oss.sonatype.org/service/local/repositories/releases/content/com/google/protobuf/protobuf-java/3.21.7/protobuf-java-3.21.7.jar -P ./
18+
wget --tries=3 https://oss.sonatype.org/service/local/repositories/releases/content/com/google/protobuf/protobuf-java/3.25.5/protobuf-java-3.25.5.jar -P ./
1919
popd
2020
workingDirectory: '$(Agent.TempDirectory)'
2121

tools/ci_build/github/azure-pipelines/stages/java-cuda-packaging-stage.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ stages:
122122
pushd test
123123
jar xf $(Build.BinariesDirectory)\final-jar\testing.jar
124124
popd
125-
java -DUSE_CUDA=1 -jar junit-platform-console-standalone-1.6.2.jar -cp .;.\test;protobuf-java-3.21.7.jar;onnxruntime_gpu-$(OnnxRuntimeVersion).jar --scan-class-path --fail-if-no-tests --disable-banner
125+
java -DUSE_CUDA=1 -jar junit-platform-console-standalone-1.6.2.jar -cp .;.\test;protobuf-java-3.25.5.jar;onnxruntime_gpu-$(OnnxRuntimeVersion).jar --scan-class-path --fail-if-no-tests --disable-banner
126126
workingDirectory: '$(Build.BinariesDirectory)\final-jar'
127127
- job: Final_Jar_Testing_Linux_GPU
128128
dependsOn:

tools/ci_build/github/azure-pipelines/templates/final-jar-testing.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ stages:
6969
pushd test
7070
jar xf $(Build.BinariesDirectory)\final-jar\testing.jar
7171
popd
72-
java -jar junit-platform-console-standalone-1.6.2.jar -cp .;.\test;protobuf-java-3.21.7.jar;onnxruntime-$(OnnxRuntimeVersion).jar --scan-class-path --fail-if-no-tests --disable-banner
72+
java -jar junit-platform-console-standalone-1.6.2.jar -cp .;.\test;protobuf-java-3.25.5.jar;onnxruntime-$(OnnxRuntimeVersion).jar --scan-class-path --fail-if-no-tests --disable-banner
7373
workingDirectory: '$(Build.BinariesDirectory)\final-jar'
7474
- ${{ else }}:
7575
- task: Bash@3
@@ -83,8 +83,8 @@ stages:
8383
pushd test
8484
jar xf '$(Build.BinariesDirectory)/final-jar/testing.jar'
8585
popd
86-
# if you want to run the tests in the power shell, you need to replace ':' to ';', that is, "-cp .;.\test;protobuf-java-3.21.7.jar;onnxruntime-$(OnnxRuntimeVersion).jar"
87-
java -jar ./junit-platform-console-standalone-1.6.2.jar -cp .:./test:./protobuf-java-3.21.7.jar:./onnxruntime-$(OnnxRuntimeVersion).jar --scan-class-path --fail-if-no-tests --disable-banner
86+
# if you want to run the tests in the power shell, you need to replace ':' to ';', that is, "-cp .;.\test;protobuf-java-3.25.5.jar;onnxruntime-$(OnnxRuntimeVersion).jar"
87+
java -jar ./junit-platform-console-standalone-1.6.2.jar -cp .:./test:./protobuf-java-3.25.5.jar:./onnxruntime-$(OnnxRuntimeVersion).jar --scan-class-path --fail-if-no-tests --disable-banner
8888
workingDirectory: '$(Build.BinariesDirectory)/final-jar'
8989
env:
9090
${{ if eq(parameters.OS, 'MacOS') }}:

tools/ci_build/github/linux/java_linux_final_test.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jar xf "$BINARY_DIR/final-jar/testing.jar"
3232
popd
3333

3434
curl -O -sSL https://oss.sonatype.org/service/local/repositories/releases/content/org/junit/platform/junit-platform-console-standalone/1.6.2/junit-platform-console-standalone-1.6.2.jar
35-
curl -O -sSL https://oss.sonatype.org/service/local/repositories/releases/content/com/google/protobuf/protobuf-java/3.21.7/protobuf-java-3.21.7.jar
36-
java -DUSE_CUDA=1 -jar ./junit-platform-console-standalone-1.6.2.jar -cp .:./test:./protobuf-java-3.21.7.jar:./onnxruntime_gpu-"${VERSION_NUMBER}".jar --scan-class-path --fail-if-no-tests --disable-banner
35+
curl -O -sSL https://oss.sonatype.org/service/local/repositories/releases/content/com/google/protobuf/protobuf-java/3.25.5/protobuf-java-3.25.5.jar
36+
java -DUSE_CUDA=1 -jar ./junit-platform-console-standalone-1.6.2.jar -cp .:./test:./protobuf-java-3.25.5.jar:./onnxruntime_gpu-"${VERSION_NUMBER}".jar --scan-class-path --fail-if-no-tests --disable-banner
3737

3838

3939
EXIT_CODE=$?

0 commit comments

Comments
 (0)