diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 1830d09a..91c0ea20 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:4837f2a7fdff2985b4f7432f8a6d6a87beacebf3ac071746532c0ce2e3f24b9b 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..e23d923e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,6 +12,9 @@ jobs: java: [8, 11] steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: ${{matrix.java}} @@ -37,28 +40,21 @@ jobs: java: [8, 11] steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: 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: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: 8 @@ -70,10 +66,13 @@ 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@v1 with: java-version: 8 - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr + JOB_TYPE: clirr \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index a116c581..d180f474 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.1.0](https://www.github.com/googleapis/java-debugger-client/compare/v1.0.2...v1.1.0) (2021-09-02) + + +### Features + +* Remove use of deprecated gradle command in java README ([#1196](https://www.github.com/googleapis/java-debugger-client/issues/1196)) ([#53](https://www.github.com/googleapis/java-debugger-client/issues/53)) ([a2f7bf8](https://www.github.com/googleapis/java-debugger-client/commit/a2f7bf8d39d9280b495793c37df4db6eee081355)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.0 ([#56](https://www.github.com/googleapis/java-debugger-client/issues/56)) ([b439309](https://www.github.com/googleapis/java-debugger-client/commit/b4393096b900d86d662bf09007c1f4a1ebbacbe0)) + ### [1.0.2](https://www.github.com/googleapis/java-debugger-client/compare/v1.0.1...v1.0.2) (2021-08-23) diff --git a/README.md b/README.md index 72fd25a3..adc3c484 100644 --- a/README.md +++ b/README.md @@ -19,20 +19,20 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-debugger-client - 1.0.1 + 1.0.2 ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-debugger-client:1.0.1' +implementation 'com.google.cloud:google-cloud-debugger-client:1.0.2' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-debugger-client" % "1.0.1" +libraryDependencies += "com.google.cloud" % "google-cloud-debugger-client" % "1.0.2" ``` ## Authentication diff --git a/google-cloud-debugger-client-bom/pom.xml b/google-cloud-debugger-client-bom/pom.xml index 067fe206..905e96b0 100644 --- a/google-cloud-debugger-client-bom/pom.xml +++ b/google-cloud-debugger-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-debugger-client-bom - 1.0.2 + 1.1.0 pom com.google.cloud @@ -56,22 +56,22 @@ com.google.cloud google-cloud-debugger-client - 1.0.2 + 1.1.0 com.google.api.grpc grpc-google-cloud-debugger-client-v2 - 1.0.2 + 1.1.0 com.google.api.grpc proto-google-cloud-debugger-client-v2 - 1.0.2 + 1.1.0 com.google.api.grpc proto-google-devtools-source-protos - 1.0.2 + 1.1.0 diff --git a/google-cloud-debugger-client/pom.xml b/google-cloud-debugger-client/pom.xml index 7e8843be..8d346600 100644 --- a/google-cloud-debugger-client/pom.xml +++ b/google-cloud-debugger-client/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-debugger-client - 1.0.2 + 1.1.0 jar Google Cloud Debugger https://github.com/googleapis/java-debugger-client @@ -11,7 +11,7 @@ com.google.cloud google-cloud-debugger-client-parent - 1.0.2 + 1.1.0 google-cloud-debugger-client diff --git a/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/Controller2StubSettings.java b/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/Controller2StubSettings.java index 736434e3..1e8421ba 100644 --- a/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/Controller2StubSettings.java +++ b/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/Controller2StubSettings.java @@ -146,7 +146,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/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/Debugger2StubSettings.java b/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/Debugger2StubSettings.java index 6c6ab41a..f3121410 100644 --- a/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/Debugger2StubSettings.java +++ b/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/Debugger2StubSettings.java @@ -160,7 +160,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-debugger-client-v2/pom.xml b/grpc-google-cloud-debugger-client-v2/pom.xml index 225bf7c1..56895f9e 100644 --- a/grpc-google-cloud-debugger-client-v2/pom.xml +++ b/grpc-google-cloud-debugger-client-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-debugger-client-v2 - 1.0.2 + 1.1.0 grpc-google-cloud-debugger-client-v2 GRPC library for google-cloud-debugger-client com.google.cloud google-cloud-debugger-client-parent - 1.0.2 + 1.1.0 diff --git a/pom.xml b/pom.xml index 69a5c7f9..49a43445 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-debugger-client-parent pom - 1.0.2 + 1.1.0 Google Cloud Debugger Parent https://github.com/googleapis/java-debugger-client @@ -69,28 +69,28 @@ com.google.cloud google-cloud-debugger-client - 1.0.2 + 1.1.0 com.google.api.grpc grpc-google-cloud-debugger-client-v2 - 1.0.2 + 1.1.0 com.google.api.grpc proto-google-cloud-debugger-client-v2 - 1.0.2 + 1.1.0 com.google.api.grpc proto-google-devtools-source-protos - 1.0.2 + 1.1.0 com.google.cloud google-cloud-shared-dependencies - 2.1.0 + 2.2.0 pom import diff --git a/proto-google-cloud-debugger-client-v2/pom.xml b/proto-google-cloud-debugger-client-v2/pom.xml index 651288e5..93731888 100644 --- a/proto-google-cloud-debugger-client-v2/pom.xml +++ b/proto-google-cloud-debugger-client-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-debugger-client-v2 - 1.0.2 + 1.1.0 proto-google-cloud-debugger-client-v2 Proto library for google-cloud-debugger-client com.google.cloud google-cloud-debugger-client-parent - 1.0.2 + 1.1.0 diff --git a/proto-google-devtools-source-protos/pom.xml b/proto-google-devtools-source-protos/pom.xml index 89fb37ae..6d1030ab 100644 --- a/proto-google-devtools-source-protos/pom.xml +++ b/proto-google-devtools-source-protos/pom.xml @@ -5,12 +5,12 @@ 4.0.0 com.google.api.grpc proto-google-devtools-source-protos - 1.0.2 + 1.1.0 proto-google-devtools-source-protos com.google.cloud google-cloud-debugger-client-parent - 1.0.2 + 1.1.0 diff --git a/renovate.json b/renovate.json index c6ca4227..20b9ec5b 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/versions.txt b/versions.txt index fc327866..b818536f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,7 +1,7 @@ # Format: # module:released-version:current-version -google-cloud-debugger-client:1.0.2:1.0.2 -grpc-google-cloud-debugger-client-v2:1.0.2:1.0.2 -proto-google-cloud-debugger-client-v2:1.0.2:1.0.2 -proto-google-devtools-source-protos:1.0.2:1.0.2 +google-cloud-debugger-client:1.1.0:1.1.0 +grpc-google-cloud-debugger-client-v2:1.1.0:1.1.0 +proto-google-cloud-debugger-client-v2:1.1.0:1.1.0 +proto-google-devtools-source-protos:1.1.0:1.1.0