diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 93b337c6..05de1f60 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -53,7 +53,7 @@ jobs: - uses: actions/setup-java@v2 with: distribution: zulu - java-version: 8 + java-version: 11 - run: java -version - run: .kokoro/build.sh env: diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index bb52a13f..bafa1c83 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -36,13 +36,9 @@ mvn clean install -B -q -DskipTests=true export NAME=google-cloud-containeranalysis export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) -# V3 generates docfx yml from javadoc -# 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 -# copy CHANGELOG to docfx-yml dir and rename history.md +# cloud RAD generation +mvn clean javadoc:aggregate -B -q -P docFX +# include CHANGELOG cp CHANGELOG.md target/docfx-yml/history.md pushd target/docfx-yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 84003c19..0f95a97f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [2.2.4](https://www.github.com/googleapis/java-containeranalysis/compare/v2.2.3...v2.2.4) (2021-11-17) + + +### Dependencies + +* update dependency io.grafeas:grafeas to v2.1.2 ([#762](https://www.github.com/googleapis/java-containeranalysis/issues/762)) ([76c9c63](https://www.github.com/googleapis/java-containeranalysis/commit/76c9c631cc2bd54314c79abd272ff81d46814266)) + ### [2.2.3](https://www.github.com/googleapis/java-containeranalysis/compare/v2.2.2...v2.2.3) (2021-11-15) diff --git a/google-cloud-containeranalysis-bom/pom.xml b/google-cloud-containeranalysis-bom/pom.xml index 330d3def..60737556 100644 --- a/google-cloud-containeranalysis-bom/pom.xml +++ b/google-cloud-containeranalysis-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis-bom - 2.2.3 + 2.2.4 pom com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.2 Google Cloud Container Analysis BOM @@ -53,27 +53,27 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 2.2.3 + 2.2.4 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.92.3 + 0.92.4 com.google.cloud google-cloud-containeranalysis - 2.2.3 + 2.2.4 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 2.2.3 + 2.2.4 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.92.3 + 0.92.4 diff --git a/google-cloud-containeranalysis/pom.xml b/google-cloud-containeranalysis/pom.xml index 2d3d3760..43ac5365 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 - 2.2.3 + 2.2.4 jar Google Cloud Container Analysis https://github.com/googleapis/java-containeranalysis @@ -11,7 +11,7 @@ com.google.cloud google-cloud-containeranalysis-parent - 2.2.3 + 2.2.4 google-cloud-containeranalysis diff --git a/grpc-google-cloud-containeranalysis-v1/pom.xml b/grpc-google-cloud-containeranalysis-v1/pom.xml index d70d1105..a2b07266 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 - 2.2.3 + 2.2.4 grpc-google-cloud-containeranalysis-v1 GRPC library for grpc-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 2.2.3 + 2.2.4 diff --git a/grpc-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/ContainerAnalysisGrpc.java b/grpc-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/ContainerAnalysisGrpc.java index 43025156..0f22942e 100644 --- a/grpc-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/ContainerAnalysisGrpc.java +++ b/grpc-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/ContainerAnalysisGrpc.java @@ -37,6 +37,7 @@ @javax.annotation.Generated( value = "by gRPC proto compiler", comments = "Source: google/devtools/containeranalysis/v1/containeranalysis.proto") +@io.grpc.stub.annotations.GrpcGenerated public final class ContainerAnalysisGrpc { private ContainerAnalysisGrpc() {} diff --git a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml index d1f38026..a86ff7b3 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.92.3 + 0.92.4 grpc-google-cloud-containeranalysis-v1beta1 GRPC library for grpc-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 2.2.3 + 2.2.4 diff --git a/pom.xml b/pom.xml index 28eb85d8..6abe4020 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-containeranalysis-parent pom - 2.2.3 + 2.2.4 Google Cloud Container Analysis Parent https://github.com/googleapis/java-containeranalysis @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.2 @@ -61,27 +61,27 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 2.2.3 + 2.2.4 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.92.3 + 0.92.4 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.92.3 + 0.92.4 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 2.2.3 + 2.2.4 com.google.cloud google-cloud-containeranalysis - 2.2.3 + 2.2.4 @@ -96,7 +96,7 @@ io.grafeas grafeas - 2.1.1 + 2.1.2 diff --git a/proto-google-cloud-containeranalysis-v1/pom.xml b/proto-google-cloud-containeranalysis-v1/pom.xml index 8c206f79..f8c68de6 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 - 2.2.3 + 2.2.4 proto-google-cloud-containeranalysis-v1 PROTO library for proto-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 2.2.3 + 2.2.4 diff --git a/proto-google-cloud-containeranalysis-v1beta1/pom.xml b/proto-google-cloud-containeranalysis-v1beta1/pom.xml index c32749f4..11d8a138 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.92.3 + 0.92.4 proto-google-cloud-containeranalysis-v1beta1 PROTO library for proto-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 2.2.3 + 2.2.4 diff --git a/synth.metadata b/synth.metadata index 2c294f85..0fefbf7a 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,22 +4,22 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-containeranalysis.git", - "sha": "9e4c9789167892529cd60fd6dc731e654d47167d" + "sha": "6879348f400b676ca6683a3abf2a7ebfce52dc7d" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "d2977af9e9f1fc0c9dc8368352daa032471f3c63", - "internalRef": "403132955" + "sha": "2921f9fb3bfbd16f6b2da0104373e2b47a80a65e", + "internalRef": "408420890" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "717a6a1fe247df095092de1321eadc9da887a06c" + "sha": "42a3786737c17ece39924d7025f3be481812da53" } } ], diff --git a/versions.txt b/versions.txt index 6509f8b8..8b35caf7 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-containeranalysis-v1:2.2.3:2.2.3 -proto-google-cloud-containeranalysis-v1beta1:0.92.3:0.92.3 -grpc-google-cloud-containeranalysis-v1beta1:0.92.3:0.92.3 -grpc-google-cloud-containeranalysis-v1:2.2.3:2.2.3 -google-cloud-containeranalysis:2.2.3:2.2.3 +proto-google-cloud-containeranalysis-v1:2.2.4:2.2.4 +proto-google-cloud-containeranalysis-v1beta1:0.92.4:0.92.4 +grpc-google-cloud-containeranalysis-v1beta1:0.92.4:0.92.4 +grpc-google-cloud-containeranalysis-v1:2.2.4:2.2.4 +google-cloud-containeranalysis:2.2.4:2.2.4