diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml new file mode 100644 index 00000000..1a23ea42 --- /dev/null +++ b/.github/blunderbuss.yml @@ -0,0 +1,7 @@ +# Configuration for the Blunderbuss GitHub app. For more info see +# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss +assign_prs_by: +- labels: + - samples + to: + - googleapis/java-samples-reviewers \ No newline at end of file diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 3ce2c0c5..d9e3c8d9 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-datalabeling.git", - "sha": "53cd91ce8d5356718427118e554c34e58b548a01" + "sha": "2d74401b309b60334b4ac0c3ed447963e84f7b28" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "ba9918cd22874245b55734f57470c719b577e591" + "sha": "a073c873f3928c561bdf87fdfbf1d081d1998984" } } ] diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index e2d841d6..7513acae 100644 --- a/.github/workflows/approve-readme.yaml +++ b/.github/workflows/approve-readme.yaml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme' steps: - - uses: actions/github-script@v3.0.0 + - uses: actions/github-script@v3 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} script: | diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index bc1554ae..2b6cdbc9 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest if: contains(github.head_ref, 'release-v') steps: - - uses: actions/github-script@v3.0.0 + - uses: actions/github-script@v3 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} debug: true diff --git a/.github/workflows/formatting.yaml b/.github/workflows/formatting.yaml index d4d367cf..6844407b 100644 --- a/.github/workflows/formatting.yaml +++ b/.github/workflows/formatting.yaml @@ -18,7 +18,7 @@ jobs: with: java-version: 11 - run: "mvn com.coveo:fmt-maven-plugin:format" - - uses: googleapis/code-suggester@v1.8.0 + - uses: googleapis/code-suggester@v1 with: command: review pull_number: ${{ github.event.pull_request.number }} diff --git a/.kokoro/common.sh b/.kokoro/common.sh index a8d0ea04..ace89f45 100644 --- a/.kokoro/common.sh +++ b/.kokoro/common.sh @@ -25,7 +25,6 @@ function retry_with_backoff { # allow a failures to continue set +e - echo "${command}" ${command} exit_code=$? diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index 4f90fc47..70fbe50b 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -38,8 +38,8 @@ python3 -m pip install gcp-docuploader # compile all packages mvn clean install -B -q -DskipTests=true -NAME=google-cloud-datalabeling -VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) +export NAME=google-cloud-datalabeling +export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) # build the docs mvn site -B -q @@ -59,7 +59,8 @@ python3 -m docuploader upload . \ popd -# V2 +# V2 due to problems w/ the released javadoc plugin doclava, Java 8 is required. Beware of accidental updates. + mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/" pushd target/devsite/reference diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 3c482cbc..16126d2e 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -20,19 +20,22 @@ python3 -m pip install gcp-releasetool python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script source $(dirname "$0")/common.sh +source $(dirname "$0")/../common.sh MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml pushd $(dirname "$0")/../../ setup_environment_secrets create_settings_xml_file "settings.xml" -mvn clean install deploy -B \ - --settings ${MAVEN_SETTINGS_FILE} \ - -DskipTests=true \ - -DperformRelease=true \ - -Dgpg.executable=gpg \ - -Dgpg.passphrase=${GPG_PASSPHRASE} \ - -Dgpg.homedir=${GPG_HOMEDIR} +# attempt to stage 3 times with exponential backoff (starting with 10 seconds) +retry_with_backoff 3 10 \ + mvn clean install deploy -B \ + --settings ${MAVEN_SETTINGS_FILE} \ + -DskipTests=true \ + -DperformRelease=true \ + -Dgpg.executable=gpg \ + -Dgpg.passphrase=${GPG_PASSPHRASE} \ + -Dgpg.homedir=${GPG_HOMEDIR} if [[ -n "${AUTORELEASE_PR}" ]] then diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f752f0d..5891b559 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +### [0.119.7](https://www.github.com/googleapis/java-datalabeling/compare/v0.119.6...v0.119.7) (2020-12-08) + + +### Documentation + +* Provide a descriptive comment for DataLabelingService ([#326](https://www.github.com/googleapis/java-datalabeling/issues/326)) ([52f4868](https://www.github.com/googleapis/java-datalabeling/commit/52f4868a978f36a572ba58b625235f4ebfda7b99)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.16.0 ([#343](https://www.github.com/googleapis/java-datalabeling/issues/343)) ([188e80e](https://www.github.com/googleapis/java-datalabeling/commit/188e80e21da7424436c43dabfd2765f7f6e44a9b)) + ### [0.119.6](https://www.github.com/googleapis/java-datalabeling/compare/v0.119.5...v0.119.6) (2020-11-11) diff --git a/README.md b/README.md index 6e6d37a8..ff7f2a32 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 14.4.1 + 16.1.0 pom import @@ -41,18 +41,18 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-datalabeling - 0.119.5 + 0.119.6 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datalabeling:0.119.5' +compile 'com.google.cloud:google-cloud-datalabeling:0.119.6' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datalabeling" % "0.119.5" +libraryDependencies += "com.google.cloud" % "google-cloud-datalabeling" % "0.119.6" ``` ## Authentication diff --git a/google-cloud-datalabeling-bom/pom.xml b/google-cloud-datalabeling-bom/pom.xml index 2c7ac63a..fd0aefbd 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.119.6 + 0.119.7 pom com.google.cloud @@ -64,17 +64,17 @@ com.google.api.grpc proto-google-cloud-datalabeling-v1beta1 - 0.84.6 + 0.84.7 com.google.api.grpc grpc-google-cloud-datalabeling-v1beta1 - 0.84.6 + 0.84.7 com.google.cloud google-cloud-datalabeling - 0.119.6 + 0.119.7 diff --git a/google-cloud-datalabeling/pom.xml b/google-cloud-datalabeling/pom.xml index 62f39363..ced72c96 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.119.6 + 0.119.7 jar Google Cloud Data Labeling https://github.com/googleapis/java-datalabeling @@ -11,7 +11,7 @@ com.google.cloud google-cloud-datalabeling-parent - 0.119.6 + 0.119.7 google-cloud-datalabeling diff --git a/google-cloud-datalabeling/src/main/java/com/google/cloud/datalabeling/v1beta1/DataLabelingServiceClient.java b/google-cloud-datalabeling/src/main/java/com/google/cloud/datalabeling/v1beta1/DataLabelingServiceClient.java index 8f896245..8b6d5b79 100644 --- a/google-cloud-datalabeling/src/main/java/com/google/cloud/datalabeling/v1beta1/DataLabelingServiceClient.java +++ b/google-cloud-datalabeling/src/main/java/com/google/cloud/datalabeling/v1beta1/DataLabelingServiceClient.java @@ -41,7 +41,7 @@ // AUTO-GENERATED DOCUMENTATION AND SERVICE /** - * Service Description: + * Service Description: Service for the AI Platform Data Labeling API. * *

