Skip to content

Commit cdf2ba9

Browse files
dpebotdzlier-gcp
dpebot
authored and
dzlier-gcp
committed
Auto-update dependencies. (GoogleCloudPlatform#1175)
* Auto-update dependencies. * Revert apache beam version to 2.3.0. Update KMS test regexes to account for new "protectionLevel" field in output.
1 parent 728d7c8 commit cdf2ba9

File tree

9 files changed

+21
-21
lines changed

9 files changed

+21
-21
lines changed

‎dataflow/transforms/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</parent>
3333

3434
<properties>
35-
<beam.version>2.5.0</beam.version>
35+
<beam.version>2.6.0</beam.version>
3636

3737
<google-clients.version>1.22.0</google-clients.version>
3838
<hamcrest.version>1.3</hamcrest.version>

‎iap/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>com.nimbusds</groupId>
6565
<artifactId>nimbus-jose-jwt</artifactId>
66-
<version>5.14</version>
66+
<version>6.0</version>
6767
</dependency>
6868
<!-- [END dependencies] -->
6969

‎kms/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<dependency>
2626
<groupId>com.google.apis</groupId>
2727
<artifactId>google-api-services-cloudkms</artifactId>
28-
<version>v1-rev58-1.24.1</version>
28+
<version>v1-rev59-1.24.1</version>
2929
<exclusions>
3030
<exclusion> <!-- exclude an old version of Guava -->
3131
<groupId>com.google.guava</groupId>

‎kms/src/test/java/com/example/SnippetsIT.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public static void setUpClass() throws Exception {
9595
// Create a CryptoKeyVersion and set it as primary.
9696
Snippets.createCryptoKeyVersion(PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID);
9797
Matcher matcher = Pattern.compile(
98-
".*cryptoKeyVersions/(\\d+)\",\"state\":\"ENABLED\".*",
98+
".*cryptoKeyVersions/(\\d+)\",.*\"state\":\"ENABLED\".*",
9999
Pattern.DOTALL | Pattern.MULTILINE).matcher(bout.toString().trim());
100100
assertTrue(matcher.matches());
101101

@@ -170,44 +170,44 @@ public void listCryptoKeyVersions_printsVersions() throws Exception {
170170
Snippets.listCryptoKeyVersions(PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID);
171171

172172
assertThat(bout.toString()).containsMatch(String.format(
173-
"keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/\\d+\",\"state\":\"ENABLED\"",
173+
"keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/\\d+\",.*\"state\":\"ENABLED\"",
174174
KEY_RING_ID, CRYPTO_KEY_ID));
175175
}
176176

177177
@Test
178178
public void disableCryptoKeyVersion_disables() throws Exception {
179179
Snippets.createCryptoKeyVersion(PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID);
180180

181-
Matcher matcher = Pattern.compile(".*cryptoKeyVersions/(\\d+)\",\"state\":\"ENABLED\".*",
181+
Matcher matcher = Pattern.compile(".*cryptoKeyVersions/(\\d+)\",.*\"state\":\"ENABLED\".*",
182182
Pattern.DOTALL | Pattern.MULTILINE).matcher(bout.toString().trim());
183183
assertTrue(matcher.matches());
184184
String version = matcher.group(1);
185185

186186
Snippets.disableCryptoKeyVersion(PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID, version);
187187
assertThat(bout.toString()).containsMatch(String.format(
188-
"keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/%s\",\"state\":\"DISABLED\"",
188+
"keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/%s\",.*\"state\":\"DISABLED\"",
189189
KEY_RING_ID, CRYPTO_KEY_ID, version));
190190
}
191191

192192
@Test
193193
public void enableCryptoKeyVersion_enables() throws Exception {
194194
Snippets.createCryptoKeyVersion(PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID);
195195

196-
Matcher matcher = Pattern.compile(".*cryptoKeyVersions/(\\d+)\",\"state\":\"ENABLED\".*",
196+
Matcher matcher = Pattern.compile(".*cryptoKeyVersions/(\\d+)\",.*\"state\":\"ENABLED\".*",
197197
Pattern.DOTALL | Pattern.MULTILINE).matcher(bout.toString().trim());
198198
assertTrue(matcher.matches());
199199
String version = matcher.group(1);
200200

201201
// Disable the new key version
202202
Snippets.disableCryptoKeyVersion(PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID, version);
203203
assertThat(bout.toString()).containsMatch(String.format(
204-
"keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/%s\",\"state\":\"DISABLED\"",
204+
"keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/%s\",.*\"state\":\"DISABLED\"",
205205
KEY_RING_ID, CRYPTO_KEY_ID, version));
206206

207207
// Enable the now-disabled key version
208208
Snippets.enableCryptoKeyVersion(PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID, version);
209209
assertThat(bout.toString()).containsMatch(String.format(
210-
"keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/%s\",\"state\":\"ENABLED\"",
210+
"keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/%s\",.*\"state\":\"ENABLED\"",
211211
KEY_RING_ID, CRYPTO_KEY_ID, version));
212212

213213
}
@@ -216,7 +216,7 @@ public void enableCryptoKeyVersion_enables() throws Exception {
216216
public void destroyCryptoKeyVersion_destroys() throws Exception {
217217
Snippets.createCryptoKeyVersion(PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID);
218218

219-
Matcher matcher = Pattern.compile(".*cryptoKeyVersions/(\\d+)\",\"state\":\"ENABLED\".*",
219+
Matcher matcher = Pattern.compile(".*cryptoKeyVersions/(\\d+)\",.*\"state\":\"ENABLED\".*",
220220
Pattern.DOTALL | Pattern.MULTILINE).matcher(bout.toString().trim());
221221
assertTrue(matcher.matches());
222222

@@ -225,7 +225,7 @@ public void destroyCryptoKeyVersion_destroys() throws Exception {
225225
Snippets.destroyCryptoKeyVersion(PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID, version);
226226

227227
assertThat(bout.toString()).containsMatch(String.format(
228-
"keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/%s\",\"state\":\"DESTROY_SCHEDULED\"",
228+
"keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/%s\",.*\"state\":\"DESTROY_SCHEDULED\"",
229229
KEY_RING_ID, CRYPTO_KEY_ID, version));
230230
}
231231

@@ -234,7 +234,7 @@ public void destroyCryptoKeyVersion_destroys() throws Exception {
234234
public void restoreCryptoKeyVersion_restores() throws Exception {
235235
Snippets.createCryptoKeyVersion(PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID);
236236

237-
Matcher matcher = Pattern.compile(".*cryptoKeyVersions/(\\d+)\",\"state\":\"ENABLED\".*",
237+
Matcher matcher = Pattern.compile(".*cryptoKeyVersions/(\\d+)\",.*\"state\":\"ENABLED\".*",
238238
Pattern.DOTALL | Pattern.MULTILINE).matcher(bout.toString().trim());
239239
assertTrue(matcher.matches());
240240

@@ -245,14 +245,14 @@ public void restoreCryptoKeyVersion_restores() throws Exception {
245245
Snippets.destroyCryptoKeyVersion(PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID, version);
246246

247247
assertThat(bout.toString()).containsMatch(String.format(
248-
"keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/%s\",\"state\":\"DESTROY_SCHEDULED\"",
248+
"keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/%s\",.*\"state\":\"DESTROY_SCHEDULED\"",
249249
KEY_RING_ID, CRYPTO_KEY_ID, version));
250250

251251
// Now restore the key version.
252252
Snippets.restoreCryptoKeyVersion(PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID, version);
253253

254254
assertThat(bout.toString()).containsMatch(String.format(
255-
"keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/%s\",\"state\":\"DISABLED\"",
255+
"keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/%s\",.*\"state\":\"DISABLED\"",
256256
KEY_RING_ID, CRYPTO_KEY_ID, version));
257257
}
258258

@@ -262,7 +262,7 @@ public void setPrimaryVersion_createKeyAndSetPrimaryVersion() throws Exception {
262262
// caching. So we test that the call was successful.
263263
Snippets.createCryptoKeyVersion(PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID);
264264

265-
Matcher matcher = Pattern.compile(".*cryptoKeyVersions/(\\d+)\",\"state\":\"ENABLED\".*",
265+
Matcher matcher = Pattern.compile(".*cryptoKeyVersions/(\\d+)\",.*\"state\":\"ENABLED\".*",
266266
Pattern.DOTALL | Pattern.MULTILINE).matcher(bout.toString().trim());
267267
assertTrue(matcher.matches());
268268

‎storage/storage-transfer/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>com.google.apis</groupId>
4545
<artifactId>google-api-services-storagetransfer</artifactId>
46-
<version>v1-rev72-1.24.1</version>
46+
<version>v1-rev73-1.24.1</version>
4747
<exclusions>
4848
<exclusion> <!-- exclude an old version of Guava -->
4949
<groupId>com.google.guava</groupId>

‎vision/face-detection/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>com.google.apis</groupId>
4343
<artifactId>google-api-services-vision</artifactId>
44-
<version>v1-rev388-1.24.1</version>
44+
<version>v1-rev389-1.24.1</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>com.google.api-client</groupId>

‎vision/label/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>com.google.apis</groupId>
4242
<artifactId>google-api-services-vision</artifactId>
43-
<version>v1-rev388-1.24.1</version>
43+
<version>v1-rev389-1.24.1</version>
4444
</dependency>
4545
<dependency>
4646
<groupId>com.google.api-client</groupId>

‎vision/landmark-detection/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>com.google.apis</groupId>
4242
<artifactId>google-api-services-vision</artifactId>
43-
<version>v1-rev388-1.24.1</version>
43+
<version>v1-rev389-1.24.1</version>
4444
</dependency>
4545
<dependency>
4646
<groupId>com.google.api-client</groupId>

‎vision/text/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>com.google.apis</groupId>
4242
<artifactId>google-api-services-vision</artifactId>
43-
<version>v1-rev388-1.24.1</version>
43+
<version>v1-rev389-1.24.1</version>
4444
</dependency>
4545
<dependency>
4646
<groupId>com.google.api-client</groupId>

0 commit comments

Comments
 (0)