From 21da7d9fa02f6916d9f87cf4072b3547b5c72eb5 Mon Sep 17 00:00:00 2001
From: Emily Ball <emilyball@google.com>
Date: Tue, 2 Mar 2021 10:13:11 -0800
Subject: [PATCH] chore: remove docLava v2 doc generation (#964)

* chore: remove docLava v2 doc generation

Not using this anymore and it is causing some issues in pubsublite

* chore: removing v2 doclava bucket config
---
 .../.kokoro/release/publish_javadoc.cfg       |  8 +-------
 .../.kokoro/release/publish_javadoc.sh        | 19 -------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/synthtool/gcp/templates/java_library/.kokoro/release/publish_javadoc.cfg b/synthtool/gcp/templates/java_library/.kokoro/release/publish_javadoc.cfg
index 057fa372b..45c9fcc48 100644
--- a/synthtool/gcp/templates/java_library/.kokoro/release/publish_javadoc.cfg
+++ b/synthtool/gcp/templates/java_library/.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/{{ metadata['repo']['repo_short'] }}/.kokoro/release/publish_javadoc.sh"
@@ -26,4 +20,4 @@ before_action {
       keyname: "docuploader_service_account"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/synthtool/gcp/templates/java_library/.kokoro/release/publish_javadoc.sh b/synthtool/gcp/templates/java_library/.kokoro/release/publish_javadoc.sh
index be1de12e7..56d291c00 100755
--- a/synthtool/gcp/templates/java_library/.kokoro/release/publish_javadoc.sh
+++ b/synthtool/gcp/templates/java_library/.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}