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 6fd8de57..99adbc99 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-document-ai.git", - "sha": "7e948855a403d345807f2628768f3950dbc5d8b4" + "sha": "981da1d86b4cd697278dfd874abf3396d0768288" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "2c8aecedd55b0480fb4e123b6e07fa5b12953862" + "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 0babe218..fa34d5db 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-document-ai -VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) +export NAME=google-cloud-document-ai +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 ba5552dc..a5a58623 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.3.6](https://www.github.com/googleapis/java-document-ai/compare/v0.3.5...v0.3.6) (2020-12-08) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.16.0 ([#283](https://www.github.com/googleapis/java-document-ai/issues/283)) ([590fe47](https://www.github.com/googleapis/java-document-ai/commit/590fe47a98d7cdd12e4819a0942ab807b94332df)) + ### [0.3.5](https://www.github.com/googleapis/java-document-ai/compare/v0.3.4...v0.3.5) (2020-11-12) diff --git a/README.md b/README.md index 35d3ffa5..92d9cedd 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 - 15.0.0 + 16.1.0 pom import @@ -31,7 +31,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud google-cloud-document-ai - 0.3.3 + 0.3.5 ``` @@ -42,18 +42,18 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-document-ai - 0.3.3 + 0.3.5 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-document-ai:0.3.3' +compile 'com.google.cloud:google-cloud-document-ai:0.3.5' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-document-ai" % "0.3.3" +libraryDependencies += "com.google.cloud" % "google-cloud-document-ai" % "0.3.5" ``` ## Authentication diff --git a/google-cloud-document-ai-bom/pom.xml b/google-cloud-document-ai-bom/pom.xml index c5cf21ba..19c883c3 100644 --- a/google-cloud-document-ai-bom/pom.xml +++ b/google-cloud-document-ai-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-document-ai-bom - 0.3.5 + 0.3.6 pom com.google.cloud @@ -61,37 +61,37 @@ com.google.api.grpc proto-google-cloud-document-ai-v1beta1 - 0.3.5 + 0.3.6 com.google.api.grpc proto-google-cloud-document-ai-v1beta2 - 0.3.5 + 0.3.6 com.google.api.grpc proto-google-cloud-document-ai-v1beta3 - 0.3.5 + 0.3.6 com.google.api.grpc grpc-google-cloud-document-ai-v1beta1 - 0.3.5 + 0.3.6 com.google.api.grpc grpc-google-cloud-document-ai-v1beta2 - 0.3.5 + 0.3.6 com.google.api.grpc grpc-google-cloud-document-ai-v1beta3 - 0.3.5 + 0.3.6 com.google.cloud google-cloud-document-ai - 0.3.5 + 0.3.6 diff --git a/google-cloud-document-ai/pom.xml b/google-cloud-document-ai/pom.xml index d5b160e4..f579ab53 100644 --- a/google-cloud-document-ai/pom.xml +++ b/google-cloud-document-ai/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-document-ai - 0.3.5 + 0.3.6 jar Google Cloud Document AI https://github.com/googleapis/java-document-ai @@ -11,7 +11,7 @@ com.google.cloud google-cloud-document-ai-parent - 0.3.5 + 0.3.6 google-cloud-document-ai diff --git a/grpc-google-cloud-document-ai-v1beta1/pom.xml b/grpc-google-cloud-document-ai-v1beta1/pom.xml index 39cbdda3..84cf8080 100644 --- a/grpc-google-cloud-document-ai-v1beta1/pom.xml +++ b/grpc-google-cloud-document-ai-v1beta1/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-document-ai-v1beta1 - 0.3.5 + 0.3.6 grpc-google-cloud-document-ai-v1beta1 GRPC library for grpc-google-cloud-document-ai-v1beta1 com.google.cloud google-cloud-document-ai-parent - 0.3.5 + 0.3.6 diff --git a/grpc-google-cloud-document-ai-v1beta2/pom.xml b/grpc-google-cloud-document-ai-v1beta2/pom.xml index 103ccd2b..cb4e24eb 100644 --- a/grpc-google-cloud-document-ai-v1beta2/pom.xml +++ b/grpc-google-cloud-document-ai-v1beta2/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-document-ai-v1beta2 - 0.3.5 + 0.3.6 grpc-google-cloud-document-ai-v1beta2 GRPC library for grpc-google-cloud-document-ai-v1beta2 com.google.cloud google-cloud-document-ai-parent - 0.3.5 + 0.3.6 diff --git a/grpc-google-cloud-document-ai-v1beta3/pom.xml b/grpc-google-cloud-document-ai-v1beta3/pom.xml index 89e7f197..b4572361 100644 --- a/grpc-google-cloud-document-ai-v1beta3/pom.xml +++ b/grpc-google-cloud-document-ai-v1beta3/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-document-ai-v1beta3 - 0.3.5 + 0.3.6 grpc-google-cloud-document-ai-v1beta3 GRPC library for grpc-google-cloud-document-ai-v1beta3 com.google.cloud google-cloud-document-ai-parent - 0.3.5 + 0.3.6 diff --git a/pom.xml b/pom.xml index f1ebbad6..28898bbc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-document-ai-parent pom - 0.3.5 + 0.3.6 Google Cloud Document AI Parent https://github.com/googleapis/java-document-ai @@ -70,38 +70,38 @@ com.google.api.grpc grpc-google-cloud-document-ai-v1beta1 - 0.3.5 + 0.3.6 com.google.api.grpc grpc-google-cloud-document-ai-v1beta2 - 0.3.5 + 0.3.6 com.google.api.grpc grpc-google-cloud-document-ai-v1beta3 - 0.3.5 + 0.3.6 com.google.api.grpc proto-google-cloud-document-ai-v1beta1 - 0.3.5 + 0.3.6 com.google.api.grpc proto-google-cloud-document-ai-v1beta2 - 0.3.5 + 0.3.6 com.google.api.grpc proto-google-cloud-document-ai-v1beta3 - 0.3.5 + 0.3.6 com.google.cloud google-cloud-shared-dependencies - 0.15.0 + 0.16.0 pom import diff --git a/proto-google-cloud-document-ai-v1beta1/pom.xml b/proto-google-cloud-document-ai-v1beta1/pom.xml index 770a2b81..a0f640d0 100644 --- a/proto-google-cloud-document-ai-v1beta1/pom.xml +++ b/proto-google-cloud-document-ai-v1beta1/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-document-ai-v1beta1 - 0.3.5 + 0.3.6 proto-google-cloud-document-ai-v1beta1 PROTO library for proto-google-cloud-document-ai-v1beta1 com.google.cloud google-cloud-document-ai-parent - 0.3.5 + 0.3.6 diff --git a/proto-google-cloud-document-ai-v1beta2/pom.xml b/proto-google-cloud-document-ai-v1beta2/pom.xml index f7fafa3d..9772c0e2 100644 --- a/proto-google-cloud-document-ai-v1beta2/pom.xml +++ b/proto-google-cloud-document-ai-v1beta2/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-document-ai-v1beta2 - 0.3.5 + 0.3.6 proto-google-cloud-document-ai-v1beta2 PROTO library for proto-google-cloud-document-ai-v1beta2 com.google.cloud google-cloud-document-ai-parent - 0.3.5 + 0.3.6 diff --git a/proto-google-cloud-document-ai-v1beta3/pom.xml b/proto-google-cloud-document-ai-v1beta3/pom.xml index c2801291..41f6d873 100644 --- a/proto-google-cloud-document-ai-v1beta3/pom.xml +++ b/proto-google-cloud-document-ai-v1beta3/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-document-ai-v1beta3 - 0.3.5 + 0.3.6 proto-google-cloud-document-ai-v1beta3 PROTO library for proto-google-cloud-document-ai-v1beta3 com.google.cloud google-cloud-document-ai-parent - 0.3.5 + 0.3.6 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index d2543663..d7fbba19 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-document-ai - 0.3.3 + 0.3.5 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 066678ea..d65178ec 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-document-ai - 0.3.3 + 0.3.5 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index fd3aeeb1..c81ca2e3 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 15.1.0 + 16.1.0 pom import @@ -41,7 +41,7 @@ com.google.cloud google-cloud-document-ai - 0.3.3 + 0.3.5 diff --git a/synth.metadata b/synth.metadata index c55c2d15..6a49f35f 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-document-ai.git", - "sha": "89806abd6e754131282862c381765ab4a079f594" + "sha": "590fe47a98d7cdd12e4819a0942ab807b94332df" } }, { @@ -35,7 +35,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "7db8a6c5ffb12a6e4c2f799c18f00f7f3d60e279" + "sha": "5d11bd2888c38ce1fb6fa6bf25494a4219a73928" } } ], @@ -74,6 +74,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 5c785bc6..59f6be21 100644 --- a/versions.txt +++ b/versions.txt @@ -1,7 +1,7 @@ -proto-google-cloud-document-ai-v1beta1:0.3.5:0.3.5 -proto-google-cloud-document-ai-v1beta2:0.3.5:0.3.5 -proto-google-cloud-document-ai-v1beta3:0.3.5:0.3.5 -grpc-google-cloud-document-ai-v1beta1:0.3.5:0.3.5 -grpc-google-cloud-document-ai-v1beta2:0.3.5:0.3.5 -grpc-google-cloud-document-ai-v1beta3:0.3.5:0.3.5 -google-cloud-document-ai:0.3.5:0.3.5 +proto-google-cloud-document-ai-v1beta1:0.3.6:0.3.6 +proto-google-cloud-document-ai-v1beta2:0.3.6:0.3.6 +proto-google-cloud-document-ai-v1beta3:0.3.6:0.3.6 +grpc-google-cloud-document-ai-v1beta1:0.3.6:0.3.6 +grpc-google-cloud-document-ai-v1beta2:0.3.6:0.3.6 +grpc-google-cloud-document-ai-v1beta3:0.3.6:0.3.6 +google-cloud-document-ai:0.3.6:0.3.6