Merge 85adb1a into 7cb2150

yoshi-automation · web-flow · commit f37ed861e3d9 · 2021-03-02T14:54:06.000-08:00
diff --git 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-bigquery/.kokoro/release/publish_javadoc.sh"
@@ -26,4 +20,4 @@ before_action {
       keyname: "docuploader_service_account"
     }
   }
-}
+}
diff --git 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/synth.metadata b/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-bigquery.git",
-        "sha": "5ab251eed173bd3554c444c394d088923255b29a"
+        "sha": "7cb21503b44b2225d52c298d6cc698a1335542fa"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "6946fd71ae9215b0e7ae188f5057df765ee6d7d2"
+        "sha": "21da7d9fa02f6916d9f87cf4072b3547b5c72eb5"
       }
     }
   ],

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,6 @@ env_vars: {`
`7`	`7`	`value: "docs-staging"`
`8`	`8`	`}`
`9`	`9`
`10`		`-# cloud-rad staging`
`11`		`-env_vars: {`
`12`		`- key: "STAGING_BUCKET_V2"`
`13`		`- value: "docs-staging-v2-staging"`
`14`		`-}`
`15`		`-`
`16`	`10`	`env_vars: {`
`17`	`11`	`key: "TRAMPOLINE_BUILD_FILE"`
`18`	`12`	`value: "github/java-bigquery/.kokoro/release/publish_javadoc.sh"`
`@@ -26,4 +20,4 @@ before_action {`
`26`	`20`	`keyname: "docuploader_service_account"`
`27`	`21`	`}`
`28`	`22`	`}`
`29`		`-}`
	`23`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,14 @@`
`4`	`4`	`"git": {`
`5`	`5`	`"name": ".",`
`6`	`6`	`"remote": "https://github.com/googleapis/java-bigquery.git",`
`7`		`- "sha": "5ab251eed173bd3554c444c394d088923255b29a"`
	`7`	`+ "sha": "7cb21503b44b2225d52c298d6cc698a1335542fa"`
`8`	`8`	`}`
`9`	`9`	`},`
`10`	`10`	`{`
`11`	`11`	`"git": {`
`12`	`12`	`"name": "synthtool",`
`13`	`13`	`"remote": "https://github.com/googleapis/synthtool.git",`
`14`		`- "sha": "6946fd71ae9215b0e7ae188f5057df765ee6d7d2"`
	`14`	`+ "sha": "21da7d9fa02f6916d9f87cf4072b3547b5c72eb5"`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`],`