This class provides the ability to make remote calls to the backing service through method * calls that map to API methods. Sample code to get started: diff --git a/google-cloud-datalabeling/src/main/java/com/google/cloud/datalabeling/v1beta1/package-info.java b/google-cloud-datalabeling/src/main/java/com/google/cloud/datalabeling/v1beta1/package-info.java index 425d5498..b9cb3154 100644 --- a/google-cloud-datalabeling/src/main/java/com/google/cloud/datalabeling/v1beta1/package-info.java +++ b/google-cloud-datalabeling/src/main/java/com/google/cloud/datalabeling/v1beta1/package-info.java @@ -21,7 +21,7 @@ * *

========================= DataLabelingServiceClient ========================= * - *

Service Description: + *

Service Description: Service for the AI Platform Data Labeling API. * *

Sample for DataLabelingServiceClient: * diff --git a/grpc-google-cloud-datalabeling-v1beta1/pom.xml b/grpc-google-cloud-datalabeling-v1beta1/pom.xml index 999d9392..754e0770 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.84.6 + 0.84.7 grpc-google-cloud-datalabeling-v1beta1 GRPC library for grpc-google-cloud-datalabeling-v1beta1 com.google.cloud google-cloud-datalabeling-parent - 0.119.6 + 0.119.7 diff --git a/grpc-google-cloud-datalabeling-v1beta1/src/main/java/com/google/cloud/datalabeling/v1beta1/DataLabelingServiceGrpc.java b/grpc-google-cloud-datalabeling-v1beta1/src/main/java/com/google/cloud/datalabeling/v1beta1/DataLabelingServiceGrpc.java index b9c9dda0..6f7a11f1 100644 --- a/grpc-google-cloud-datalabeling-v1beta1/src/main/java/com/google/cloud/datalabeling/v1beta1/DataLabelingServiceGrpc.java +++ b/grpc-google-cloud-datalabeling-v1beta1/src/main/java/com/google/cloud/datalabeling/v1beta1/DataLabelingServiceGrpc.java @@ -22,7 +22,13 @@ import static io.grpc.stub.ServerCalls.asyncUnaryCall; import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; -/** */ +/** + * + * + *

+ * Service for the AI Platform Data Labeling API.
+ * 
+ */ @javax.annotation.Generated( value = "by gRPC proto compiler", comments = "Source: google/cloud/datalabeling/v1beta1/data_labeling_service.proto") @@ -1697,7 +1703,13 @@ public DataLabelingServiceFutureStub newStub( return DataLabelingServiceFutureStub.newStub(factory, channel); } - /** */ + /** + * + * + *
+   * Service for the AI Platform Data Labeling API.
+   * 
+ */ public abstract static class DataLabelingServiceImplBase implements io.grpc.BindableService { /** @@ -2416,7 +2428,13 @@ public final io.grpc.ServerServiceDefinition bindService() { } } - /** */ + /** + * + * + *
+   * Service for the AI Platform Data Labeling API.
+   * 
+ */ public static final class DataLabelingServiceStub extends io.grpc.stub.AbstractAsyncStub { private DataLabelingServiceStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { @@ -3004,7 +3022,13 @@ public void listEvaluationJobs( } } - /** */ + /** + * + * + *
+   * Service for the AI Platform Data Labeling API.
+   * 
+ */ public static final class DataLabelingServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { private DataLabelingServiceBlockingStub( @@ -3468,7 +3492,13 @@ public com.google.cloud.datalabeling.v1beta1.ListEvaluationJobsResponse listEval } } - /** */ + /** + * + * + *
+   * Service for the AI Platform Data Labeling API.
+   * 
+ */ public static final class DataLabelingServiceFutureStub extends io.grpc.stub.AbstractFutureStub { private DataLabelingServiceFutureStub( diff --git a/pom.xml b/pom.xml index 1476634f..de687ab2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datalabeling-parent pom - 0.119.6 + 0.119.7 Google Cloud Data Labeling Parent https://github.com/googleapis/java-datalabeling @@ -70,23 +70,23 @@ com.google.api.grpc proto-google-cloud-datalabeling-v1beta1 - 0.84.6 + 0.84.7 com.google.api.grpc grpc-google-cloud-datalabeling-v1beta1 - 0.84.6 + 0.84.7 com.google.cloud google-cloud-datalabeling - 0.119.6 + 0.119.7 com.google.cloud google-cloud-shared-dependencies - 0.15.0 + 0.16.0 pom import diff --git a/proto-google-cloud-datalabeling-v1beta1/pom.xml b/proto-google-cloud-datalabeling-v1beta1/pom.xml index 1437fd34..f3953a56 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.84.6 + 0.84.7 proto-google-cloud-datalabeling-v1beta1 PROTO library for proto-google-cloud-datalabeling-v1beta1 com.google.cloud google-cloud-datalabeling-parent - 0.119.6 + 0.119.7 diff --git a/proto-google-cloud-datalabeling-v1beta1/src/main/proto/google/cloud/datalabeling/v1beta1/data_labeling_service.proto b/proto-google-cloud-datalabeling-v1beta1/src/main/proto/google/cloud/datalabeling/v1beta1/data_labeling_service.proto index 1b1131da..5d0746c8 100644 --- a/proto-google-cloud-datalabeling-v1beta1/src/main/proto/google/cloud/datalabeling/v1beta1/data_labeling_service.proto +++ b/proto-google-cloud-datalabeling-v1beta1/src/main/proto/google/cloud/datalabeling/v1beta1/data_labeling_service.proto @@ -38,6 +38,7 @@ option java_package = "com.google.cloud.datalabeling.v1beta1"; option php_namespace = "Google\\Cloud\\DataLabeling\\V1beta1"; option ruby_package = "Google::Cloud::DataLabeling::V1beta1"; +// Service for the AI Platform Data Labeling API. service DataLabelingService { option (google.api.default_host) = "datalabeling.googleapis.com"; option (google.api.oauth_scopes) = "https://www.googleapis.com/auth/cloud-platform"; diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 7abfb03f..8a7da667 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.119.5 + 0.119.6 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index b25f1eee..b352568e 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datalabeling - 0.119.5 + 0.119.6 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 6c716374..e7ef4488 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 15.0.0 + 16.1.0 pom import diff --git a/synth.metadata b/synth.metadata index 6b36f548..da49ed89 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,22 +4,22 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-datalabeling.git", - "sha": "33b2712cbb557a56af9ab65e646a2854a6a0fc4a" + "sha": "188e80e21da7424436c43dabfd2765f7f6e44a9b" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "04514253a93d1cfbc20f39a35786bb5349c1921d", - "internalRef": "341139481" + "sha": "038351107de08b8f2796ab1fc3be5b84ea0c2d87", + "internalRef": "341774308" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "7db8a6c5ffb12a6e4c2f799c18f00f7f3d60e279" + "sha": "5d11bd2888c38ce1fb6fa6bf25494a4219a73928" } } ], @@ -40,6 +40,7 @@ ".github/ISSUE_TEMPLATE/feature_request.md", ".github/ISSUE_TEMPLATE/support_request.md", ".github/PULL_REQUEST_TEMPLATE.md", + ".github/blunderbuss.yml", ".github/generated-files-bot.yml", ".github/readme/synth.py", ".github/release-please.yml", diff --git a/versions.txt b/versions.txt index a4d313ee..bd5b011c 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -proto-google-cloud-datalabeling-v1beta1:0.84.6:0.84.6 -grpc-google-cloud-datalabeling-v1beta1:0.84.6:0.84.6 -google-cloud-datalabeling:0.119.6:0.119.6 +proto-google-cloud-datalabeling-v1beta1:0.84.7:0.84.7 +grpc-google-cloud-datalabeling-v1beta1:0.84.7:0.84.7 +google-cloud-datalabeling:0.119.7:0.119.7