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 f2d2e3c9..813e7be6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.122.0](https://www.github.com/googleapis/java-datalabeling/compare/v0.121.2...v0.122.0) (2021-09-01) + + +### Features + +* Remove use of deprecated gradle command in java README ([#1196](https://www.github.com/googleapis/java-datalabeling/issues/1196)) ([#588](https://www.github.com/googleapis/java-datalabeling/issues/588)) ([1e11758](https://www.github.com/googleapis/java-datalabeling/commit/1e117581d2b8773eb0e91db632a9ba9e5220b82e)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.0 ([#590](https://www.github.com/googleapis/java-datalabeling/issues/590)) ([c0ada08](https://www.github.com/googleapis/java-datalabeling/commit/c0ada084c083c2f0dfd8b0b67f45323a8f215ea3)) + ### [0.121.2](https://www.github.com/googleapis/java-datalabeling/compare/v0.121.1...v0.121.2) (2021-08-23) diff --git a/README.md b/README.md index 89a5ade7..3193cb73 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 21.0.0 + 22.0.0 pom import @@ -44,7 +44,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-datalabeling - 0.121.0 + 0.121.2 ``` @@ -52,20 +52,20 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:21.0.0') +implementation platform('com.google.cloud:libraries-bom:22.0.0') -compile 'com.google.cloud:google-cloud-datalabeling' +implementation 'com.google.cloud:google-cloud-datalabeling' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datalabeling:0.121.1' +implementation 'com.google.cloud:google-cloud-datalabeling:0.121.2' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datalabeling" % "0.121.1" +libraryDependencies += "com.google.cloud" % "google-cloud-datalabeling" % "0.121.2" ``` ## Authentication diff --git a/google-cloud-datalabeling-bom/pom.xml b/google-cloud-datalabeling-bom/pom.xml index 0cad2c0d..8aa46952 100644 --- a/google-cloud-datalabeling-bom/pom.xml +++ b/google-cloud-datalabeling-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datalabeling-bom - 0.121.2 + 0.122.0 pom com.google.cloud @@ -52,17 +52,17 @@ com.google.cloud google-cloud-datalabeling - 0.121.2 + 0.122.0 com.google.api.grpc grpc-google-cloud-datalabeling-v1beta1 - 0.86.2 + 0.87.0 com.google.api.grpc proto-google-cloud-datalabeling-v1beta1 - 0.86.2 + 0.87.0 diff --git a/google-cloud-datalabeling/pom.xml b/google-cloud-datalabeling/pom.xml index a49c2251..5a8857a8 100644 --- a/google-cloud-datalabeling/pom.xml +++ b/google-cloud-datalabeling/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datalabeling - 0.121.2 + 0.122.0 jar Google Cloud Data Labeling https://github.com/googleapis/java-datalabeling @@ -11,7 +11,7 @@ com.google.cloud google-cloud-datalabeling-parent - 0.121.2 + 0.122.0 google-cloud-datalabeling diff --git a/google-cloud-datalabeling/src/main/java/com/google/cloud/datalabeling/v1beta1/stub/DataLabelingServiceStubSettings.java b/google-cloud-datalabeling/src/main/java/com/google/cloud/datalabeling/v1beta1/stub/DataLabelingServiceStubSettings.java index 69aa8762..3e4acc97 100644 --- a/google-cloud-datalabeling/src/main/java/com/google/cloud/datalabeling/v1beta1/stub/DataLabelingServiceStubSettings.java +++ b/google-cloud-datalabeling/src/main/java/com/google/cloud/datalabeling/v1beta1/stub/DataLabelingServiceStubSettings.java @@ -1061,7 +1061,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-datalabeling-v1beta1/pom.xml b/grpc-google-cloud-datalabeling-v1beta1/pom.xml index cc31538c..9f3029ab 100644 --- a/grpc-google-cloud-datalabeling-v1beta1/pom.xml +++ b/grpc-google-cloud-datalabeling-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datalabeling-v1beta1 - 0.86.2 + 0.87.0 grpc-google-cloud-datalabeling-v1beta1 GRPC library for grpc-google-cloud-datalabeling-v1beta1 com.google.cloud google-cloud-datalabeling-parent - 0.121.2 + 0.122.0 diff --git a/pom.xml b/pom.xml index d1469b88..c79a1263 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datalabeling-parent pom - 0.121.2 + 0.122.0 Google Cloud Data Labeling Parent https://github.com/googleapis/java-datalabeling @@ -61,23 +61,23 @@ com.google.api.grpc proto-google-cloud-datalabeling-v1beta1 - 0.86.2 + 0.87.0 com.google.api.grpc grpc-google-cloud-datalabeling-v1beta1 - 0.86.2 + 0.87.0 com.google.cloud google-cloud-datalabeling - 0.121.2 + 0.122.0 com.google.cloud google-cloud-shared-dependencies - 2.1.0 + 2.2.0 pom import diff --git a/proto-google-cloud-datalabeling-v1beta1/pom.xml b/proto-google-cloud-datalabeling-v1beta1/pom.xml index 72295ebd..2943f127 100644 --- a/proto-google-cloud-datalabeling-v1beta1/pom.xml +++ b/proto-google-cloud-datalabeling-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datalabeling-v1beta1 - 0.86.2 + 0.87.0 proto-google-cloud-datalabeling-v1beta1 PROTO library for proto-google-cloud-datalabeling-v1beta1 com.google.cloud google-cloud-datalabeling-parent - 0.121.2 + 0.122.0 diff --git a/renovate.json b/renovate.json index 6e35d6f7..aca63747 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 07241f35..1f96d359 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datalabeling - 0.121.0 + 0.121.2 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 1fc1d2a0..ebe993b2 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datalabeling - 0.121.0 + 0.121.2 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index d11568d7..d2240ac6 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 21.0.0 + 22.0.0 pom import diff --git a/versions.txt b/versions.txt index ce469ed3..ace885f5 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-datalabeling:0.121.2:0.121.2 -grpc-google-cloud-datalabeling-v1beta1:0.86.2:0.86.2 -proto-google-cloud-datalabeling-v1beta1:0.86.2:0.86.2 +google-cloud-datalabeling:0.122.0:0.122.0 +grpc-google-cloud-datalabeling-v1beta1:0.87.0:0.87.0 +proto-google-cloud-datalabeling-v1beta1:0.87.0:0.87.0