diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 1830d09a..fb70e14d 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:8e27e5a7297b40eca3ab46ae67f10c575813a85c673839030aa161d0818f3a24 + digest: sha256:2595f321d9a9acf34c2d02e4dc5ec214ce07eecdb43978382d8a88476dec0c16 diff --git a/.github/release-trigger.yml b/.github/release-trigger.yml new file mode 100644 index 00000000..d4ca9418 --- /dev/null +++ b/.github/release-trigger.yml @@ -0,0 +1 @@ +enabled: true diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index ffd39f6f..32e0ea5a 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -10,7 +10,6 @@ branchProtectionRules: requiredStatusCheckContexts: - dependencies (8) - dependencies (11) - - linkage-monitor - lint - clirr - units (8) @@ -26,7 +25,6 @@ branchProtectionRules: requiredStatusCheckContexts: - dependencies (8) - dependencies (11) - - linkage-monitor - lint - clirr - units (7) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 65ae6ecd..d510359d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -42,19 +42,6 @@ jobs: java-version: ${{matrix.java}} - run: java -version - run: .kokoro/dependencies.sh - linkage-monitor: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: 8 - - run: java -version - - name: Install artifacts to local Maven repository - run: .kokoro/build.sh - shell: bash - - name: Validate any conflicts with regard to com.google.cloud:libraries-bom (latest release) - uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor lint: runs-on: ubuntu-latest steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 906de115..50880392 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [2.1.0](https://www.github.com/googleapis/java-shell/compare/v2.0.2...v2.1.0) (2021-08-31) + + +### Features + +* Remove use of deprecated gradle command in java README ([#1196](https://www.github.com/googleapis/java-shell/issues/1196)) ([#66](https://www.github.com/googleapis/java-shell/issues/66)) ([999e72c](https://www.github.com/googleapis/java-shell/commit/999e72c4d3057bf867b8a391d88b128e8dcb2ba6)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.0 ([#69](https://www.github.com/googleapis/java-shell/issues/69)) ([12a2999](https://www.github.com/googleapis/java-shell/commit/12a299956a4cf638aa6ada2c06a5f4a75075749e)) + ### [2.0.2](https://www.github.com/googleapis/java-shell/compare/v2.0.1...v2.0.2) (2021-08-23) diff --git a/README.md b/README.md index fba8da0d..59573177 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-shell - 1.0.0 + 2.0.2 ``` @@ -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 -compile 'com.google.cloud:google-cloud-shell:2.0.1' +implementation 'com.google.cloud:google-cloud-shell:2.0.2' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-shell" % "2.0.1" +libraryDependencies += "com.google.cloud" % "google-cloud-shell" % "2.0.2" ``` ## Authentication diff --git a/google-cloud-shell-bom/pom.xml b/google-cloud-shell-bom/pom.xml index 9f57f2ef..4015d64d 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 - 2.0.2 + 2.1.0 pom com.google.cloud @@ -56,17 +56,17 @@ com.google.cloud google-cloud-shell - 2.0.2 + 2.1.0 com.google.api.grpc grpc-google-cloud-shell-v1 - 2.0.2 + 2.1.0 com.google.api.grpc proto-google-cloud-shell-v1 - 2.0.2 + 2.1.0 diff --git a/google-cloud-shell/pom.xml b/google-cloud-shell/pom.xml index ddba9013..5900bf93 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 - 2.0.2 + 2.1.0 jar Google Cloud Shell https://github.com/googleapis/java-shell @@ -11,7 +11,7 @@ com.google.cloud google-cloud-shell-parent - 2.0.2 + 2.1.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 1ef7ed7d..1168e796 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 @@ -203,7 +203,9 @@ public static List getDefaultServiceScopes() { /** Returns a builder for the default credentials for this service. */ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() { - return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES); + return GoogleCredentialsProvider.newBuilder() + .setScopesToApply(DEFAULT_SERVICE_SCOPES) + .setUseJwtAccessWithScope(true); } /** Returns a builder for the default ChannelProvider for this service. */ diff --git a/grpc-google-cloud-shell-v1/pom.xml b/grpc-google-cloud-shell-v1/pom.xml index c8a731ec..a3b9420b 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 - 2.0.2 + 2.1.0 grpc-google-cloud-shell-v1 GRPC library for google-cloud-shell com.google.cloud google-cloud-shell-parent - 2.0.2 + 2.1.0 diff --git a/pom.xml b/pom.xml index 6642dc9b..d588dc82 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shell-parent pom - 2.0.2 + 2.1.0 Google Cloud Shell Parent https://github.com/googleapis/java-shell @@ -60,23 +60,23 @@ com.google.cloud google-cloud-shell - 2.0.2 + 2.1.0 com.google.api.grpc grpc-google-cloud-shell-v1 - 2.0.2 + 2.1.0 com.google.api.grpc proto-google-cloud-shell-v1 - 2.0.2 + 2.1.0 com.google.cloud google-cloud-shared-dependencies - 2.1.0 + 2.2.0 pom import diff --git a/proto-google-cloud-shell-v1/pom.xml b/proto-google-cloud-shell-v1/pom.xml index c2dbb042..81fbbb1f 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 - 2.0.2 + 2.1.0 proto-google-cloud-shell-v1 Proto library for google-cloud-shell com.google.cloud google-cloud-shell-parent - 2.0.2 + 2.1.0 diff --git a/renovate.json b/renovate.json index 245841e0..ffd19166 100644 --- a/renovate.json +++ b/renovate.json @@ -50,7 +50,8 @@ "^junit:junit", "^com.google.truth:truth", "^org.mockito:mockito-core", - "^org.objenesis:objenesis" + "^org.objenesis:objenesis", + "^com.google.cloud:google-cloud-conformance-tests" ], "semanticCommitType": "test", "semanticCommitScope": "deps" diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 68e27418..452ff3a3 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-shell - 1.0.0 + 2.0.2 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 2005a482..bbac1145 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-shell - 1.0.0 + 2.0.2 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 2038983e..8b56310d 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-shell - 1.0.0 + 2.0.2 diff --git a/versions.txt b/versions.txt index 1fd8b666..59980130 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-shell:2.0.2:2.0.2 -grpc-google-cloud-shell-v1:2.0.2:2.0.2 -proto-google-cloud-shell-v1:2.0.2:2.0.2 +google-cloud-shell:2.1.0:2.1.0 +grpc-google-cloud-shell-v1:2.1.0:2.1.0 +proto-google-cloud-shell-v1:2.1.0:2.1.0