diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata new file mode 100644 index 00000000..072565de --- /dev/null +++ b/.github/readme/synth.metadata/synth.metadata @@ -0,0 +1,18 @@ +{ + "sources": [ + { + "git": { + "name": ".", + "remote": "https://github.com/googleapis/java-datalabeling.git", + "sha": "82190beb0e12c0590ccd1d2a5cd7d90553a9b5f5" + } + }, + { + "git": { + "name": "synthtool", + "remote": "https://github.com/googleapis/synthtool.git", + "sha": "901ddd44e9ef7887ee681b9183bbdea99437fdcc" + } + } + ] +} \ No newline at end of file diff --git a/.github/snippet-bot.yml b/.github/snippet-bot.yml new file mode 100644 index 00000000..e69de29b diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml new file mode 100644 index 00000000..e2d841d6 --- /dev/null +++ b/.github/workflows/approve-readme.yaml @@ -0,0 +1,54 @@ +on: + pull_request: +name: auto-merge-readme +jobs: + approve: + runs-on: ubuntu-latest + if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme' + steps: + - uses: actions/github-script@v3.0.0 + with: + github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} + script: | + // only approve PRs from yoshi-automation + if (context.payload.pull_request.user.login !== "yoshi-automation") { + return; + } + + // only approve PRs like "chore: release " + if (!context.payload.pull_request.title === "chore: regenerate README") { + return; + } + + // only approve PRs with README.md and synth.metadata changes + const files = new Set( + ( + await github.paginate( + github.pulls.listFiles.endpoint({ + owner: context.repo.owner, + repo: context.repo.repo, + pull_number: context.payload.pull_request.number, + }) + ) + ).map(file => file.filename) + ); + if (files.size != 2 || !files.has("README.md") || !files.has(".github/readme/synth.metadata/synth.metadata")) { + return; + } + + // approve README regeneration PR + await github.pulls.createReview({ + owner: context.repo.owner, + repo: context.repo.repo, + body: 'Rubber stamped PR!', + pull_number: context.payload.pull_request.number, + event: 'APPROVE' + }); + + // attach automerge label + await github.issues.addLabels({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: context.payload.pull_request.number, + labels: ['automerge'] + }); diff --git a/.github/workflows/formatting.yaml b/.github/workflows/formatting.yaml new file mode 100644 index 00000000..d4d367cf --- /dev/null +++ b/.github/workflows/formatting.yaml @@ -0,0 +1,25 @@ +on: + pull_request_target: + types: [opened, synchronize] + branches: + - master +name: format +jobs: + format-code: + runs-on: ubuntu-latest + env: + ACCESS_TOKEN: ${{ secrets.YOSHI_CODE_BOT_TOKEN }} + steps: + - uses: actions/checkout@v2 + with: + ref: ${{github.event.pull_request.head.ref}} + repository: ${{github.event.pull_request.head.repo.full_name}} + - uses: actions/setup-java@v1 + with: + java-version: 11 + - run: "mvn com.coveo:fmt-maven-plugin:format" + - uses: googleapis/code-suggester@v1.8.0 + with: + command: review + pull_number: ${{ github.event.pull_request.number }} + git_dir: '.' diff --git a/.kokoro/build.sh b/.kokoro/build.sh index f867dc00..b2707765 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -69,9 +69,16 @@ integration) RETURN_CODE=$? ;; samples) - if [[ -f samples/pom.xml ]] + SAMPLES_DIR=samples + # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise. + if [[ ! -z ${KOKORO_GITHUB_PULL_REQUEST_NUMBER} ]] then - pushd samples + SAMPLES_DIR=samples/snapshot + fi + + if [[ -f ${SAMPLES_DIR}/pom.xml ]] + then + pushd {SAMPLES_DIR} mvn -B \ -Penable-samples \ -DtrimStackTrace=false \ diff --git a/CHANGELOG.md b/CHANGELOG.md index 049f343c..0cfaafec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### [0.119.4](https://www.github.com/googleapis/java-datalabeling/compare/v0.119.3...v0.119.4) (2020-10-22) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.12.1 ([#287](https://www.github.com/googleapis/java-datalabeling/issues/287)) ([098b079](https://www.github.com/googleapis/java-datalabeling/commit/098b0795ca200623aad88ca8704b3545a5614ea8)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.13.0 ([#292](https://www.github.com/googleapis/java-datalabeling/issues/292)) ([0847cc9](https://www.github.com/googleapis/java-datalabeling/commit/0847cc9ab5091c836f7c73abc80a6d7dd41fb4f3)) + ### [0.119.3](https://www.github.com/googleapis/java-datalabeling/compare/v0.119.2...v0.119.3) (2020-10-08) diff --git a/README.md b/README.md index 71cf32d7..fae87db5 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 - 10.1.0 + 13.1.0 pom import @@ -41,13 +41,11 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-datalabeling - 0.119.0 + 0.119.3 ``` -[//]: # ({x-version-update-start:google-cloud-datalabeling:released}) - If you are using Gradle, add this to your dependencies ```Groovy compile 'com.google.cloud:google-cloud-datalabeling:0.119.3' @@ -56,7 +54,6 @@ If you are using SBT, add this to your dependencies ```Scala libraryDependencies += "com.google.cloud" % "google-cloud-datalabeling" % "0.119.3" ``` -[//]: # ({x-version-update-end}) ## Authentication diff --git a/google-cloud-datalabeling-bom/pom.xml b/google-cloud-datalabeling-bom/pom.xml index 1c445855..c3b5a3c0 100644 --- a/google-cloud-datalabeling-bom/pom.xml +++ b/google-cloud-datalabeling-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-datalabeling-bom - 0.119.3 + 0.119.4 pom com.google.cloud google-cloud-shared-config - 0.9.2 + 0.9.3 Google Cloud Data Labeling BOM @@ -64,17 +64,17 @@ com.google.api.grpc proto-google-cloud-datalabeling-v1beta1 - 0.84.3 + 0.84.4 com.google.api.grpc grpc-google-cloud-datalabeling-v1beta1 - 0.84.3 + 0.84.4 com.google.cloud google-cloud-datalabeling - 0.119.3 + 0.119.4 diff --git a/google-cloud-datalabeling/pom.xml b/google-cloud-datalabeling/pom.xml index 25e8845b..76c01e58 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.3 + 0.119.4 jar Google Cloud Data Labeling https://github.com/googleapis/java-datalabeling @@ -11,7 +11,7 @@ com.google.cloud google-cloud-datalabeling-parent - 0.119.3 + 0.119.4 google-cloud-datalabeling diff --git a/grpc-google-cloud-datalabeling-v1beta1/pom.xml b/grpc-google-cloud-datalabeling-v1beta1/pom.xml index afdeca94..f3baa162 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.3 + 0.84.4 grpc-google-cloud-datalabeling-v1beta1 GRPC library for grpc-google-cloud-datalabeling-v1beta1 com.google.cloud google-cloud-datalabeling-parent - 0.119.3 + 0.119.4 diff --git a/pom.xml b/pom.xml index 127247a4..138bbf03 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datalabeling-parent pom - 0.119.3 + 0.119.4 Google Cloud Data Labeling Parent https://github.com/googleapis/java-datalabeling @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.9.2 + 0.9.3 @@ -70,23 +70,23 @@ com.google.api.grpc proto-google-cloud-datalabeling-v1beta1 - 0.84.3 + 0.84.4 com.google.api.grpc grpc-google-cloud-datalabeling-v1beta1 - 0.84.3 + 0.84.4 com.google.cloud google-cloud-datalabeling - 0.119.3 + 0.119.4 com.google.cloud google-cloud-shared-dependencies - 0.10.2 + 0.13.0 pom import @@ -94,7 +94,7 @@ junit junit - 4.13 + 4.13.1 test diff --git a/proto-google-cloud-datalabeling-v1beta1/pom.xml b/proto-google-cloud-datalabeling-v1beta1/pom.xml index 23b97da0..1e984a35 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.3 + 0.84.4 proto-google-cloud-datalabeling-v1beta1 PROTO library for proto-google-cloud-datalabeling-v1beta1 com.google.cloud google-cloud-datalabeling-parent - 0.119.3 + 0.119.4 diff --git a/renovate.json b/renovate.json index a296508e..33c954fe 100644 --- a/renovate.json +++ b/renovate.json @@ -17,24 +17,6 @@ ], "versionScheme": "docker" }, - { - "packagePatterns": [ - "^com.google.api:gax", - "^com.google.auth:", - "^com.google.cloud:google-cloud-core", - "^io.grpc:", - "^com.google.guava:" - ], - "groupName": "core dependencies" - }, - { - "packagePatterns": [ - "^com.google.http-client:", - "^com.google.oauth-client:", - "^com.google.api-client:" - ], - "groupName": "core transport dependencies" - }, { "packagePatterns": [ "*" @@ -63,6 +45,16 @@ "semanticCommitType": "chore", "semanticCommitScope": "deps" }, + { + "packagePatterns": [ + "^junit:junit", + "^com.google.truth:truth", + "^org.mockito:mockito-core", + "^org.objenesis:objenesis" + ], + "semanticCommitType": "test", + "semanticCommitScope": "deps" + }, { "packagePatterns": [ "^com.google.cloud:google-cloud-" @@ -78,4 +70,4 @@ ], "semanticCommits": true, "masterIssue": true -} \ No newline at end of file +} diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 57ab8297..4bdded92 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.18 + 1.0.21 @@ -29,14 +29,14 @@ com.google.cloud google-cloud-datalabeling - 0.119.0 + 0.119.3 junit junit - 4.13 + 4.13.1 test diff --git a/samples/pom.xml b/samples/pom.xml index 893ea1fa..3ea8759a 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -18,7 +18,7 @@ com.google.cloud.samples shared-configuration - 1.0.18 + 1.0.21 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index c4f4874b..59fbfa7d 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.18 + 1.0.21 @@ -28,13 +28,13 @@ com.google.cloud google-cloud-datalabeling - 0.119.0 + 0.119.3 junit junit - 4.13 + 4.13.1 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 494d45ee..0a1604a1 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.18 + 1.0.21 @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 12.0.0 + 13.1.0 pom import @@ -47,7 +47,7 @@ junit junit - 4.13 + 4.13.1 test diff --git a/synth.metadata b/synth.metadata index 152bde29..173d045b 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-datalabeling.git", - "sha": "7de51927dbb05edf84d9dcb6ff58984d31a0840e" + "sha": "e80b87ba34a6f39fd742b1a1cb12adaf299e2752" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "0762e8ee2ec21cdfc4d82020b985a104feb0453b" + "sha": "6abb59097be84599a1d6091fe534a49e5c5cf948" } } ], @@ -42,9 +42,12 @@ ".github/PULL_REQUEST_TEMPLATE.md", ".github/readme/synth.py", ".github/release-please.yml", + ".github/snippet-bot.yml", ".github/trusted-contribution.yml", + ".github/workflows/approve-readme.yaml", ".github/workflows/auto-release.yaml", ".github/workflows/ci.yaml", + ".github/workflows/formatting.yaml", ".github/workflows/samples.yaml", ".kokoro/build.bat", ".kokoro/build.sh", diff --git a/versions.txt b/versions.txt index 9aff9ce1..54a80b91 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -proto-google-cloud-datalabeling-v1beta1:0.84.3:0.84.3 -grpc-google-cloud-datalabeling-v1beta1:0.84.3:0.84.3 -google-cloud-datalabeling:0.119.3:0.119.3 +proto-google-cloud-datalabeling-v1beta1:0.84.4:0.84.4 +grpc-google-cloud-datalabeling-v1beta1:0.84.4:0.84.4 +google-cloud-datalabeling:0.119.4:0.119.4