Skip to content

Commit 14c05d1

Browse files
cloud-java-botcloud-java-bot
committed
chore: merge main into generate-libraries-main
2 parents 11f2bb5 + 33e5cd5 commit 14c05d1

File tree

3 files changed

+95
-87
lines changed

3 files changed

+95
-87
lines changed

‎.github/workflows/nightly.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
os: [ macOS-12, ubuntu-22.04, windows-2022 ]
14+
os: [ macOS-13, ubuntu-22.04, windows-2022 ]
1515
java: [ 11, 17 ]
1616
runs-on: ${{ matrix.os }}
1717
steps:
1818
- run: git config --global core.longpaths true
19-
- uses: actions/checkout@v3
20-
- uses: actions/setup-java@v3
19+
- uses: actions/checkout@v4
20+
- uses: actions/setup-java@v4
2121
with:
2222
java-version: ${{ matrix.java }}
2323
distribution: temurin
@@ -37,12 +37,12 @@ jobs:
3737
strategy:
3838
fail-fast: false
3939
matrix:
40-
os: [ macOS-12, ubuntu-22.04, windows-2022 ]
40+
os: [ macOS-13, ubuntu-22.04, windows-2022 ]
4141
runs-on: ${{ matrix.os }}
4242
steps:
4343
- run: git config --global core.longpaths true
44-
- uses: actions/checkout@v3
45-
- uses: actions/setup-java@v3
44+
- uses: actions/checkout@v4
45+
- uses: actions/setup-java@v4
4646
with:
4747
java-version: 11
4848
distribution: temurin
@@ -51,7 +51,7 @@ jobs:
5151
- name: Install with Java 11
5252
run: mvn install --errors --batch-mode --no-transfer-progress -Dcheckstyle.skip -DskipTests
5353

54-
- uses: actions/setup-java@v3
54+
- uses: actions/setup-java@v4
5555
with:
5656
java-version: 8
5757
distribution: temurin

‎java-shared-dependencies/third-party-dependencies/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<opentelemetry-semconv.version>1.26.0-alpha</opentelemetry-semconv.version>
4242
<flogger.version>0.8</flogger.version>
4343
<arrow.version>15.0.2</arrow.version>
44-
<dev.cel.version>0.8.0</dev.cel.version>
44+
<dev.cel.version>0.6.0</dev.cel.version>
4545
<com.google.crypto.tink.version>1.15.0</com.google.crypto.tink.version>
4646
</properties>
4747

‎renovate.json‎

