diff --git a/.github/generated-files-bot.yml b/.github/generated-files-bot.yml index 47c2ba13..c644a24e 100644 --- a/.github/generated-files-bot.yml +++ b/.github/generated-files-bot.yml @@ -9,3 +9,4 @@ ignoreAuthors: - 'renovate-bot' - 'yoshi-automation' - 'release-please[bot]' +- 'gcf-owl-bot[bot]' diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index f6a96406..a82a67f5 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": "e916509cbfbf43e978eda13a748191aeb8ebefb0" + "sha": "99f1640b0d0beab8edc8745b78c44382cd94a2ec" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "6726988c677bb78385868bfc48dbfa2fe981d44a" + "sha": "a2de127f90799cd5bace653b1dcc5dd2ca8b19c9" } } ] diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index def8b3a2..0195b32f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,10 +19,6 @@ jobs: - run: .kokoro/build.sh env: JOB_TYPE: test - - name: coverage - uses: codecov/codecov-action@v1 - with: - name: actions ${{matrix.java}} windows: runs-on: windows-latest steps: @@ -80,4 +76,4 @@ jobs: - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr \ No newline at end of file + JOB_TYPE: clirr diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 0aaeedd6..4cf4aa4c 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -23,8 +23,8 @@ cd ${scriptDir}/.. # include common functions source ${scriptDir}/common.sh -# Print out Java version -java -version +# Print out Maven & Java version +mvn -version echo ${JOB_TYPE} # attempt to install 3 times with exponential backoff (starting with 10 seconds) diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index 0b7c733d..c4d6b8a3 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -42,6 +42,8 @@ mvn clean site -B -q -P docFX # copy README to docfx-yml dir and rename index.md cp README.md target/docfx-yml/index.md +# copy CHANGELOG to docfx-yml dir and rename history.md +cp CHANGELOG.md target/docfx-yml/history.md pushd target/docfx-yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 70ff0c76..d934f1d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.2.0](https://www.github.com/googleapis/java-websecurityscanner/compare/v1.1.6...v1.2.0) (2021-05-26) + + +### Features + +* add `gcf-owl-bot[bot]` to `ignoreAuthors` ([#459](https://www.github.com/googleapis/java-websecurityscanner/issues/459)) ([52492f6](https://www.github.com/googleapis/java-websecurityscanner/commit/52492f60681c64da05a044482d679d103539f0a2)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.2.0 ([#458](https://www.github.com/googleapis/java-websecurityscanner/issues/458)) ([4e5633f](https://www.github.com/googleapis/java-websecurityscanner/commit/4e5633fa067b5e5f6ed45fb735de0eac050615e6)) + ### [1.1.6](https://www.github.com/googleapis/java-websecurityscanner/compare/v1.1.5...v1.1.6) (2021-05-11) diff --git a/README.md b/README.md index 6866b223..b3684878 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 - 20.2.0 + 20.5.0 pom import @@ -38,25 +38,25 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-websecurityscanner - 1.1.5 + 1.1.6 ``` If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:20.3.0') +implementation platform('com.google.cloud:libraries-bom:20.5.0') compile 'com.google.cloud:google-cloud-websecurityscanner' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-websecurityscanner:1.1.5' +compile 'com.google.cloud:google-cloud-websecurityscanner:1.1.6' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-websecurityscanner" % "1.1.5" +libraryDependencies += "com.google.cloud" % "google-cloud-websecurityscanner" % "1.1.6" ``` ## Authentication diff --git a/google-cloud-websecurityscanner-bom/pom.xml b/google-cloud-websecurityscanner-bom/pom.xml index 5a8d2efa..cc9a2be2 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.1.6 + 1.2.0 pom com.google.cloud google-cloud-shared-config - 0.11.2 + 0.12.0 Google Cloud websecurityscanner BOM @@ -64,37 +64,37 @@ com.google.api.grpc grpc-google-cloud-websecurityscanner-v1alpha - 0.85.6 + 0.86.0 com.google.api.grpc proto-google-cloud-websecurityscanner-v1beta - 0.85.6 + 0.86.0 com.google.api.grpc proto-google-cloud-websecurityscanner-v1 - 1.1.6 + 1.2.0 com.google.api.grpc proto-google-cloud-websecurityscanner-v1alpha - 0.85.6 + 0.86.0 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1beta - 0.85.6 + 0.86.0 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1 - 1.1.6 + 1.2.0 com.google.cloud google-cloud-websecurityscanner - 1.1.6 + 1.2.0 diff --git a/google-cloud-websecurityscanner/pom.xml b/google-cloud-websecurityscanner/pom.xml index 820652d4..c4e1e598 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.1.6 + 1.2.0 jar Google Cloud Web Security Scanner https://github.com/googleapis/java-websecurityscanner @@ -11,7 +11,7 @@ com.google.cloud google-cloud-websecurityscanner-parent - 1.1.6 + 1.2.0 google-cloud-websecurityscanner diff --git a/grpc-google-cloud-websecurityscanner-v1/pom.xml b/grpc-google-cloud-websecurityscanner-v1/pom.xml index 4bddf502..4c17445b 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.1.6 + 1.2.0 grpc-google-cloud-websecurityscanner-v1 GRPC library for grpc-google-cloud-websecurityscanner-v1 com.google.cloud google-cloud-websecurityscanner-parent - 1.1.6 + 1.2.0 diff --git a/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml b/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml index 89aae27c..90907339 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.85.6 + 0.86.0 grpc-google-cloud-websecurityscanner-v1alpha GRPC library for grpc-google-cloud-websecurityscanner-v1alpha com.google.cloud google-cloud-websecurityscanner-parent - 1.1.6 + 1.2.0 diff --git a/grpc-google-cloud-websecurityscanner-v1beta/pom.xml b/grpc-google-cloud-websecurityscanner-v1beta/pom.xml index beb49b72..7d0623bf 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.85.6 + 0.86.0 grpc-google-cloud-websecurityscanner-v1beta GRPC library for grpc-google-cloud-websecurityscanner-v1beta com.google.cloud google-cloud-websecurityscanner-parent - 1.1.6 + 1.2.0 diff --git a/pom.xml b/pom.xml index 66c964e3..7cd5e1c2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-websecurityscanner-parent pom - 1.1.6 + 1.2.0 Google Cloud Web Security Scanner Parent https://github.com/googleapis/java-websecurityscanner @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.11.2 + 0.12.0 @@ -70,43 +70,43 @@ com.google.api.grpc proto-google-cloud-websecurityscanner-v1alpha - 0.85.6 + 0.86.0 com.google.api.grpc proto-google-cloud-websecurityscanner-v1beta - 0.85.6 + 0.86.0 com.google.api.grpc proto-google-cloud-websecurityscanner-v1 - 1.1.6 + 1.2.0 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1alpha - 0.85.6 + 0.86.0 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1beta - 0.85.6 + 0.86.0 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1 - 1.1.6 + 1.2.0 com.google.cloud google-cloud-websecurityscanner - 1.1.6 + 1.2.0 com.google.cloud google-cloud-shared-dependencies - 1.1.0 + 1.2.0 pom import @@ -159,7 +159,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.1.1 + 3.1.2 @@ -186,7 +186,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.0 html diff --git a/proto-google-cloud-websecurityscanner-v1/pom.xml b/proto-google-cloud-websecurityscanner-v1/pom.xml index c6bb0ce0..f2299710 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.1.6 + 1.2.0 proto-google-cloud-websecurityscanner-v1 PROTO library for proto-google-cloud-websecurityscanner-v1 com.google.cloud google-cloud-websecurityscanner-parent - 1.1.6 + 1.2.0 diff --git a/proto-google-cloud-websecurityscanner-v1alpha/pom.xml b/proto-google-cloud-websecurityscanner-v1alpha/pom.xml index d439cb4d..aef84432 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.85.6 + 0.86.0 proto-google-cloud-websecurityscanner-v1alpha PROTO library for proto-google-cloud-websecurityscanner-v1alpha com.google.cloud google-cloud-websecurityscanner-parent - 1.1.6 + 1.2.0 diff --git a/proto-google-cloud-websecurityscanner-v1beta/pom.xml b/proto-google-cloud-websecurityscanner-v1beta/pom.xml index f274b2b1..7aa56578 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.85.6 + 0.86.0 proto-google-cloud-websecurityscanner-v1beta PROTO library for proto-google-cloud-websecurityscanner-v1beta com.google.cloud google-cloud-websecurityscanner-parent - 1.1.6 + 1.2.0 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 6e9c8e00..21d66758 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-websecurityscanner - 1.1.5 + 1.1.6 @@ -42,7 +42,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index fb20f26f..c909e85f 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-websecurityscanner - 1.1.5 + 1.1.6 @@ -40,7 +40,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 0707eb37..a3b0809a 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 20.2.0 + 20.5.0 pom import @@ -53,7 +53,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test diff --git a/synth.metadata b/synth.metadata index 053f2849..58eb70c0 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-websecurityscanner.git", - "sha": "9c75e83b76e59386fb49c2fdd025325f82d3b6b7" + "sha": "1c736a9eb4d45de5006f24851393cafe220d846a" } }, { @@ -35,7 +35,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "046994f491c02806aea60118e214a9edd67f5ab7" + "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47" } } ], diff --git a/versions.txt b/versions.txt index 04f8f6fa..0d65046e 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -proto-google-cloud-websecurityscanner-v1alpha:0.85.6:0.85.6 -proto-google-cloud-websecurityscanner-v1beta:0.85.6:0.85.6 -proto-google-cloud-websecurityscanner-v1:1.1.6:1.1.6 -grpc-google-cloud-websecurityscanner-v1alpha:0.85.6:0.85.6 -grpc-google-cloud-websecurityscanner-v1beta:0.85.6:0.85.6 -grpc-google-cloud-websecurityscanner-v1:1.1.6:1.1.6 -google-cloud-websecurityscanner:1.1.6:1.1.6 \ No newline at end of file +proto-google-cloud-websecurityscanner-v1alpha:0.86.0:0.86.0 +proto-google-cloud-websecurityscanner-v1beta:0.86.0:0.86.0 +proto-google-cloud-websecurityscanner-v1:1.2.0:1.2.0 +grpc-google-cloud-websecurityscanner-v1alpha:0.86.0:0.86.0 +grpc-google-cloud-websecurityscanner-v1beta:0.86.0:0.86.0 +grpc-google-cloud-websecurityscanner-v1:1.2.0:1.2.0 +google-cloud-websecurityscanner:1.2.0:1.2.0 \ No newline at end of file