Skip to content

Commit 9ad46dd

Browse files
committed
chore: update dependencies.txt file to a new format
1 parent bedc6fa commit 9ad46dd

File tree

3 files changed

+48
-40
lines changed

3 files changed

+48
-40
lines changed

.github/scripts/test_dependency_compatibility.sh

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,13 @@ function print_help() {
3232
# Function to parse a dependency string and append it to the Maven command
3333
function add_dependency_to_maven_command() {
3434
local dep_pair=$1
35-
if [[ ! "${dep_pair}" =~ .*=.* ]]; then
36-
echo "Malformed dependency string: ${dep_pair}. Expected format: dependency=version"
35+
if [[ ! "${dep_pair}" =~ .*:.*:.* ]]; then
36+
echo "Malformed dependency string: ${dep_pair}. Expected format: {GroupID}:{ArtifactID}:{Version}:{MavenPropertyName}"
3737
exit 1
3838
fi
39-
local full_dependency=$(echo "${dep_pair}" | cut -d'=' -f1 | tr -d '[:space:]')
40-
# The dependency can be in the format of {groupId}:{artifactId};{pomPropertyName}
41-
# We only want the pomPropertyName
42-
local dependency=$(echo "${full_dependency}" | awk -F';' '{print $NF}')
43-
local version=$(echo "${dep_pair}" | cut -d'=' -f2 | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
39+
local full_dependency=$(echo "${dep_pair}" | rev | cut -d':' -f2- | rev)
40+
local dependency=$(echo "${dep_pair}" | rev | cut -d':' -f1 | rev)
41+
local version=$(echo "${full_dependency}" | awk -F':' '{print $NF}')
4442
MAVEN_COMMAND+=" -D${dependency}.version=${version}"
4543
}
4644

dependencies.txt

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11
# This file contains a list of dependencies and their versions to be tested for compatibility.
2-
# The format is dependency name followed by version. Dependency name is separate by the equals sign.
2+
# The format is `{GroupID}:{ArtifactID}:{Version}:{MavenPropertyName}`. The
33
# "1P" refers to First-Party dependencies (owned by Google).
44
# "3P" refers to Third-Party dependencies.
55

66
# Pom-Parent Dependencies
77
# These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java-pom-parent/pom.xml
8-
javax.annotation:javax.annotation-api;javax.annotation-api=1.3.2
9-
io.grpc:grpc-bom;grpc-bom=1.74.0
10-
com.google.auth:google.google-auth-library-bom;google-auth-library-bom=1.37.1
11-
com.google.http-client:google-http-client;google-http-client=1.47.1
12-
com.google.code.gson:gson;gson=2.13.1
13-
com.google.guava:guava;guava=33.4.8-jre
14-
com.google.protobuf:protobuf-java;protobuf-java=4.31.1
15-
io.opentelemetry:opentelemetry-bom;opentelemetry-bom=1.52.0
16-
com.google.errorprone:error_prone_annotations;error_prone_annotations=2.41.0
17-
com.google.j2objc:j2objc-annotations;j2objc-annotations=3.1
18-
org.threeten:threetenbp;threetenbp=1.7.2
19-
org.slf4j:slf4j-api;slf4j-api=2.0.17
8+
javax.annotation:javax.annotation-api:1.3.2:javax.annotation-api
9+
io.grpc:grpc-bom:1.74.0:grpc
10+
com.google.auth:google.google-auth-library-bom:1.37.1:google.auth
11+
com.google.http-client:google-http-client:1.47.1:google.http-client
12+
com.google.code.gson:gson:2.13.1:gson
13+
com.google.guava:guava:33.4.8-jre:guava
14+
com.google.protobuf:protobuf-java:4.31.1:protobuf
15+
io.opentelemetry:opentelemetry-bom:1.52.0:opentelemetry
16+
com.google.errorprone:error_prone_annotations:2.41.0:errorprone
17+
com.google.j2objc:j2objc-annotations:3.1:j2objc-annotations
18+
org.threeten:threetenbp:1.7.2:threetenbp
19+
org.slf4j:slf4j-api:2.0.17:slf4j
2020

2121
# 1P Shared-Deps
2222
# These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/java-shared-dependencies/first-party-dependencies/pom.xml
23-
com.google.cloud:grpc-gcp;grpc-gcp=1.6.1
24-
com.google.oauth-client:google-oauth-client;google-oauth-client=1.39.0
25-
com.google.api-client:google-api-client;google-api-client=2.8.1
23+
com.google.cloud:grpc-gcp:1.6.1:grpc-gcp
24+
com.google.oauth-client:google-oauth-client:1.39.0:google.oauth-client
25+
com.google.api-client:google-api-client:2.8.1:google.api-client
2626

2727
# 3P Shared-Deps
2828
# These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/java-shared-dependencies/third-party-dependencies/pom.xml
29-
org.threeten:threeten-extra;threeten-extra=1.8.0
30-
io.opencensus:opencensus-api;opencensus-api=0.31.0
31-
com.google.code.findbugs:jsr305;jsr305=3.0.2
32-
com.fasterxml.jackson:jackson-bom;jackson-bom=2.19.2
33-
commons-codec:commons-codec;commons-codec=1.19.0
34-
org.apache.httpcomponents:httpclient;httpclient=4.5.14
35-
org.apache.httpcomponents:httpcore;httpcore=4.4.16
36-
org.apache.httpcomponents.client5:httpclient5;httpclient5=5.5
37-
org.apache.httpcomponents.core5:httpcore5;httpcore5=5.3.4
38-
io.perfmark:perfmark-api;perfmark-api=0.27.0
29+
org.threeten:threeten-extra:1.8.0:threeten-extra
30+
io.opencensus:opencensus-api:0.31.0:opencensus
31+
com.google.code.findbugs:jsr305:3.0.2:findbugs
32+
com.fasterxml.jackson:jackson-bom:2.19.2:jackson
33+
commons-codec:commons-codec:1.19.0:codec
34+
org.apache.httpcomponents:httpclient:4.5.14:httpcomponents.httpclient
35+
org.apache.httpcomponents:httpcore:4.4.16:httpcomponents.httpcore
36+
org.apache.httpcomponents.client5:httpclient5:5.5:apache-httpclient-5
37+
org.apache.httpcomponents.core5:httpcore5:5.3.4:apache-httpcore-5
38+
io.perfmark:perfmark-api:0.27.0:perfmark-api
3939
# Note: This is the google opentelemetry exporter and not the general opentelemetry project
40-
com.google.cloud.opentelemetry:exporter-metrics;exporter-metrics=0.36.0
41-
com.google.flogger:flogger;flogger=0.9
42-
org.apache.arrow:arrow-memory-core;arrow-memory-core=18.3.0
43-
dev.cel:cel;cel=0.10.1
44-
com.google.crypto.tink:tink;tink=1.18.0
40+
com.google.cloud.opentelemetry:exporter-metrics:0.36.0:google.cloud.opentelemetry
41+
com.google.flogger:flogger:0.9:flogger
42+
org.apache.arrow:arrow-memory-core:18.3.0:arrow
43+
dev.cel:cel:0.10.1:dev.cel
44+
com.google.crypto.tink:tink:1.18.0:com.google.crypto.tink
4545
# The follow opentelemetry dependencies have a different version from the opentelemetry-bom
46-
io.opentelemetry.semconv:opentelemetry-semconv;opentelemetry-semconv=1.34.0
47-
io.opentelemetry.contrib:opentelemetry-gcp-resources;opentelemetry-gcp-resources=1.48.0-alpha
46+
io.opentelemetry.semconv:opentelemetry-semconv:1.34.0:opentelemetry-semconv
47+
io.opentelemetry.contrib:opentelemetry-gcp-resources:1.48.0-alpha:io.opentelemetry.contrib.opentelemetry-gcp-resources

renovate.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@
1010
"^library_generation/requirements\\.txt$"
1111
],
1212
"customManagers": [
13+
{
14+
"customType": "regex",
15+
"fileMatch": [
16+
"^dependencies\\.txt$"
17+
],
18+
"matchStrings": [
19+
"^(?<depName>[^:]+:[^:]+):(?<currentValue>[^:]+):(?<additionalInfo>[^:]+?)$"
20+
],
21+
"datasourceTemplate": "maven"
22+
},
1323
{
1424
"customType": "regex",
1525
"fileMatch": [

0 commit comments

Comments
 (0)