Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(google): upgrade google api libraries to match client 2.4.1 #1208

Merged
merged 4 commits into from
Oct 15, 2024
Merged

chore(google): upgrade google api libraries to match client 2.4.1 #1208

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed41414
chore(google): upgrade google api libraries to match client 2.4.1
edgarulg Oct 11, 2024
92205c9
chore(google): upgrade google cloud libraries to 26.34.0
edgarulg Oct 14, 2024
fd66fc0
chore(google): upgrade google protobuf to 3.25.2
edgarulg Oct 14, 2024
6f17504
chore(google): move appengine & cloudrun libraries from clouddriver t…
edgarulg Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions spinnaker-dependencies/spinnaker-dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ ext {
awsv2 : "2.23.7",
bouncycastle : "1.77",
brave : "5.12.3",
gcp : "25.3.0",
gcp : "26.34.0",
groovy : "4.0.15",
jsch : "0.1.54",
jschAgentProxy : "0.0.9",
// spring boot 2.7.18 specifies logback 1.2.12. Pin to 1.2.13 to resolve
// CVE-2023-6378 and CVE-2023-6481 until spring boot 3.1.7 which brings in
// 1.4.14. See https://logback.qos.ch/news.html#1.3.12.
logback : "1.2.13",
protobuf : "3.21.12",
protobuf : "3.25.2",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suspect

kork/kork-proto/kork-proto.gradle

Line 15 in cf76e73

artifact = "com.google.protobuf:protoc:3.21.12"
also needs to change.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be fair, the protoc doesn't have to match the GCP sdk versions as I believe all 3 versions are ABI compatible. NOW protoc 3 vs. 4... 4 is "DANGER ZONE" due to some changes in protoc. BUT so far all the google api SDK's use protoc 3 based versions.

okhttp : "2.7.5", // CVE-2016-2402
okhttp3 : "4.9.3",
openapi : "1.3.9", // this needs to be kept in sync with spring boot as it pulls in the spring-boot-dependencies BOM
Expand Down Expand Up @@ -98,14 +98,16 @@ dependencies {
force = true
}
api("com.amazonaws:aws-java-sdk:${versions.aws}")
api("com.google.api-client:google-api-client:1.33.0") // TODO: Track update for CVE-2020-7692, reanalysis pending.
api("com.google.apis:google-api-services-admin-directory:directory_v1-rev20220125-1.32.1")
api("com.google.apis:google-api-services-cloudbuild:v1-rev20211230-1.32.1")
api("com.google.apis:google-api-services-compute:beta-rev20211228-1.32.1")
api("com.google.apis:google-api-services-iam:v1-rev20220105-1.32.1")
api("com.google.apis:google-api-services-monitoring:v3-rev20220117-1.32.1") //v3-rev20210618-1.31.5
api("com.google.apis:google-api-services-storage:v1-rev20220210-1.32.1")
api("com.google.cloud:google-cloud-secretmanager:2.3.10")
api("com.google.api-client:google-api-client:2.4.1")
api("com.google.apis:google-api-services-admin-directory:directory_v1-rev20240429-2.0.0")
api("com.google.apis:google-api-services-cloudbuild:v1-rev20240427-2.0.0")
api("com.google.apis:google-api-services-compute:beta-rev20240430-2.0.0")
api("com.google.apis:google-api-services-iam:v1-rev20240502-2.0.0")
api("com.google.apis:google-api-services-monitoring:v3-rev20240427-2.0.0")
api("com.google.apis:google-api-services-storage:v1-rev20240319-2.0.0")
api("com.google.apis:google-api-services-appengine:v1-rev20240415-2.0.0")
api("com.google.apis:google-api-services-run:v1-rev20240426-2.0.0")
api("com.google.cloud:google-cloud-secretmanager:2.37.0")
api("com.google.code.findbugs:jsr305:3.0.2")
api("com.google.guava:guava:33.0.0-jre")
api("com.hubspot.jinjava:jinjava:2.7.1")
Expand Down
Loading