Lines changed: 87 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
"ignoreDeps": [
77
"rules_pkg"
88
],
9-
"ignorePaths": ["^library_generation/requirements\\.txt$"],
9+
"ignorePaths": [
10+
"^library_generation/requirements\\.txt$"
11+
],
1012
"customManagers": [
1113
{
1214
"customType": "regex",
@@ -44,9 +46,13 @@
4446
},
4547
{
4648
"customType": "regex",
47-
"fileMatch": ["^.kokoro/presubmit/graalvm-native.*.cfg$"],
48-
"matchStrings": ["value: \"gcr.io/cloud-devrel-kokoro-resources/graalvm:(?<currentValue>.*?)\"",
49-
"value: \"gcr.io/cloud-devrel-kokoro-resources/graalvm17:(?<currentValue>.*?)\""],
49+
"fileMatch": [
50+
"^.kokoro/presubmit/graalvm-native.*.cfg$"
51+
],
52+
"matchStrings": [
53+
"value: \"gcr.io/cloud-devrel-kokoro-resources/graalvm:(?<currentValue>.*?)\"",
54+
"value: \"gcr.io/cloud-devrel-kokoro-resources/graalvm17:(?<currentValue>.*?)\""
55+
],
5056
"depNameTemplate": "ghcr.io/graalvm/graalvm-ce",
5157
"datasourceTemplate": "docker"
5258
},
@@ -77,7 +83,9 @@
7783
],
7884
"packageRules": [
7985
{
80-
"matchPackageNames": ["com.google.cloud:google-cloud-shared-config"],
86+
"matchPackageNames": [
87+
"com.google.cloud:google-cloud-shared-config"
88+
],
8189
"registryUrls": [
8290
"https://repo.maven.apache.org/maven2/",
8391
"https://repo1.maven.org/maven2"
@@ -87,114 +95,114 @@
8795
"matchUpdateTypes": [
8896
"major"
8997
],
90-
"matchPackagePatterns": [
98+
"enabled": false,
99+
"matchPackageNames": [
91100
"*"
92-
],
93-
"enabled": false
101+
]
94102
},
95103
{
96-
"matchPackagePatterns": [
97-
"^com.google.protobuf:"
98-
],
99-
"enabled": false
104+
"enabled": false,
105+
"matchPackageNames": [
106+
"/^com.google.protobuf:/"
107+
]
100108
},
101109
{
102-
"matchPackagePatterns": [
103-
"^com.google.guava:"
104-
],
105-
"versioning": "docker"
110+
"versioning": "docker",
111+
"matchPackageNames": [
112+
"/^com.google.guava:/"
113+
]
106114
},
107115
{
108-
"matchPackagePatterns": [
109-
"*"
110-
],
111116
"semanticCommitType": "deps",
112-
"semanticCommitScope": null
117+
"semanticCommitScope": null,
118+
"matchPackageNames": [
119+
"*"
120+
]
113121
},
114122
{
115-
"matchPackagePatterns": [
116-
"^org.apache.maven",
117-
"^org.jacoco:",
118-
"^org.codehaus.mojo:",
119-
"^org.sonatype.plugins:",
120-
"^com.coveo:",
121-
"^com.google.cloud:google-cloud-shared-config"
122-
],
123123
"semanticCommitType": "build",
124124
"semanticCommitScope": "deps",
125-
"enabled": true
125+
"enabled": true,
126+
"matchPackageNames": [
127+
"/^org.apache.maven/",
128+
"/^org.jacoco:/",
129+
"/^org.codehaus.mojo:/",
130+
"/^org.sonatype.plugins:/",
131+
"/^com.coveo:/",
132+
"/^com.google.cloud:google-cloud-shared-config/"
133+
]
126134
},
127135
{
128-
"matchPackagePatterns": [
129-
"^{{metadata['repo']['distribution_name']}}",
130-
"^com.google.cloud:libraries-bom",
131-
"^com.google.cloud.samples:shared-configuration"
132-
],
133136
"semanticCommitType": "chore",
134-
"semanticCommitScope": "deps"
137+
"semanticCommitScope": "deps",
138+
"matchPackageNames": [
139+
"/^{{metadata['repo']['distribution_name']}}/",
140+
"/^com.google.cloud:libraries-bom/",
141+
"/^com.google.cloud.samples:shared-configuration/"
142+
]
135143
},
136144
{
137-
"matchPackagePatterns": [
138-
"^junit:junit",
139-
"^com.google.truth:truth",
140-
"^org.mockito:mockito-core",
141-
"^org.objenesis:objenesis",
142-
"^com.google.cloud:google-cloud-conformance-tests"
143-
],
144145
"semanticCommitType": "test",
145-
"semanticCommitScope": "deps"
146+
"semanticCommitScope": "deps",
147+
"matchPackageNames": [
148+
"/^junit:junit/",
149+
"/^com.google.truth:truth/",
150+
"/^org.mockito:mockito-core/",
151+
"/^org.objenesis:objenesis/",
152+
"/^com.google.cloud:google-cloud-conformance-tests/"
153+
]
146154
},
147155
{
148-
"matchPackagePatterns": [
149-
"^com.google.cloud:google-cloud-"
150-
],
151-
"ignoreUnstable": false
156+
"ignoreUnstable": false,
157+
"matchPackageNames": [
158+
"/^com.google.cloud:google-cloud-/"
159+
]
152160
},
153161
{
154-
"matchPackagePatterns": [
155-
"^com.fasterxml.jackson.core"
156-
],
157-
"groupName": "jackson dependencies"
162+
"groupName": "jackson dependencies",
163+
"matchPackageNames": [
164+
"/^com.fasterxml.jackson.core/"
165+
]
158166
},
159167
{
160-
"matchPackagePatterns": [
161-
"^io.grpc"
162-
],
163-
"groupName": "gRPC dependencies"
168+
"groupName": "gRPC dependencies",
169+
"matchPackageNames": [
170+
"/^io.grpc/"
171+
]
164172
},
165173
{
166-
"matchPackagePatterns": [
167-
"^com.google.auth"
168-
],
169-
"groupName": "Google Auth Library dependencies"
174+
"groupName": "Google Auth Library dependencies",
175+
"matchPackageNames": [
176+
"/^com.google.auth/"
177+
]
170178
},
171179
{
172-
"matchPackagePatterns": [
173-
"com.google.api.grpc:grpc-google-common-protos",
174-
"com.google.api.grpc:grpc-google-iam-v1",
175-
"com.google.api.grpc:proto-google-common-protos",
176-
"com.google.api.grpc:proto-google-iam-v1",
177-
"com.google.api:api-common"
178-
],
179-
"groupName": "Google API dependencies"
180+
"groupName": "Google API dependencies",
181+
"matchPackageNames": [
182+
"/com.google.api.grpc:grpc-google-common-protos/",
183+
"/com.google.api.grpc:grpc-google-iam-v1/",
184+
"/com.google.api.grpc:proto-google-common-protos/",
185+
"/com.google.api.grpc:proto-google-iam-v1/",
186+
"/com.google.api:api-common/"
187+
]
180188
},
181189
{
182-
"matchPackagePatterns": [
183-
"^com.google.http-client"
184-
],
185-
"groupName": "Google HTTP Client dependencies"
190+
"groupName": "Google HTTP Client dependencies",
191+
"matchPackageNames": [
192+
"/^com.google.http-client/"
193+
]
186194
},
187195
{
188-
"matchPackagePatterns": [
189-
"^io.opencensus"
190-
],
191-
"groupName": "OpenCensus dependencies"
196+
"groupName": "OpenCensus dependencies",
197+
"matchPackageNames": [
198+
"/^io.opencensus/"
199+
]
192200
},
193201
{
194-
"matchPackagePatterns": [
195-
"^io.netty"
196-
],
197-
"groupName": "Netty dependencies"
202+
"groupName": "Netty dependencies",
203+
"matchPackageNames": [
204+
"/^io.netty/"
205+
]
198206
}
199207
]
200208
}

0 commit comments

Comments
 (0)