diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 856645b4..3c122a0f 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-websecurityscanner.git", - "sha": "2ea05be58fd6f9ac16298c7784bb5cd63d156192" + "sha": "4d7f7ec1fd25fc63f3117d5c2da05556754eb83c" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "b6164c26a111f7f587099d31253abb96b5737bb2" + "sha": "fd3584b01cedd6c9f79d08be4e2365085f955aa5" } } ] 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 185459df..66de1cec 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/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index 1de30b46..c479bd6f 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -62,7 +62,7 @@ popd # V2 mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/" -pushd target/devsite +pushd target/devsite/reference # create metadata python3 -m docuploader create-metadata \ diff --git a/CHANGELOG.md b/CHANGELOG.md index ed8f3932..c4eebfdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +### [1.0.4](https://www.github.com/googleapis/java-websecurityscanner/compare/v1.0.3...v1.0.4) (2020-10-28) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.12.1 ([#255](https://www.github.com/googleapis/java-websecurityscanner/issues/255)) ([5781fb2](https://www.github.com/googleapis/java-websecurityscanner/commit/5781fb2f0a5cb3e98715e7147ccd8e29a51441b0)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.13.0 ([#260](https://www.github.com/googleapis/java-websecurityscanner/issues/260)) ([76de6af](https://www.github.com/googleapis/java-websecurityscanner/commit/76de6afd391814715ad3d31ace1090249a43400c)) +* update dependency joda-time:joda-time to v2.10.8 ([#262](https://www.github.com/googleapis/java-websecurityscanner/issues/262)) ([10681fa](https://www.github.com/googleapis/java-websecurityscanner/commit/10681fafaf69219f616f43060bfafa5c72f82275)) + ### [1.0.3](https://www.github.com/googleapis/java-websecurityscanner/compare/v1.0.2...v1.0.3) (2020-10-09) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 6b2238bb..2add2547 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,3 +1,4 @@ + # Code of Conduct ## Our Pledge @@ -69,12 +70,12 @@ dispute. If you are unable to resolve the matter for any reason, or if the behavior is threatening or harassing, report it. We are dedicated to providing an environment where participants feel welcome and safe. -Reports should be directed to *[PROJECT STEWARD NAME(s) AND EMAIL(s)]*, the -Project Steward(s) for *[PROJECT NAME]*. It is the Project Steward’s duty to +Reports should be directed to *googleapis-stewards@google.com*, the +Project Steward(s) for *Google Cloud Client Libraries*. It is the Project Steward’s duty to receive and address reported violations of the code of conduct. They will then work with a committee consisting of representatives from the Open Source Programs Office and the Google Open Source Strategy team. If for any reason you -are uncomfortable reaching out the Project Steward, please email +are uncomfortable reaching out to the Project Steward, please email opensource@google.com. We will investigate every complaint, but you may not receive a direct response. diff --git a/README.md b/README.md index d737f96a..ef9b31b8 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 12.0.0 + 13.3.0 pom import @@ -38,13 +38,11 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-websecurityscanner - 1.0.2 + 1.0.3 ``` -[//]: # ({x-version-update-start:google-cloud-websecurityscanner:released}) - If you are using Gradle, add this to your dependencies ```Groovy compile 'com.google.cloud:google-cloud-websecurityscanner:1.0.3' @@ -53,7 +51,6 @@ If you are using SBT, add this to your dependencies ```Scala libraryDependencies += "com.google.cloud" % "google-cloud-websecurityscanner" % "1.0.3" ``` -[//]: # ({x-version-update-end}) ## Authentication diff --git a/google-cloud-websecurityscanner-bom/pom.xml b/google-cloud-websecurityscanner-bom/pom.xml index ea97e3a1..e60e3a6d 100644 --- a/google-cloud-websecurityscanner-bom/pom.xml +++ b/google-cloud-websecurityscanner-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-websecurityscanner-bom - 1.0.3 + 1.0.4 pom com.google.cloud google-cloud-shared-config - 0.9.2 + 0.9.4 Google Cloud websecurityscanner BOM @@ -64,37 +64,37 @@ com.google.api.grpc grpc-google-cloud-websecurityscanner-v1alpha - 0.84.3 + 0.84.4 com.google.api.grpc proto-google-cloud-websecurityscanner-v1beta - 0.84.3 + 0.84.4 com.google.api.grpc proto-google-cloud-websecurityscanner-v1 - 1.0.3 + 1.0.4 com.google.api.grpc proto-google-cloud-websecurityscanner-v1alpha - 0.84.3 + 0.84.4 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1beta - 0.84.3 + 0.84.4 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1 - 1.0.3 + 1.0.4 com.google.cloud google-cloud-websecurityscanner - 1.0.3 + 1.0.4 diff --git a/google-cloud-websecurityscanner/pom.xml b/google-cloud-websecurityscanner/pom.xml index c9541e33..17938e52 100644 --- a/google-cloud-websecurityscanner/pom.xml +++ b/google-cloud-websecurityscanner/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-websecurityscanner - 1.0.3 + 1.0.4 jar Google Cloud Web Security Scanner https://github.com/googleapis/java-websecurityscanner @@ -11,7 +11,7 @@ com.google.cloud google-cloud-websecurityscanner-parent - 1.0.3 + 1.0.4 google-cloud-websecurityscanner diff --git a/grpc-google-cloud-websecurityscanner-v1/pom.xml b/grpc-google-cloud-websecurityscanner-v1/pom.xml index b9152073..ad762e95 100644 --- a/grpc-google-cloud-websecurityscanner-v1/pom.xml +++ b/grpc-google-cloud-websecurityscanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1 - 1.0.3 + 1.0.4 grpc-google-cloud-websecurityscanner-v1 GRPC library for grpc-google-cloud-websecurityscanner-v1 com.google.cloud google-cloud-websecurityscanner-parent - 1.0.3 + 1.0.4 diff --git a/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml b/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml index 3f20af03..5c54a7ef 100644 --- a/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml +++ b/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1alpha - 0.84.3 + 0.84.4 grpc-google-cloud-websecurityscanner-v1alpha GRPC library for grpc-google-cloud-websecurityscanner-v1alpha com.google.cloud google-cloud-websecurityscanner-parent - 1.0.3 + 1.0.4 diff --git a/grpc-google-cloud-websecurityscanner-v1beta/pom.xml b/grpc-google-cloud-websecurityscanner-v1beta/pom.xml index bd784f4a..852609fa 100644 --- a/grpc-google-cloud-websecurityscanner-v1beta/pom.xml +++ b/grpc-google-cloud-websecurityscanner-v1beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1beta - 0.84.3 + 0.84.4 grpc-google-cloud-websecurityscanner-v1beta GRPC library for grpc-google-cloud-websecurityscanner-v1beta com.google.cloud google-cloud-websecurityscanner-parent - 1.0.3 + 1.0.4 diff --git a/pom.xml b/pom.xml index e2f60a0f..82c5216d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-websecurityscanner-parent pom - 1.0.3 + 1.0.4 Google Cloud Web Security Scanner Parent https://github.com/googleapis/java-websecurityscanner @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.9.2 + 0.9.4 @@ -70,43 +70,43 @@ com.google.api.grpc proto-google-cloud-websecurityscanner-v1alpha - 0.84.3 + 0.84.4 com.google.api.grpc proto-google-cloud-websecurityscanner-v1beta - 0.84.3 + 0.84.4 com.google.api.grpc proto-google-cloud-websecurityscanner-v1 - 1.0.3 + 1.0.4 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1alpha - 0.84.3 + 0.84.4 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1beta - 0.84.3 + 0.84.4 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1 - 1.0.3 + 1.0.4 com.google.cloud google-cloud-websecurityscanner - 1.0.3 + 1.0.4 com.google.cloud google-cloud-shared-dependencies - 0.10.2 + 0.13.0 pom import @@ -114,13 +114,13 @@ junit junit - 4.13 + 4.13.1 test joda-time joda-time - 2.10.6 + 2.10.8 test diff --git a/proto-google-cloud-websecurityscanner-v1/pom.xml b/proto-google-cloud-websecurityscanner-v1/pom.xml index cfe314db..22ee6cdb 100644 --- a/proto-google-cloud-websecurityscanner-v1/pom.xml +++ b/proto-google-cloud-websecurityscanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-websecurityscanner-v1 - 1.0.3 + 1.0.4 proto-google-cloud-websecurityscanner-v1 PROTO library for proto-google-cloud-websecurityscanner-v1 com.google.cloud google-cloud-websecurityscanner-parent - 1.0.3 + 1.0.4 diff --git a/proto-google-cloud-websecurityscanner-v1alpha/pom.xml b/proto-google-cloud-websecurityscanner-v1alpha/pom.xml index 6ff0e942..4439e456 100644 --- a/proto-google-cloud-websecurityscanner-v1alpha/pom.xml +++ b/proto-google-cloud-websecurityscanner-v1alpha/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-websecurityscanner-v1alpha - 0.84.3 + 0.84.4 proto-google-cloud-websecurityscanner-v1alpha PROTO library for proto-google-cloud-websecurityscanner-v1alpha com.google.cloud google-cloud-websecurityscanner-parent - 1.0.3 + 1.0.4 diff --git a/proto-google-cloud-websecurityscanner-v1beta/pom.xml b/proto-google-cloud-websecurityscanner-v1beta/pom.xml index 9ed38eb7..06657e0d 100644 --- a/proto-google-cloud-websecurityscanner-v1beta/pom.xml +++ b/proto-google-cloud-websecurityscanner-v1beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-websecurityscanner-v1beta - 0.84.3 + 0.84.4 proto-google-cloud-websecurityscanner-v1beta PROTO library for proto-google-cloud-websecurityscanner-v1beta com.google.cloud google-cloud-websecurityscanner-parent - 1.0.3 + 1.0.4 diff --git a/renovate.json b/renovate.json index 088fd963..3bb92a0b 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 53d4f3e5..ca8523ed 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,20 +29,20 @@ com.google.cloud google-cloud-websecurityscanner - 1.0.2 + 1.0.3 junit junit - 4.13 + 4.13.1 test com.google.truth truth - 1.0.1 + 1.1 test diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 6458d315..59571905 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,19 +28,19 @@ com.google.cloud google-cloud-websecurityscanner - 1.0.2 + 1.0.3 junit junit - 4.13 + 4.13.1 test com.google.truth truth - 1.0.1 + 1.1 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 1a9ca2ea..1c472e5a 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 12.0.0 + 13.3.0 pom import @@ -47,13 +47,13 @@ junit junit - 4.13 + 4.13.1 test com.google.truth truth - 1.0.1 + 1.1 test diff --git a/synth.metadata b/synth.metadata index ef580ca5..c6da7f1e 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-websecurityscanner.git", - "sha": "e45f49f056bccfa5ab3d5319c6839fc8875e8053" + "sha": "832848c89485ac645268e88c176de1a6bfe38dbf" } }, { @@ -35,7 +35,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "0762e8ee2ec21cdfc4d82020b985a104feb0453b" + "sha": "f68649c5f26bcff6817c6d21e90dac0fc71fef8e" } } ], @@ -76,9 +76,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 b8a1d0e1..511f9299 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -proto-google-cloud-websecurityscanner-v1alpha:0.84.3:0.84.3 -proto-google-cloud-websecurityscanner-v1beta:0.84.3:0.84.3 -proto-google-cloud-websecurityscanner-v1:1.0.3:1.0.3 -grpc-google-cloud-websecurityscanner-v1alpha:0.84.3:0.84.3 -grpc-google-cloud-websecurityscanner-v1beta:0.84.3:0.84.3 -grpc-google-cloud-websecurityscanner-v1:1.0.3:1.0.3 -google-cloud-websecurityscanner:1.0.3:1.0.3 \ No newline at end of file +proto-google-cloud-websecurityscanner-v1alpha:0.84.4:0.84.4 +proto-google-cloud-websecurityscanner-v1beta:0.84.4:0.84.4 +proto-google-cloud-websecurityscanner-v1:1.0.4:1.0.4 +grpc-google-cloud-websecurityscanner-v1alpha:0.84.4:0.84.4 +grpc-google-cloud-websecurityscanner-v1beta:0.84.4:0.84.4 +grpc-google-cloud-websecurityscanner-v1:1.0.4:1.0.4 +google-cloud-websecurityscanner:1.0.4:1.0.4 \ No newline at end of file