diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index a32a9e04..a86dc465 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
docker:
- digest: sha256:ee698481139bf3df35cd83d2f17f9670ee914d6184f8909a81d672a6abaf0e72
- image: gcr.io/repo-automation-bots/owlbot-java:latest
\ No newline at end of file
+ image: gcr.io/repo-automation-bots/owlbot-java:latest
+ digest: sha256:a9b83a276c82987d284b733713fe86a3c8a2cc457933767eeb2688b882e54c6a
diff --git a/.kokoro/coerce_logs.sh b/.kokoro/coerce_logs.sh
index 5cf7ba49..46edbf7f 100755
--- a/.kokoro/coerce_logs.sh
+++ b/.kokoro/coerce_logs.sh
@@ -28,7 +28,6 @@ job=$(basename ${KOKORO_JOB_NAME})
echo "coercing sponge logs..."
for xml in `find . -name *-sponge_log.xml`
do
- echo "processing ${xml}"
class=$(basename ${xml} | cut -d- -f2)
dir=$(dirname ${xml})/${job}/${class}
text=$(dirname ${xml})/${class}-sponge_log.txt
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 59d2aafc..9030ba8f 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -14,6 +14,7 @@
# limitations under the License.
set -eo pipefail
+shopt -s nullglob
## Get the directory of the build script
scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
@@ -46,7 +47,7 @@ function completenessCheck() {
# This is stripped from the output as it is not present in the flattened pom.
# Only dependencies with 'compile' or 'runtime' scope are included from original dependency list.
msg "Generating dependency list using original pom..."
- mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt
+ mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt
# Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
msg "Generating dependency list using flattened pom..."
@@ -70,7 +71,7 @@ function completenessCheck() {
set +e
error_count=0
-for path in $(find -name ".flattened-pom.xml")
+for path in **/.flattened-pom.xml
do
# Check flattened pom in each dir that contains it for completeness
dir=$(dirname "$path")
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb4550f3..ee30fcbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
# Changelog
+## [1.0.0](https://www.github.com/googleapis/java-shell/compare/v0.1.1...v1.0.0) (2021-07-01)
+
+
+### Features
+
+* promote to 1.0.0 ([#29](https://www.github.com/googleapis/java-shell/issues/29)) ([cb7e34d](https://www.github.com/googleapis/java-shell/commit/cb7e34df8f09c54dde2e36e6edd02c3179bb0020))
+
+
+### Bug Fixes
+
+* Add `shopt -s nullglob` to dependencies script ([#1130](https://www.github.com/googleapis/java-shell/issues/1130)) ([#26](https://www.github.com/googleapis/java-shell/issues/26)) ([82b74ef](https://www.github.com/googleapis/java-shell/commit/82b74efd4c1f2040c161244e842f7a3b16ca3153))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.4.0 ([#28](https://www.github.com/googleapis/java-shell/issues/28)) ([1651ff8](https://www.github.com/googleapis/java-shell/commit/1651ff83ffec3bb020372fc07a9bd6674e2fcab5))
+
### [0.1.1](https://www.github.com/googleapis/java-shell/compare/v0.1.0...v0.1.1) (2021-06-04)
diff --git a/google-cloud-shell-bom/pom.xml b/google-cloud-shell-bom/pom.xml
index 706ef8ce..9f7a17e6 100644
--- a/google-cloud-shell-bom/pom.xml
+++ b/google-cloud-shell-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-shell-bom
- 0.1.1
+ 1.0.0
pom
com.google.cloud
@@ -56,17 +56,17 @@
com.google.cloud
google-cloud-shell
- 0.1.1
+ 1.0.0
com.google.api.grpc
grpc-google-cloud-shell-v1
- 0.1.1
+ 1.0.0
com.google.api.grpc
proto-google-cloud-shell-v1
- 0.1.1
+ 1.0.0
diff --git a/google-cloud-shell/pom.xml b/google-cloud-shell/pom.xml
index 0a91f539..0fd5a352 100644
--- a/google-cloud-shell/pom.xml
+++ b/google-cloud-shell/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-shell
- 0.1.1
+ 1.0.0
jar
Google Cloud Shell
https://github.com/googleapis/java-shell
@@ -11,7 +11,7 @@
com.google.cloud
google-cloud-shell-parent
- 0.1.1
+ 1.0.0
google-cloud-shell
diff --git a/google-cloud-shell/src/main/java/com/google/cloud/shell/v1/stub/CloudShellServiceStubSettings.java b/google-cloud-shell/src/main/java/com/google/cloud/shell/v1/stub/CloudShellServiceStubSettings.java
index 97584680..2dfb0c2e 100644
--- a/google-cloud-shell/src/main/java/com/google/cloud/shell/v1/stub/CloudShellServiceStubSettings.java
+++ b/google-cloud-shell/src/main/java/com/google/cloud/shell/v1/stub/CloudShellServiceStubSettings.java
@@ -191,6 +191,11 @@ public static String getDefaultEndpoint() {
return "cloudshell.googleapis.com:443";
}
+ /** Returns the default mTLS service endpoint. */
+ public static String getDefaultMtlsEndpoint() {
+ return "cloudshell.mtls.googleapis.com:443";
+ }
+
/** Returns the default service scopes. */
public static List getDefaultServiceScopes() {
return DEFAULT_SERVICE_SCOPES;
@@ -374,6 +379,8 @@ private static Builder createDefault() {
builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
builder.setEndpoint(getDefaultEndpoint());
+ builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
+ builder.setSwitchToMtlsEndpointAllowed(true);
return initDefaults(builder);
}
diff --git a/google-cloud-shell/src/test/java/com/google/cloud/shell/v1/CloudShellServiceClientTest.java b/google-cloud-shell/src/test/java/com/google/cloud/shell/v1/CloudShellServiceClientTest.java
index cafb4a08..1fcb9d29 100644
--- a/google-cloud-shell/src/test/java/com/google/cloud/shell/v1/CloudShellServiceClientTest.java
+++ b/google-cloud-shell/src/test/java/com/google/cloud/shell/v1/CloudShellServiceClientTest.java
@@ -47,8 +47,8 @@
public class CloudShellServiceClientTest {
private static MockCloudShellService mockCloudShellService;
private static MockServiceHelper mockServiceHelper;
- private CloudShellServiceClient client;
private LocalChannelProvider channelProvider;
+ private CloudShellServiceClient client;
@BeforeClass
public static void startStaticServer() {
diff --git a/grpc-google-cloud-shell-v1/pom.xml b/grpc-google-cloud-shell-v1/pom.xml
index 71b22630..391316ba 100644
--- a/grpc-google-cloud-shell-v1/pom.xml
+++ b/grpc-google-cloud-shell-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-shell-v1
- 0.1.1
+ 1.0.0
grpc-google-cloud-shell-v1
GRPC library for google-cloud-shell
com.google.cloud
google-cloud-shell-parent
- 0.1.1
+ 1.0.0
diff --git a/pom.xml b/pom.xml
index 2753babe..d2383225 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-shell-parent
pom
- 0.1.1
+ 1.0.0
Google Cloud Shell Parent
https://github.com/googleapis/java-shell
@@ -60,23 +60,23 @@
com.google.cloud
google-cloud-shell
- 0.1.1
+ 1.0.0
com.google.api.grpc
grpc-google-cloud-shell-v1
- 0.1.1
+ 1.0.0
com.google.api.grpc
proto-google-cloud-shell-v1
- 0.1.1
+ 1.0.0
com.google.cloud
google-cloud-shared-dependencies
- 1.3.0
+ 1.4.0
pom
import
diff --git a/proto-google-cloud-shell-v1/pom.xml b/proto-google-cloud-shell-v1/pom.xml
index 4d98407c..419f811e 100644
--- a/proto-google-cloud-shell-v1/pom.xml
+++ b/proto-google-cloud-shell-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-shell-v1
- 0.1.1
+ 1.0.0
proto-google-cloud-shell-v1
Proto library for google-cloud-shell
com.google.cloud
google-cloud-shell-parent
- 0.1.1
+ 1.0.0
diff --git a/proto-google-cloud-shell-v1/src/main/java/com/google/cloud/shell/v1/EnvironmentName.java b/proto-google-cloud-shell-v1/src/main/java/com/google/cloud/shell/v1/EnvironmentName.java
index debf6a33..3527419b 100644
--- a/proto-google-cloud-shell-v1/src/main/java/com/google/cloud/shell/v1/EnvironmentName.java
+++ b/proto-google-cloud-shell-v1/src/main/java/com/google/cloud/shell/v1/EnvironmentName.java
@@ -181,8 +181,8 @@ public Builder setEnvironment(String environment) {
}
private Builder(EnvironmentName environmentName) {
- user = environmentName.user;
- environment = environmentName.environment;
+ this.user = environmentName.user;
+ this.environment = environmentName.environment;
}
public EnvironmentName build() {
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index d7360e99..09801214 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -14,7 +14,7 @@
com.google.cloud.samples
shared-configuration
- 1.0.22
+ 1.0.23
@@ -29,7 +29,7 @@
com.google.cloud
google-cloud-shell
- 0.1.0
+ 0.1.1
diff --git a/samples/pom.xml b/samples/pom.xml
index 607a0d7a..ea750b62 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -18,7 +18,7 @@
com.google.cloud.samples
shared-configuration
- 1.0.22
+ 1.0.23
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 0fa83b07..4dfcc3ca 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -14,7 +14,7 @@
com.google.cloud.samples
shared-configuration
- 1.0.22
+ 1.0.23
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-shell
- 0.1.0
+ 0.1.1
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 17a18a85..21180612 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -14,7 +14,7 @@
com.google.cloud.samples
shared-configuration
- 1.0.22
+ 1.0.23
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-shell
- 0.1.0
+ 0.1.1
diff --git a/versions.txt b/versions.txt
index 5443ab15..0fcdd341 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,6 +1,6 @@
# Format:
# module:released-version:current-version
-google-cloud-shell:0.1.1:0.1.1
-grpc-google-cloud-shell-v1:0.1.1:0.1.1
-proto-google-cloud-shell-v1:0.1.1:0.1.1
+google-cloud-shell:1.0.0:1.0.0
+grpc-google-cloud-shell-v1:1.0.0:1.0.0
+proto-google-cloud-shell-v1:1.0.0:1.0.0