Skip to content

Commit 3f89d91

Browse files
committed
chore: Add a pomProperty matcher in the dependencies.txt file
1 parent 21e3797 commit 3f89d91

File tree

3 files changed

+36
-36
lines changed

3 files changed

+36
-36
lines changed

.github/scripts/test_dependency_compatibility.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ function add_dependency_to_maven_command() {
3737
exit 1
3838
fi
3939
local full_dependency=$(echo "${dep_pair}" | cut -d'=' -f1 | tr -d '[:space:]')
40-
# The dependency can be in the format of {groupId}:{artifactId} or {artifactId}
41-
# We only want the artifactId
42-
local dependency=$(echo "${full_dependency}" | awk -F':' '{print $NF}')
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}')
4343
local version=$(echo "${dep_pair}" | cut -d'=' -f2 | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
4444
MAVEN_COMMAND+=" -D${dependency}.version=${version}"
4545
}

dependencies.txt

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,43 +5,43 @@
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=1.3.2
9-
io.grpc:grpc-bom=1.74.0
10-
com.google.auth:google.google-auth-library-bom=1.37.1
11-
com.google.http-client:google-http-client=1.47.1
12-
com.google.code.gson:gson=2.13.1
13-
com.google.guava:guava=33.4.8-jre
14-
com.google.protobuf:protobuf-java=4.31.1
15-
io.opentelemetry:opentelemetry-bom=1.52.0
16-
com.google.errorprone:error_prone_annotations=2.41.0
17-
com.google.j2objc:j2objc-annotations=3.1
18-
org.threeten:threetenbp=1.7.2
19-
org.slf4j:slf4j-api=2.0.17
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
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=1.6.1
24-
com.google.oauth-client:google-oauth-client=1.39.0
25-
com.google.api-client:google-api-client=2.8.1
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
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=1.8.0
30-
io.opencensus:opencensus-api=0.31.0
31-
com.google.code.findbugs:jsr305=3.0.2
32-
com.fasterxml.jackson:jackson-bom=2.19.2
33-
commons-codec:commons-codec=1.19.0
34-
org.apache.httpcomponents:httpclient=4.5.14
35-
org.apache.httpcomponents:httpcore=4.4.16
36-
org.apache.httpcomponents.client5:httpclient5=5.5
37-
org.apache.httpcomponents.core5:httpcore5=5.3.4
38-
io.perfmark:perfmark-api=0.27.0
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
3939
# Note: This is the google opentelemetry exporter and not the general opentelemetry project
40-
com.google.cloud.opentelemetry:exporter-metrics=0.36.0
41-
com.google.flogger:flogger=0.9
42-
org.apache.arrow:arrow-memory-core=18.3.0
43-
dev.cel:cel=0.10.1
44-
com.google.crypto.tink:tink=1.18.0
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
4545
# The follow opentelemetry dependencies have a different version from the opentelemetry-bom
46-
io.opentelemetry.semconv:opentelemetry-semconv=1.34.0
47-
io.opentelemetry.contrib:opentelemetry-gcp-resources=1.48.0-alpha
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

renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
{
1414
"customType": "regex",
1515
"managerFilePatterns": ["/dependencies\\.txt/"],
16-
"matchStrings": ["(?<depName>.*)=(?<currentValue>.*)\\n"],
16+
"matchStrings": ["(?<depName>.*);(?<unused>.*)=(?<currentValue>.*)"],
1717
"datasourceTemplate": "maven"
1818
},
1919
{

0 commit comments

Comments
 (0)