diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index dc53bbb5..5d788be0 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
- digest: sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875
+ digest: sha256:a744afda1956beb7bd6dc8d0b740a7839bbe402e34e2f4ef24589074db53ceb0
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2425d723..05de1f60 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -8,13 +8,11 @@ jobs:
units:
runs-on: ubuntu-latest
strategy:
+ fail-fast: false
matrix:
java: [8, 11, 17]
steps:
- uses: actions/checkout@v2
- - uses: stCarolas/setup-maven@v4
- with:
- maven-version: 3.8.1
- uses: actions/setup-java@v2
with:
distribution: zulu
@@ -27,9 +25,6 @@ jobs:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- - uses: stCarolas/setup-maven@v4
- with:
- maven-version: 3.8.1
- uses: actions/setup-java@v2
with:
distribution: zulu
@@ -45,9 +40,6 @@ jobs:
java: [8, 11, 17]
steps:
- uses: actions/checkout@v2
- - uses: stCarolas/setup-maven@v4
- with:
- maven-version: 3.8.1
- uses: actions/setup-java@v2
with:
distribution: zulu
@@ -58,13 +50,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- - uses: stCarolas/setup-maven@v4
- with:
- maven-version: 3.8.1
- uses: actions/setup-java@v2
with:
distribution: zulu
- java-version: 8
+ java-version: 11
- run: java -version
- run: .kokoro/build.sh
env:
@@ -73,9 +62,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- - uses: stCarolas/setup-maven@v4
- with:
- maven-version: 3.8.1
- uses: actions/setup-java@v2
with:
distribution: zulu
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 9a5105d7..d7476cfe 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -38,15 +38,13 @@ function determineMavenOpts() {
| sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
)
- case $javaVersion in
- "17")
+ if [[ $javaVersion == 17* ]]
+ then
# MaxPermSize is no longer supported as of jdk 17
echo -n "-Xmx1024m"
- ;;
- *)
+ else
echo -n "-Xmx1024m -XX:MaxPermSize=128m"
- ;;
- esac
+ fi
}
export MAVEN_OPTS=$(determineMavenOpts)
diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh
index 8aedd277..c455baf4 100755
--- a/.kokoro/release/publish_javadoc11.sh
+++ b/.kokoro/release/publish_javadoc11.sh
@@ -36,13 +36,9 @@ mvn clean install -B -q -DskipTests=true
export NAME=google-cloud-bigqueryconnection
export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
-# V3 generates docfx yml from javadoc
-# generate yml
-mvn clean site -B -q -P docFX
-
-# copy README to docfx-yml dir and rename index.md
-cp README.md target/docfx-yml/index.md
-# copy CHANGELOG to docfx-yml dir and rename history.md
+# cloud RAD generation
+mvn clean javadoc:aggregate -B -q -P docFX
+# include CHANGELOG
cp CHANGELOG.md target/docfx-yml/history.md
pushd target/docfx-yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52ab82b5..b1231dfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
# Changelog
+### [2.1.6](https://www.github.com/googleapis/java-bigqueryconnection/compare/v2.1.5...v2.1.6) (2021-11-12)
+
+
+### Bug Fixes
+
+* **java:** java 17 dependency arguments ([#1266](https://www.github.com/googleapis/java-bigqueryconnection/issues/1266)) ([#562](https://www.github.com/googleapis/java-bigqueryconnection/issues/562)) ([5a8ce2e](https://www.github.com/googleapis/java-bigqueryconnection/commit/5a8ce2e13aad83d5eb7dba256559238d60a3d89d))
+
+
+### Documentation
+
+* **samples:** update AWS sample due to API changes ([#576](https://www.github.com/googleapis/java-bigqueryconnection/issues/576)) ([e5907fe](https://www.github.com/googleapis/java-bigqueryconnection/commit/e5907fe5b33ebabd17e3a1c6ccbd646c8ffaa217)), closes [#571](https://www.github.com/googleapis/java-bigqueryconnection/issues/571)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.0 ([#577](https://www.github.com/googleapis/java-bigqueryconnection/issues/577)) ([8337fff](https://www.github.com/googleapis/java-bigqueryconnection/commit/8337fff6f67dce7c1d43f7d77fb571e8db4da1e7))
+* update dependency com.google.protobuf:protobuf-java-util to v3.19.1 ([#560](https://www.github.com/googleapis/java-bigqueryconnection/issues/560)) ([b90c49f](https://www.github.com/googleapis/java-bigqueryconnection/commit/b90c49fda9f29bd4e1c55fece6a0f5fae7c85dcf))
+* update dependency com.google.protobuf:protobuf-java-util to v3.19.1 ([#574](https://www.github.com/googleapis/java-bigqueryconnection/issues/574)) ([a7f2a79](https://www.github.com/googleapis/java-bigqueryconnection/commit/a7f2a79e355ae1a176d26aa6092a3c27e142bc5f))
+
### [2.1.5](https://www.github.com/googleapis/java-bigqueryconnection/compare/v2.1.4...v2.1.5) (2021-10-19)
diff --git a/README.md b/README.md
index 77a40974..e9d9110e 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven, add this to your pom.xml file:
com.google.cloud
google-cloud-bigqueryconnection
- 2.1.4
+ 2.1.5
```
@@ -27,13 +27,13 @@ If you are using Maven, add this to your pom.xml file:
If you are using Gradle without BOM, add this to your dependencies
```Groovy
-implementation 'com.google.cloud:google-cloud-bigqueryconnection:2.1.4'
+implementation 'com.google.cloud:google-cloud-bigqueryconnection:2.1.5'
```
If you are using SBT, add this to your dependencies
```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-bigqueryconnection" % "2.1.4"
+libraryDependencies += "com.google.cloud" % "google-cloud-bigqueryconnection" % "2.1.5"
```
## Authentication
@@ -98,7 +98,7 @@ Cloud BigQuery Connection uses gRPC for the transport layer.
## Supported Java Versions
-Java 7 or above is required for using this client.
+Java 8 or above is required for using this client.
Google's Java client libraries,
[Google Cloud Client Libraries][cloudlibs]
@@ -167,7 +167,6 @@ Apache 2.0 - See [LICENSE][license] for more information.
Java Version | Status
------------ | ------
-Java 7 | [![Kokoro CI][kokoro-badge-image-1]][kokoro-badge-link-1]
Java 8 | [![Kokoro CI][kokoro-badge-image-2]][kokoro-badge-link-2]
Java 8 OSX | [![Kokoro CI][kokoro-badge-image-3]][kokoro-badge-link-3]
Java 8 Windows | [![Kokoro CI][kokoro-badge-image-4]][kokoro-badge-link-4]
diff --git a/google-cloud-bigqueryconnection-bom/pom.xml b/google-cloud-bigqueryconnection-bom/pom.xml
index cb97b22c..f0b0df16 100644
--- a/google-cloud-bigqueryconnection-bom/pom.xml
+++ b/google-cloud-bigqueryconnection-bom/pom.xml
@@ -3,12 +3,12 @@
4.0.0
com.google.cloud
google-cloud-bigqueryconnection-bom
- 2.1.5
+ 2.1.6
pom
com.google.cloud
google-cloud-shared-config
- 1.1.0
+ 1.2.1
Google Cloud BigQuery Connections BOM
@@ -52,27 +52,27 @@
com.google.cloud
google-cloud-bigqueryconnection
- 2.1.5
+ 2.1.6
com.google.api.grpc
grpc-google-cloud-bigqueryconnection-v1
- 2.1.5
+ 2.1.6
com.google.api.grpc
grpc-google-cloud-bigqueryconnection-v1beta1
- 0.9.5
+ 0.9.6
com.google.api.grpc
proto-google-cloud-bigqueryconnection-v1
- 2.1.5
+ 2.1.6
com.google.api.grpc
proto-google-cloud-bigqueryconnection-v1beta1
- 0.9.5
+ 0.9.6
diff --git a/google-cloud-bigqueryconnection/pom.xml b/google-cloud-bigqueryconnection/pom.xml
index 5bfaf3cd..2f41d626 100644
--- a/google-cloud-bigqueryconnection/pom.xml
+++ b/google-cloud-bigqueryconnection/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-bigqueryconnection
- 2.1.5
+ 2.1.6
jar
Google Cloud BigQuery Connections
https://github.com/googleapis/java-bigqueryconnection
@@ -11,7 +11,7 @@
com.google.cloud
google-cloud-bigqueryconnection-parent
- 2.1.5
+ 2.1.6
google-cloud-bigqueryconnection
diff --git a/grpc-google-cloud-bigqueryconnection-v1/pom.xml b/grpc-google-cloud-bigqueryconnection-v1/pom.xml
index 13ef6a07..f7e9a8c9 100644
--- a/grpc-google-cloud-bigqueryconnection-v1/pom.xml
+++ b/grpc-google-cloud-bigqueryconnection-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-bigqueryconnection-v1
- 2.1.5
+ 2.1.6
grpc-google-cloud-bigqueryconnection-v1
GRPC library for grpc-google-cloud-bigqueryconnection-v1
com.google.cloud
google-cloud-bigqueryconnection-parent
- 2.1.5
+ 2.1.6
diff --git a/grpc-google-cloud-bigqueryconnection-v1/src/main/java/com/google/cloud/bigquery/connection/v1/ConnectionServiceGrpc.java b/grpc-google-cloud-bigqueryconnection-v1/src/main/java/com/google/cloud/bigquery/connection/v1/ConnectionServiceGrpc.java
index 8d1cedc3..3c517226 100644
--- a/grpc-google-cloud-bigqueryconnection-v1/src/main/java/com/google/cloud/bigquery/connection/v1/ConnectionServiceGrpc.java
+++ b/grpc-google-cloud-bigqueryconnection-v1/src/main/java/com/google/cloud/bigquery/connection/v1/ConnectionServiceGrpc.java
@@ -27,6 +27,7 @@
@javax.annotation.Generated(
value = "by gRPC proto compiler",
comments = "Source: google/cloud/bigquery/connection/v1/connection.proto")
+@io.grpc.stub.annotations.GrpcGenerated
public final class ConnectionServiceGrpc {
private ConnectionServiceGrpc() {}
diff --git a/grpc-google-cloud-bigqueryconnection-v1beta1/pom.xml b/grpc-google-cloud-bigqueryconnection-v1beta1/pom.xml
index 5abeb9d3..8eac5dd8 100644
--- a/grpc-google-cloud-bigqueryconnection-v1beta1/pom.xml
+++ b/grpc-google-cloud-bigqueryconnection-v1beta1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-bigqueryconnection-v1beta1
- 0.9.5
+ 0.9.6
grpc-google-cloud-bigqueryconnection-v1beta1
GRPC library for grpc-google-cloud-bigqueryconnection-v1beta1
com.google.cloud
google-cloud-bigqueryconnection-parent
- 2.1.5
+ 2.1.6
diff --git a/grpc-google-cloud-bigqueryconnection-v1beta1/src/main/java/com/google/cloud/bigquery/connection/v1beta1/ConnectionServiceGrpc.java b/grpc-google-cloud-bigqueryconnection-v1beta1/src/main/java/com/google/cloud/bigquery/connection/v1beta1/ConnectionServiceGrpc.java
index cd47a7b2..fed7c438 100644
--- a/grpc-google-cloud-bigqueryconnection-v1beta1/src/main/java/com/google/cloud/bigquery/connection/v1beta1/ConnectionServiceGrpc.java
+++ b/grpc-google-cloud-bigqueryconnection-v1beta1/src/main/java/com/google/cloud/bigquery/connection/v1beta1/ConnectionServiceGrpc.java
@@ -27,6 +27,7 @@
@javax.annotation.Generated(
value = "by gRPC proto compiler",
comments = "Source: google/cloud/bigquery/connection/v1beta1/connection.proto")
+@io.grpc.stub.annotations.GrpcGenerated
public final class ConnectionServiceGrpc {
private ConnectionServiceGrpc() {}
diff --git a/pom.xml b/pom.xml
index 54e5af8d..64c3b3c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-bigqueryconnection-parent
pom
- 2.1.5
+ 2.1.6
Google Cloud BigQuery Connections Parent
https://github.com/googleapis/java-bigqueryconnection
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-shared-config
- 1.1.0
+ 1.2.1
@@ -54,7 +54,7 @@
UTF-8
github
google-cloud-bigqueryconnection-parent
- 2.4.0
+ 2.5.0
@@ -62,27 +62,27 @@
com.google.cloud
google-cloud-bigqueryconnection
- 2.1.5
+ 2.1.6
com.google.api.grpc
proto-google-cloud-bigqueryconnection-v1
- 2.1.5
+ 2.1.6
com.google.api.grpc
grpc-google-cloud-bigqueryconnection-v1
- 2.1.5
+ 2.1.6
com.google.api.grpc
proto-google-cloud-bigqueryconnection-v1beta1
- 0.9.5
+ 0.9.6
com.google.api.grpc
grpc-google-cloud-bigqueryconnection-v1beta1
- 0.9.5
+ 0.9.6
diff --git a/proto-google-cloud-bigqueryconnection-v1/pom.xml b/proto-google-cloud-bigqueryconnection-v1/pom.xml
index 5c74fc9e..c9c8ac75 100644
--- a/proto-google-cloud-bigqueryconnection-v1/pom.xml
+++ b/proto-google-cloud-bigqueryconnection-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-bigqueryconnection-v1
- 2.1.5
+ 2.1.6
proto-google-cloud-bigqueryconnection-v1
PROTO library for proto-google-cloud-bigqueryconnection-v1
com.google.cloud
google-cloud-bigqueryconnection-parent
- 2.1.5
+ 2.1.6
diff --git a/proto-google-cloud-bigqueryconnection-v1beta1/pom.xml b/proto-google-cloud-bigqueryconnection-v1beta1/pom.xml
index b36b035e..a566e486 100644
--- a/proto-google-cloud-bigqueryconnection-v1beta1/pom.xml
+++ b/proto-google-cloud-bigqueryconnection-v1beta1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-bigqueryconnection-v1beta1
- 0.9.5
+ 0.9.6
proto-google-cloud-bigqueryconnection-v1beta1
PROTO library for proto-google-cloud-bigqueryconnection-v1beta1
com.google.cloud
google-cloud-bigqueryconnection-parent
- 2.1.5
+ 2.1.6
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 68dd7c1b..e1fac3f7 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,14 +29,14 @@
com.google.cloud
google-cloud-bigqueryconnection
- 2.1.4
+ 2.1.5
com.google.protobuf
protobuf-java-util
- 3.18.1
+ 3.19.1
junit
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 2f6cfbca..6e66ee0b 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,14 +28,14 @@
com.google.cloud
google-cloud-bigqueryconnection
- 2.1.5
+ 2.1.6
com.google.protobuf
protobuf-java-util
- 3.18.1
+ 3.19.1
junit
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index e78c5c3f..5723e980 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
libraries-bom
- 23.1.0
+ 24.0.0
pom
import
@@ -40,13 +40,13 @@
com.google.cloud
google-cloud-bigqueryconnection
- 2.1.4
+ 2.1.5
com.google.protobuf
protobuf-java-util
- 3.18.1
+ 3.19.1
junit
diff --git a/samples/snippets/src/main/java/com/example/bigqueryconnection/CreateAwsConnection.java b/samples/snippets/src/main/java/com/example/bigqueryconnection/CreateAwsConnection.java
index 072025b3..f1a76db2 100644
--- a/samples/snippets/src/main/java/com/example/bigqueryconnection/CreateAwsConnection.java
+++ b/samples/snippets/src/main/java/com/example/bigqueryconnection/CreateAwsConnection.java
@@ -17,6 +17,7 @@
package com.example.bigqueryconnection;
// [START bigqueryconnection_create_aws_connection]
+import com.google.cloud.bigquery.connection.v1.AwsAccessRole;
import com.google.cloud.bigquery.connection.v1.AwsCrossAccountRole;
import com.google.cloud.bigquery.connection.v1.AwsProperties;
import com.google.cloud.bigquery.connection.v1.Connection;
@@ -54,12 +55,12 @@ public static void createAwsConnection(
.setConnectionId(connectionId)
.build();
Connection response = client.createConnection(request);
- AwsCrossAccountRole role = response.getAws().getCrossAccountRole();
+ AwsAccessRole role = response.getAws().getAccessRole();
System.out.println(
"Aws connection created successfully : Aws userId :"
- + role.getIamUserId()
+ + role.getIamRoleId()
+ " Aws externalId :"
- + role.getExternalId());
+ + role.getIdentity());
}
}
}
diff --git a/samples/snippets/src/test/java/com/example/bigqueryconnection/CreateAwsConnectionIT.java b/samples/snippets/src/test/java/com/example/bigqueryconnection/CreateAwsConnectionIT.java
index e7dc2d85..f4e1125e 100644
--- a/samples/snippets/src/test/java/com/example/bigqueryconnection/CreateAwsConnectionIT.java
+++ b/samples/snippets/src/test/java/com/example/bigqueryconnection/CreateAwsConnectionIT.java
@@ -19,7 +19,7 @@
import static com.google.common.truth.Truth.assertThat;
import static junit.framework.TestCase.assertNotNull;
-import com.google.cloud.bigquery.connection.v1.AwsCrossAccountRole;
+import com.google.cloud.bigquery.connection.v1.AwsAccessRole;
import com.google.cloud.bigquery.connection.v1.AwsProperties;
import com.google.cloud.bigquery.connection.v1.Connection;
import java.io.ByteArrayOutputStream;
@@ -83,8 +83,8 @@ public void tearDown() throws IOException {
@Test
public void testCreateAwsConnection() throws IOException {
String iamRoleId = String.format("arn:aws:iam::%s:role/%s", AWS_ACCOUNT_ID, AWS_ROLE_ID);
- AwsCrossAccountRole role = AwsCrossAccountRole.newBuilder().setIamRoleId(iamRoleId).build();
- AwsProperties awsProperties = AwsProperties.newBuilder().setCrossAccountRole(role).build();
+ AwsAccessRole awsRole = AwsAccessRole.newBuilder().setIamRoleId(iamRoleId).build();
+ AwsProperties awsProperties = AwsProperties.newBuilder().setAccessRole(awsRole).build();
Connection connection = Connection.newBuilder().setAws(awsProperties).build();
CreateAwsConnection.createAwsConnection(PROJECT_ID, LOCATION, connectionId, connection);
assertThat(bout.toString()).contains("Aws connection created successfully :");
diff --git a/versions.txt b/versions.txt
index 1f53f196..9d6db569 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
# Format:
# module:released-version:current-version
-google-cloud-bigqueryconnection:2.1.5:2.1.5
-grpc-google-cloud-bigqueryconnection-v1:2.1.5:2.1.5
-grpc-google-cloud-bigqueryconnection-v1beta1:0.9.5:0.9.5
-proto-google-cloud-bigqueryconnection-v1:2.1.5:2.1.5
-proto-google-cloud-bigqueryconnection-v1beta1:0.9.5:0.9.5
+google-cloud-bigqueryconnection:2.1.6:2.1.6
+grpc-google-cloud-bigqueryconnection-v1:2.1.6:2.1.6
+grpc-google-cloud-bigqueryconnection-v1beta1:0.9.6:0.9.6
+proto-google-cloud-bigqueryconnection-v1:2.1.6:2.1.6
+proto-google-cloud-bigqueryconnection-v1beta1:0.9.6:0.9.6