From 0d8ed01e03f657eedae0fb399e91b0cfd9a675cd Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot <yoshi-automation@google.com>
Date: Mon, 15 Nov 2021 12:15:51 -0800
Subject: [PATCH] chore: re-generated to pick up changes from synthtool. (#757)

* chore: cleanup cloud RAD generation

Updating cloud rad generation to support [java-shared-config/pull/344](https://github.com/googleapis/java-shared-config/pull/344) updates and removing inclusion of README as we're not currently supporting this feature yet

Source-Author: Emily Ball <emilyball@google.com>
Source-Date: Mon Nov 8 13:23:34 2021 -0800
Source-Repo: googleapis/synthtool
Source-Sha: 99ea92a109dbcd4e2b8c179e337848ba6a25fe16
Source-Link: https://github.com/googleapis/synthtool/commit/99ea92a109dbcd4e2b8c179e337848ba6a25fe16

* chore: update jre to 11 for linter

java-format requires JRE v11+ to run linter. It still check older code, just jre has to be 11+: https://github.com/google/google-java-format/issues/529

Updating ci.yaml template since it is applicable for all the libraries.

Source-Author: Timur Sadykov <stim@google.com>
Source-Date: Tue Nov 9 01:52:34 2021 +0000
Source-Repo: googleapis/synthtool
Source-Sha: 42a3786737c17ece39924d7025f3be481812da53
Source-Link: https://github.com/googleapis/synthtool/commit/42a3786737c17ece39924d7025f3be481812da53
---
 .github/workflows/ci.yaml            |  2 +-
 .kokoro/release/publish_javadoc11.sh | 10 +++-------
 synth.metadata                       |  4 ++--
 3 files changed, 6 insertions(+), 10 deletions(-)

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/synth.metadata b/synth.metadata
index 2c294f85..5cbcbb5a 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-containeranalysis.git",
-        "sha": "9e4c9789167892529cd60fd6dc731e654d47167d"
+        "sha": "6879348f400b676ca6683a3abf2a7ebfce52dc7d"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "717a6a1fe247df095092de1321eadc9da887a06c"
+        "sha": "42a3786737c17ece39924d7025f3be481812da53"
       }
     }
   ],