diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 28f894ee..88292b18 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-containeranalysis.git", - "sha": "2f8c44bfc7165dfd6cc37f8661402a488d4447e8" + "sha": "cad87ec0980cfed803719426f081aad58cabb85d" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "0199c79b8324fba66476300824aa931788c47e2d" + "sha": "2e7bd5cc66a3f0b90ce1c150eb35c89eeb9872d6" } } ] diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index 7c8816a7..9b4fd4d8 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -16,8 +16,8 @@ jobs: return; } - // only approve PRs like "chore(master): release " - if ( !context.payload.pull_request.title.startsWith("chore(master): release") ) { + // only approve PRs like "chore: release " + if ( !context.payload.pull_request.title.startsWith("chore: release") ) { return; } diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg index 5a56a3b6..a3e5d20f 100644 --- a/.kokoro/release/publish_javadoc.cfg +++ b/.kokoro/release/publish_javadoc.cfg @@ -7,12 +7,6 @@ env_vars: { value: "docs-staging" } -# cloud-rad staging -env_vars: { - key: "STAGING_BUCKET_V2" - value: "docs-staging-v2-staging" -} - env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/java-containeranalysis/.kokoro/release/publish_javadoc.sh" @@ -26,4 +20,4 @@ before_action { keyname: "docuploader_service_account" } } -} \ No newline at end of file +} diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index ae2ddf0a..df45d5f6 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -56,22 +56,3 @@ python3 -m docuploader create-metadata \ python3 -m docuploader upload . \ --credentials ${CREDENTIALS} \ --staging-bucket ${STAGING_BUCKET} - -popd - -# 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 - -# create metadata -python3 -m docuploader create-metadata \ - --name ${NAME} \ - --version ${VERSION} \ - --language java - -# upload docs to staging bucket -python3 -m docuploader upload . \ - --credentials ${CREDENTIALS} \ - --staging-bucket ${STAGING_BUCKET_V2} diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index 8f6cacbc..9e482c01 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -40,6 +40,9 @@ export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) # generate yml 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 + pushd target/docfx-yml # create metadata @@ -52,4 +55,4 @@ python3 -m docuploader create-metadata \ python3 -m docuploader upload . \ --credentials ${CREDENTIALS} \ --staging-bucket ${STAGING_BUCKET_V2} \ - --destination-prefix docfx- + --destination-prefix docfx diff --git a/CHANGELOG.md b/CHANGELOG.md index 7706ce86..c438d254 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.2.15](https://www.github.com/googleapis/java-containeranalysis/compare/v1.2.14...v1.2.15) (2021-03-11) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.20.1 ([#485](https://www.github.com/googleapis/java-containeranalysis/issues/485)) ([3af08dd](https://www.github.com/googleapis/java-containeranalysis/commit/3af08dd245b9d85cc395edc734b152d99e805dc3)) + ### [1.2.14](https://www.github.com/googleapis/java-containeranalysis/compare/v1.2.13...v1.2.14) (2021-02-25) diff --git a/README.md b/README.md index c297fba9..cdb42dce 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 - 18.0.0 + 19.0.0 pom import @@ -38,25 +38,25 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-containeranalysis - 1.2.29 + 1.2.31 ``` If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:18.0.0') +implementation platform('com.google.cloud:libraries-bom:19.0.0') compile 'com.google.cloud:google-cloud-containeranalysis' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-containeranalysis:1.2.29' +compile 'com.google.cloud:google-cloud-containeranalysis:1.2.31' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % "1.2.29" +libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % "1.2.31" ``` ## Authentication diff --git a/google-cloud-containeranalysis-bom/pom.xml b/google-cloud-containeranalysis-bom/pom.xml index d7db17d5..701ba04c 100644 --- a/google-cloud-containeranalysis-bom/pom.xml +++ b/google-cloud-containeranalysis-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis-bom - 1.2.31 + 1.2.32 pom com.google.cloud @@ -64,27 +64,27 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 1.2.31 + 1.2.32 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.88.31 + 0.88.32 com.google.cloud google-cloud-containeranalysis - 1.2.31 + 1.2.32 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 1.2.31 + 1.2.32 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.88.31 + 0.88.32 diff --git a/google-cloud-containeranalysis/pom.xml b/google-cloud-containeranalysis/pom.xml index 30c4fbcc..98168158 100644 --- a/google-cloud-containeranalysis/pom.xml +++ b/google-cloud-containeranalysis/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis - 1.2.31 + 1.2.32 jar Google Cloud Container Analysis https://github.com/googleapis/java-containeranalysis @@ -11,7 +11,7 @@ com.google.cloud google-cloud-containeranalysis-parent - 1.2.31 + 1.2.32 google-cloud-containeranalysis diff --git a/grpc-google-cloud-containeranalysis-v1/pom.xml b/grpc-google-cloud-containeranalysis-v1/pom.xml index 3ed15033..9fad593a 100644 --- a/grpc-google-cloud-containeranalysis-v1/pom.xml +++ b/grpc-google-cloud-containeranalysis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 1.2.31 + 1.2.32 grpc-google-cloud-containeranalysis-v1 GRPC library for grpc-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 1.2.31 + 1.2.32 diff --git a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml index ed5d1789..6b7f09bd 100644 --- a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml +++ b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.88.31 + 0.88.32 grpc-google-cloud-containeranalysis-v1beta1 GRPC library for grpc-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 1.2.31 + 1.2.32 diff --git a/pom.xml b/pom.xml index 3ea1807a..a459f479 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-containeranalysis-parent pom - 1.2.31 + 1.2.32 Google Cloud Container Analysis Parent https://github.com/googleapis/java-containeranalysis @@ -70,33 +70,33 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 1.2.31 + 1.2.32 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.88.31 + 0.88.32 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.88.31 + 0.88.32 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 1.2.31 + 1.2.32 com.google.cloud google-cloud-containeranalysis - 1.2.31 + 1.2.32 com.google.cloud google-cloud-shared-dependencies - 0.20.0 + 0.20.1 pom import diff --git a/proto-google-cloud-containeranalysis-v1/pom.xml b/proto-google-cloud-containeranalysis-v1/pom.xml index 9e9b12f1..c5a95e21 100644 --- a/proto-google-cloud-containeranalysis-v1/pom.xml +++ b/proto-google-cloud-containeranalysis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 1.2.31 + 1.2.32 proto-google-cloud-containeranalysis-v1 PROTO library for proto-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 1.2.31 + 1.2.32 diff --git a/proto-google-cloud-containeranalysis-v1beta1/pom.xml b/proto-google-cloud-containeranalysis-v1beta1/pom.xml index d6a48c09..2722811e 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/pom.xml +++ b/proto-google-cloud-containeranalysis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.88.31 + 0.88.32 proto-google-cloud-containeranalysis-v1beta1 PROTO library for proto-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 1.2.31 + 1.2.32 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index fcbd99af..e9ca989c 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-containeranalysis - 1.2.30 + 1.2.31 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 7f63eaa1..db7d68aa 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-containeranalysis - 1.2.30 + 1.2.31 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 6dc029c4..0d85c960 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 18.0.0 + 19.0.0 pom import diff --git a/synth.metadata b/synth.metadata index b1dc0514..8655307c 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-containeranalysis.git", - "sha": "792daa15c0a78a9e68df445ce36fe0c7d9f47469" + "sha": "3af08dd245b9d85cc395edc734b152d99e805dc3" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "6946fd71ae9215b0e7ae188f5057df765ee6d7d2" + "sha": "0b064d767537e0675fc053e53fca473c5c701fb8" } } ], diff --git a/versions.txt b/versions.txt index d2758846..03de621c 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-containeranalysis-v1:1.2.31:1.2.31 -proto-google-cloud-containeranalysis-v1beta1:0.88.31:0.88.31 -grpc-google-cloud-containeranalysis-v1beta1:0.88.31:0.88.31 -grpc-google-cloud-containeranalysis-v1:1.2.31:1.2.31 -google-cloud-containeranalysis:1.2.31:1.2.31 +proto-google-cloud-containeranalysis-v1:1.2.32:1.2.32 +proto-google-cloud-containeranalysis-v1beta1:0.88.32:0.88.32 +grpc-google-cloud-containeranalysis-v1beta1:0.88.32:0.88.32 +grpc-google-cloud-containeranalysis-v1:1.2.32:1.2.32 +google-cloud-containeranalysis:1.2.32:1.2.32