Skip to content

Auto-update dependencies. #1175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dzlier-gcp merged 2 commits into from
Aug 9, 2018
Merged

Auto-update dependencies. #1175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45a9da7
Auto-update dependencies.
dpebot Aug 9, 2018
4a956b0
Revert apache beam version to 2.3.0.
dzlier-gcp Aug 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dataflow/transforms/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</parent>

<properties>
<beam.version>2.5.0</beam.version>
<beam.version>2.6.0</beam.version>

<google-clients.version>1.22.0</google-clients.version>
<hamcrest.version>1.3</hamcrest.version>
Expand Down
2 changes: 1 addition & 1 deletion iap/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>5.14</version>
<version>6.0</version>
</dependency>
<!-- [END dependencies] -->

Expand Down
2 changes: 1 addition & 1 deletion kms/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-cloudkms</artifactId>
<version>v1-rev58-1.24.1</version>
<version>v1-rev59-1.24.1</version>
<exclusions>
<exclusion> <!-- exclude an old version of Guava -->
<groupId>com.google.guava</groupId>
Expand Down
26 changes: 13 additions & 13 deletions kms/src/test/java/com/example/SnippetsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public static void setUpClass() throws Exception {
// Create a CryptoKeyVersion and set it as primary.
Snippets.createCryptoKeyVersion(PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID);
Matcher matcher = Pattern.compile(
".*cryptoKeyVersions/(\\d+)\",\"state\":\"ENABLED\".*",
".*cryptoKeyVersions/(\\d+)\",.*\"state\":\"ENABLED\".*",
Pattern.DOTALL | Pattern.MULTILINE).matcher(bout.toString().trim());
assertTrue(matcher.matches());

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

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

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

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

Snippets.disableCryptoKeyVersion(PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID, version);
assertThat(bout.toString()).containsMatch(String.format(
"keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/%s\",\"state\":\"DISABLED\"",
"keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/%s\",.*\"state\":\"DISABLED\"",
KEY_RING_ID, CRYPTO_KEY_ID, version));
}

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

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

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

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

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

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

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

assertThat(bout.toString()).containsMatch(String.format(
"keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/%s\",\"state\":\"DESTROY_SCHEDULED\"",
"keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/%s\",.*\"state\":\"DESTROY_SCHEDULED\"",
KEY_RING_ID, CRYPTO_KEY_ID, version));
}

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

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

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

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

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

assertThat(bout.toString()).containsMatch(String.format(
"keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/%s\",\"state\":\"DISABLED\"",
"keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/%s\",.*\"state\":\"DISABLED\"",
KEY_RING_ID, CRYPTO_KEY_ID, version));
}

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

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

Expand Down
2 changes: 1 addition & 1 deletion storage/storage-transfer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-storagetransfer</artifactId>
<version>v1-rev72-1.24.1</version>
<version>v1-rev73-1.24.1</version>
<exclusions>
<exclusion> <!-- exclude an old version of Guava -->
<groupId>com.google.guava</groupId>
Expand Down
2 changes: 1 addition & 1 deletion vision/face-detection/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-vision</artifactId>
<version>v1-rev388-1.24.1</version>
<version>v1-rev389-1.24.1</version>
</dependency>
<dependency>
<groupId>com.google.api-client</groupId>
Expand Down
2 changes: 1 addition & 1 deletion vision/label/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-vision</artifactId>
<version>v1-rev388-1.24.1</version>
<version>v1-rev389-1.24.1</version>
</dependency>
<dependency>
<groupId>com.google.api-client</groupId>
Expand Down
2 changes: 1 addition & 1 deletion vision/landmark-detection/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-vision</artifactId>
<version>v1-rev388-1.24.1</version>
<version>v1-rev389-1.24.1</version>
</dependency>
<dependency>
<groupId>com.google.api-client</groupId>
Expand Down
2 changes: 1 addition & 1 deletion vision/text/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-vision</artifactId>
<version>v1-rev388-1.24.1</version>
<version>v1-rev389-1.24.1</version>
</dependency>
<dependency>
<groupId>com.google.api-client</groupId>
Expand Down