Skip to content

Commit f27e301

Browse files
lqiu96lqiu96
committed
chore: Update to new dependencies.txt file
1 parent 713523b commit f27e301

4 files changed

Lines changed: 70 additions & 247 deletions

File tree

‎.github/scripts/test_dependency_compatibility.sh‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,10 @@ if [ -z "${dependency_list}" ]; then
6464
if [[ "${line}" =~ ^[[:space:]]*# ]] || [[ -z "${line}" ]]; then
6565
continue
6666
fi
67-
# Format from `dependencies.txt`: {GroupID}:{ArtifactID}:{Version}:{MavenPropertyName}
68-
dependency=$(echo "${line}" | cut -d':' -f4)
69-
version=$(echo "${line}" | cut -d':' -f3)
67+
# Format from `dependencies.txt`: {GroupID}:{ArtifactID},{PropertyName}={Version}
68+
version=$(echo "${line}" | cut -d'=' -f2)
69+
dependency_and_group_artifact=$(echo "${line}" | cut -d'=' -f1)
70+
dependency=$(echo "${dependency_and_group_artifact}" | cut -d',' -f2)
7071
MAVEN_COMMAND+=" -D${dependency}.version=${version}"
7172
done < "${UPPER_BOUND_DEPENDENCY_FILE}"
7273
else # This else block means that a list of dependencies was inputted
@@ -81,9 +82,9 @@ else # This else block means that a list of dependencies was inputted
8182
if [ -z "${DEP_PAIR}" ]; then
8283
continue
8384
fi
84-
# Format: {MavenPropertyName}:{Version}
85-
dependency=$(echo "${DEP_PAIR}" | cut -d':' -f1)
86-
version=$(echo "${DEP_PAIR}" | cut -d':' -f2)
85+
# Format: {MavenPropertyName}={Version}
86+
dependency=$(echo "${DEP_PAIR}" | cut -d'=' -f1)
87+
version=$(echo "${DEP_PAIR}" | cut -d'=' -f2)
8788
MAVEN_COMMAND+=" -D${dependency}.version=${version}"
8889
done
8990
fi

‎.github/workflows/dependency_compatibility_test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
workflow_dispatch:
88
inputs:
99
dependencies-list:
10-
description: 'Comma-separated list of dependencies to test (Example format: protobuf:4.31.0,guava:33.4.8-jre).
10+
description: 'Comma-separated list of dependencies to test (Example format: protobuf=4.31.0,guava=33.4.8-jre).
1111
Note: The name should be the maven property. Find this value in the <properties> section in the pom.
1212
Do not include the `-D` prefix or `.version` suffix. Those values will be appended when generating
1313
the command. No input (default) will run the the upper-bound dependencies file.'

‎dependencies.txt‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This file contains a list of dependencies and their versions to be tested for compatibility.
2-
# The format is `{GroupID}:{ArtifactID}:{Version}:{MavenPropertyName}`. The GAV coordinates
2+
# The format is `{GroupID}:{ArtifactID},{PropertyName}={Version}`. The GAV coordinates
33
# (specifically the GroupID and ArtifactID are parsed by renovate to find the artifact from Maven
44
# Central. Version stores the currently known upper bound. MavenPropertyName corresponds to the
55
# Maven property value in the pom.xml (it is not a 1:1 mapping to the GAV).
@@ -8,43 +8,43 @@
88

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

2424
# 1P Shared-Deps
2525
# These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/java-shared-dependencies/first-party-dependencies/pom.xml
26-
com.google.cloud:grpc-gcp:1.6.1:grpc-gcp
27-
com.google.oauth-client:google-oauth-client:1.39.0:google.oauth-client
28-
com.google.api-client:google-api-client:2.8.1:google.api-client
26+
com.google.cloud:grpc-gcp,grpc-gcp=1.6.1
27+
com.google.oauth-client:google-oauth-client,google.oauth-client=1.39.0
28+
com.google.api-client:google-api-client,google.api-client=2.8.1
2929

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

‎renovate.json‎

Lines changed: 29 additions & 207 deletions
Original file line numberDiff line numberDiff line change
@@ -9,217 +9,39 @@
99
"ignorePaths": [
1010
"^library_generation/requirements\\.txt$"
1111
],
12+
"bazel": {
13+
"enabled": false
14+
},
15+
"cloudbuild": {
16+
"enabled": false
17+
},
18+
"dockerfile": {
19+
"enabled": false
20+
},
21+
"gradle": {
22+
"enabled": false
23+
},
24+
"gradle-wrapper": {
25+
"enabled": false
26+
},
27+
"maven": {
28+
"enabled": false
29+
},
30+
"pip_setup": {
31+
"enabled": false
32+
},
33+
"pip_requirements": {
34+
"enabled": false
35+
},
36+
"github-actions": {
37+
"enabled": false
38+
},
1239
"customManagers": [
1340
{
1441
"customType": "regex",
15-
"fileMatch": [
16-
"^dependencies\\.txt$"
17-
],
18-
"matchStrings": [
19-
"^(?<depName>[^:]+:[^:]+):(?<currentValue>[^:]+):(?<additionalInfo>[^:]+?)$"
20-
],
42+
"managerFilePatterns": ["/^dependencies\\.txt$/"],
43+
"matchStrings": ["(?<depName>.*),(.*)=(?<currentValue>.*)"],
2144
"datasourceTemplate": "maven"
22-
},
23-
{
24-
"customType": "regex",
25-
"fileMatch": [
26-
"^gax-java/dependencies\\.properties$"
27-
],
28-
"matchStrings": [
29-
"=(?<depName>.+\\:.+?):(?<currentValue>.+?)\\n"
30-
],
31-
"datasourceTemplate": "maven"
32-
},
33-
{
34-
"customType": "regex",
35-
"fileMatch": [
36-
"^gax-java/dependencies\\.properties$"
37-
],
38-
"matchStrings": [
39-
"version\\.google_java_format=(?<currentValue>.+?)\\n"
40-
],
41-
"depNameTemplate": "com.google.googlejavaformat:google-java-format",
42-
"datasourceTemplate": "maven"
43-
},
44-
{
45-
"customType": "regex",
46-
"fileMatch": [
47-
"^gax-java/dependencies\\.properties$",
48-
"^\\.cloudbuild/library_generation/library_generation.*\\.Dockerfile$"
49-
],
50-
"matchStrings": [
51-
"version\\.io_grpc=(?<currentValue>.+?)\\n",
52-
"ARG GRPC_VERSION=[\"']?(?<currentValue>.+?)[\"']?\\s+"
53-
],
54-
"depNameTemplate": "io.grpc:grpc-core",
55-
"datasourceTemplate": "maven"
56-
},
57-
{
58-
"customType": "regex",
59-
"fileMatch": [
60-
"^.kokoro/presubmit/graalvm-native.*.cfg$"
61-
],
62-
"matchStrings": [
63-
"value: \"gcr.io/cloud-devrel-kokoro-resources/graalvm:(?<currentValue>.*?)\"",
64-
"value: \"gcr.io/cloud-devrel-kokoro-resources/graalvm17:(?<currentValue>.*?)\""
65-
],
66-
"depNameTemplate": "ghcr.io/graalvm/graalvm-ce",
67-
"datasourceTemplate": "docker"
68-
},
69-
{
70-
"customType": "regex",
71-
"fileMatch": [
72-
"^.cloudbuild/*"
73-
],
74-
"matchStrings": [
75-
" _JAVA_SHARED_CONFIG_VERSION: '(?<currentValue>.+?)'"
76-
],
77-
"depNameTemplate": "com.google.cloud:google-cloud-shared-config",
78-
"datasourceTemplate": "maven"
79-
},
80-
{
81-
"customType": "regex",
82-
"fileMatch": [
83-
"^.cloudbuild/library_generation/library_generation.*\\.Dockerfile$"
84-
],
85-
"matchStrings": [
86-
"OWLBOT_CLI_COMMITTISH=(?<currentDigest>.*?)\\n"
87-
],
88-
"currentValueTemplate": "main",
89-
"depNameTemplate": "repo-automation-bots",
90-
"packageNameTemplate": "https://github.com/googleapis/repo-automation-bots",
91-
"datasourceTemplate": "git-refs"
92-
}
93-
],
94-
"packageRules": [
95-
{
96-
"matchPackageNames": [
97-
"com.google.cloud:google-cloud-shared-config"
98-
],
99-
"registryUrls": [
100-
"https://repo.maven.apache.org/maven2/",
101-
"https://repo1.maven.org/maven2"
102-
]
103-
},
104-
{
105-
"matchUpdateTypes": [
106-
"major"
107-
],
108-
"enabled": false,
109-
"matchPackageNames": [
110-
"*"
111-
]
112-
},
113-
{
114-
"enabled": false,
115-
"matchPackageNames": [
116-
"/^com.google.protobuf:/"
117-
]
118-
},
119-
{
120-
"versioning": "docker",
121-
"matchPackageNames": [
122-
"/^com.google.guava:/"
123-
],
124-
"enabled": false
125-
},
126-
{
127-
"semanticCommitType": "deps",
128-
"semanticCommitScope": null,
129-
"matchPackageNames": [
130-
"*"
131-
]
132-
},
133-
{
134-
"semanticCommitType": "build",
135-
"semanticCommitScope": "deps",
136-
"enabled": true,
137-
"matchPackageNames": [
138-
"/^org.apache.maven/",
139-
"/^org.jacoco:/",
140-
"/^org.codehaus.mojo:/",
141-
"/^org.sonatype.plugins:/",
142-
"/^com.google.cloud:google-cloud-shared-config/"
143-
]
144-
},
145-
{
146-
"semanticCommitType": "chore",
147-
"semanticCommitScope": "deps",
148-
"matchPackageNames": [
149-
"/^{{metadata['repo']['distribution_name']}}/",
150-
"/^com.google.cloud:libraries-bom/",
151-
"/^com.google.cloud.samples:shared-configuration/"
152-
]
153-
},
154-
{
155-
"semanticCommitType": "test",
156-
"semanticCommitScope": "deps",
157-
"matchPackageNames": [
158-
"/^junit:junit/",
159-
"/^com.google.truth:truth/",
160-
"/^org.mockito:mockito-core/",
161-
"/^org.objenesis:objenesis/",
162-
"/^com.google.cloud:google-cloud-conformance-tests/"
163-
]
164-
},
165-
{
166-
"ignoreUnstable": false,
167-
"matchPackageNames": [
168-
"/^com.google.cloud:google-cloud-/"
169-
]
170-
},
171-
{
172-
"groupName": "jackson dependencies",
173-
"matchPackageNames": [
174-
"/^com.fasterxml.jackson.core/"
175-
]
176-
},
177-
{
178-
"groupName": "gRPC dependencies",
179-
"matchPackageNames": [
180-
"/^io.grpc/"
181-
],
182-
"enabled": false
183-
},
184-
{
185-
"groupName": "Google Auth Library dependencies",
186-
"matchPackageNames": [
187-
"/^com.google.auth/"
188-
]
189-
},
190-
{
191-
"groupName": "Google API dependencies",
192-
"matchPackageNames": [
193-
"/com.google.api.grpc:grpc-google-common-protos/",
194-
"/com.google.api.grpc:grpc-google-iam-v1/",
195-
"/com.google.api.grpc:proto-google-common-protos/",
196-
"/com.google.api.grpc:proto-google-iam-v1/",
197-
"/com.google.api:api-common/"
198-
]
199-
},
200-
{
201-
"groupName": "Google HTTP Client dependencies",
202-
"matchPackageNames": [
203-
"/^com.google.http-client/"
204-
]
205-
},
206-
{
207-
"groupName": "OpenCensus dependencies",
208-
"matchPackageNames": [
209-
"/^io.opencensus/"
210-
]
211-
},
212-
{
213-
"groupName": "Netty dependencies",
214-
"matchPackageNames": [
215-
"/^io.netty/"
216-
]
217-
},
218-
{
219-
"groupName": "Error Prone dependencies",
220-
"matchPackageNames": [
221-
"/^com.google.errorprone/"
222-
]
22345
}
22446
]
22547
}

0 commit comments

Comments
 (0)