diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 6137bef2..30fdb7b9 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -4,5 +4,7 @@ # For syntax help see: # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax +* @googleapis/yoshi-java + # The java-samples-reviewers team is the default owner for samples changes samples/**/*.java @googleapis/java-samples-reviewers diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml new file mode 100644 index 00000000..d26427e4 --- /dev/null +++ b/.github/workflows/auto-release.yaml @@ -0,0 +1,69 @@ +on: + pull_request: +name: auto-release +jobs: + approve: + runs-on: ubuntu-latest + steps: + - uses: actions/github-script@v3.0.0 + with: + github-token: ${{secrets.GITHUB_TOKEN}} + debug: true + script: | + // only approve PRs from release-please[bot] + if (context.payload.pull_request.user.login !== "release-please[bot]") { + return; + } + + // only approve PRs like "chore: release " + if ( !context.payload.pull_request.title.startsWith("chore: release") ) { + return; + } + + // trigger auto-release when + // 1) it is a SNAPSHOT release (auto-generated post regular release) + // 2) there are dependency updates only + // 3) there are no open dependency update PRs in this repo (to avoid multiple releases) + if ( + context.payload.pull_request.body.includes("Fix") || + context.payload.pull_request.body.includes("Build") || + context.payload.pull_request.body.includes("Documentation") || + context.payload.pull_request.body.includes("BREAKING CHANGES") || + context.payload.pull_request.body.includes("Features") + ) { + console.log( "Not auto-releasing since it is not a dependency-update-only release." ); + return; + } + + const promise = github.pulls.list.endpoint({ + owner: context.repo.owner, + repo: context.repo.repo, + state: 'open' + }); + const open_pulls = await github.paginate(promise) + + if ( open_pulls.length > 1 && !context.payload.pull_request.title.includes("SNAPSHOT") ) { + for ( const pull of open_pulls ) { + if ( pull.title.startsWith("deps: update dependency") ) { + console.log( "Not auto-releasing yet since there are dependency update PRs open in this repo." ); + return; + } + } + } + + // approve release PR + await github.pulls.createReview({ + owner: context.repo.owner, + repo: context.repo.repo, + body: 'Rubber stamped release!', + pull_number: context.payload.pull_request.number, + event: 'APPROVE' + }); + + // attach kokoro:force-run and automerge labels + await github.issues.addLabels({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: context.payload.pull_request.number, + labels: ['kokoro:force-run', 'automerge'] + }); \ No newline at end of file diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml new file mode 100644 index 00000000..a1d50073 --- /dev/null +++ b/.github/workflows/samples.yaml @@ -0,0 +1,14 @@ +on: + pull_request: +name: samples +jobs: + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - name: Run checkstyle + run: mvn -P lint --quiet --batch-mode checkstyle:check + working-directory: samples/snippets diff --git a/.kokoro/release/stage.cfg b/.kokoro/release/stage.cfg index e1b2058a..f97e4d2f 100644 --- a/.kokoro/release/stage.cfg +++ b/.kokoro/release/stage.cfg @@ -13,32 +13,7 @@ action { } } -# Fetch the token needed for reporting release status to GitHub -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "yoshi-automation-github-key" - } - } -} - -# Fetch magictoken to use with Magic Github Proxy -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "releasetool-magictoken" - } - } -} - -# Fetch api key to use with Magic Github Proxy -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "magic-github-proxy-api-key" - } - } +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 5808e851..657dc1bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.2.3](https://www.github.com/googleapis/java-document-ai/compare/v0.2.2...v0.2.3) (2020-09-23) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.9.0 ([#165](https://www.github.com/googleapis/java-document-ai/issues/165)) ([884df24](https://www.github.com/googleapis/java-document-ai/commit/884df24ab6b1c719b1fb51aa995e4494c7d62cb1)) + ### [0.2.2](https://www.github.com/googleapis/java-document-ai/compare/v0.2.1...v0.2.2) (2020-08-19) diff --git a/README.md b/README.md index d2792b0d..0618f689 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 - 9.0.0 + 9.1.0 pom import @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-document-ai - 0.2.0 + 0.2.1 ``` @@ -50,11 +50,11 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-document-ai:0.2.2' +compile 'com.google.cloud:google-cloud-document-ai:0.2.3' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-document-ai" % "0.2.2" +libraryDependencies += "com.google.cloud" % "google-cloud-document-ai" % "0.2.3" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-document-ai-bom/pom.xml b/google-cloud-document-ai-bom/pom.xml index ee5b8345..6577590d 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.2.2 + 0.2.3 pom com.google.cloud @@ -61,27 +61,27 @@ com.google.api.grpc proto-google-cloud-document-ai-v1beta1 - 0.2.2 + 0.2.3 com.google.api.grpc proto-google-cloud-document-ai-v1beta2 - 0.2.2 + 0.2.3 com.google.api.grpc grpc-google-cloud-document-ai-v1beta1 - 0.2.2 + 0.2.3 com.google.api.grpc grpc-google-cloud-document-ai-v1beta2 - 0.2.2 + 0.2.3 com.google.cloud google-cloud-document-ai - 0.2.2 + 0.2.3 diff --git a/google-cloud-document-ai/pom.xml b/google-cloud-document-ai/pom.xml index 5f855ca2..42855e18 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.2.2 + 0.2.3 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.2.2 + 0.2.3 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 0e1167bd..92180a10 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.2.2 + 0.2.3 grpc-google-cloud-document-ai-v1beta1 GRPC library for grpc-google-cloud-document-ai-v1beta1 com.google.cloud google-cloud-document-ai-parent - 0.2.2 + 0.2.3 diff --git a/grpc-google-cloud-document-ai-v1beta2/pom.xml b/grpc-google-cloud-document-ai-v1beta2/pom.xml index 31cb069c..405c184a 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.2.2 + 0.2.3 grpc-google-cloud-document-ai-v1beta2 GRPC library for grpc-google-cloud-document-ai-v1beta2 com.google.cloud google-cloud-document-ai-parent - 0.2.2 + 0.2.3 diff --git a/pom.xml b/pom.xml index adf5d3cc..923a8a26 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-document-ai-parent pom - 0.2.2 + 0.2.3 Google Cloud Document AI Parent https://github.com/googleapis/java-document-ai @@ -70,29 +70,29 @@ com.google.api.grpc grpc-google-cloud-document-ai-v1beta1 - 0.2.2 + 0.2.3 com.google.api.grpc grpc-google-cloud-document-ai-v1beta2 - 0.2.2 + 0.2.3 com.google.api.grpc proto-google-cloud-document-ai-v1beta1 - 0.2.2 + 0.2.3 com.google.api.grpc proto-google-cloud-document-ai-v1beta2 - 0.2.2 + 0.2.3 com.google.cloud google-cloud-shared-dependencies - 0.8.6 + 0.9.0 pom import @@ -137,7 +137,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.1.0 + 3.1.1 diff --git a/proto-google-cloud-document-ai-v1beta1/pom.xml b/proto-google-cloud-document-ai-v1beta1/pom.xml index 3b035dac..6e3dc980 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.2.2 + 0.2.3 proto-google-cloud-document-ai-v1beta1 PROTO library for proto-google-cloud-document-ai-v1beta1 com.google.cloud google-cloud-document-ai-parent - 0.2.2 + 0.2.3 diff --git a/proto-google-cloud-document-ai-v1beta2/pom.xml b/proto-google-cloud-document-ai-v1beta2/pom.xml index 1ebc412c..5cf9bbae 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.2.2 + 0.2.3 proto-google-cloud-document-ai-v1beta2 PROTO library for proto-google-cloud-document-ai-v1beta2 com.google.cloud google-cloud-document-ai-parent - 0.2.2 + 0.2.3 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 41312956..643241b3 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -35,7 +35,7 @@ com.google.cloud google-cloud-storage - 1.111.2 + 1.113.1 junit diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 53cd844a..2325e55f 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -34,7 +34,7 @@ com.google.cloud google-cloud-storage - 1.111.2 + 1.113.1 junit diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 73dd3f83..bb021762 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 9.1.0 + 10.1.0 pom import diff --git a/samples/snippets/src/main/java/documentai/v1beta2/ParseWithModelBeta.java b/samples/snippets/src/main/java/documentai/v1beta2/ParseWithModelBeta.java index 5e1bfa3f..b549e487 100644 --- a/samples/snippets/src/main/java/documentai/v1beta2/ParseWithModelBeta.java +++ b/samples/snippets/src/main/java/documentai/v1beta2/ParseWithModelBeta.java @@ -32,7 +32,8 @@ public static void parseWithModel() throws IOException { // TODO(developer): Replace these variables before running the sample. String projectId = "your-project-id"; String location = "your-project-location"; // Format is "us" or "eu". - // AutoML model name formatted as: "projects/[PROJECT_ID]/locations/[LOCATION]/models/[MODEL_ID]" + // AutoML model name formatted as: + // "projects/[PROJECT_ID]/locations/[LOCATION]/models/[MODEL_ID]" String autoMlModel = "your-full-resource-model-name"; String gcsUri = "gs://your-gcs-bucket/path/to/input/file.json"; parseWithModel(projectId, location, autoMlModel, gcsUri); diff --git a/synth.metadata b/synth.metadata index 4dcc7f0f..97083c97 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-document-ai.git", - "sha": "6375fc35ccbf5ce24062ba53720633fb63721e86" + "sha": "8ae010b4c6231f7f9886e17a25cc6e1efbfa4230" } }, { @@ -27,7 +27,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "f8823dec98277a9516f2fb6fae9f58b3a59a23e1" + "sha": "80003a3de2d8a75f5b47cb2e77e018f7f0f776cc" } } ], @@ -59,7 +59,9 @@ ".github/PULL_REQUEST_TEMPLATE.md", ".github/release-please.yml", ".github/trusted-contribution.yml", + ".github/workflows/auto-release.yaml", ".github/workflows/ci.yaml", + ".github/workflows/samples.yaml", ".kokoro/build.bat", ".kokoro/build.sh", ".kokoro/coerce_logs.sh", diff --git a/versions.txt b/versions.txt index 9daec7d5..95bcb9c0 100644 --- a/versions.txt +++ b/versions.txt @@ -1,5 +1,5 @@ -proto-google-cloud-document-ai-v1beta1:0.2.2:0.2.2 -proto-google-cloud-document-ai-v1beta2:0.2.2:0.2.2 -grpc-google-cloud-document-ai-v1beta1:0.2.2:0.2.2 -grpc-google-cloud-document-ai-v1beta2:0.2.2:0.2.2 -google-cloud-document-ai:0.2.2:0.2.2 +proto-google-cloud-document-ai-v1beta1:0.2.3:0.2.3 +proto-google-cloud-document-ai-v1beta2:0.2.3:0.2.3 +grpc-google-cloud-document-ai-v1beta1:0.2.3:0.2.3 +grpc-google-cloud-document-ai-v1beta2:0.2.3:0.2.3 +google-cloud-document-ai:0.2.3:0.2.3