chore: Update publish_javadoc.sh

yoshi-automation · yoshi-automation · commit 1eecd3f13e6c · 2020-12-07T15:24:46.000-08:00
* (chore) Update publish_javadoc.sh * add `export` to the envVar's to make sure maven knows about them. * report the Java version * chore: update script * remove `java -version` Co-authored-by: Jeffrey Rennie <rennie@google.com> Source-Author: Les Vogel <lesv@users.noreply.github.com> Source-Date: Mon Dec 7 09:37:58 2020 -0800 Source-Repo: googleapis/synthtool Source-Sha: 5d11bd2888c38ce1fb6fa6bf25494a4219a73928 Source-Link: googleapis/synthtool@5d11bd2
diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh
@@ -38,8 +38,8 @@ python3 -m pip install gcp-docuploader
 # compile all packages
 mvn clean install -B -q -DskipTests=true
 
-NAME=google-cloud-dataproc
-VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
+export NAME=google-cloud-dataproc
+export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
 
 # build the docs
 mvn site -B -q
@@ -59,7 +59,8 @@ python3 -m docuploader upload . \
 
 popd
 
-# V2
+# 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
diff --git a/synth.metadata b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-dataproc.git",
-        "sha": "7c3af364e083c057273b40cb62ac3651e9ceca50"
+        "sha": "f63ddd1088cdc4c87c52f31f467f423b0f6df999"
       }
     },
     {
@@ -27,7 +27,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "943bb78606d035001123030067dffcc34f4645f2"
+        "sha": "5d11bd2888c38ce1fb6fa6bf25494a4219a73928"
       }
     }
   ],

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"git": {`
`5`	`5`	`"name": ".",`
`6`	`6`	`"remote": "https://github.com/googleapis/java-dataproc.git",`
`7`		`- "sha": "7c3af364e083c057273b40cb62ac3651e9ceca50"`
	`7`	`+ "sha": "f63ddd1088cdc4c87c52f31f467f423b0f6df999"`
`8`	`8`	`}`
`9`	`9`	`},`
`10`	`10`	`{`
`@@ -27,7 +27,7 @@`
`27`	`27`	`"git": {`
`28`	`28`	`"name": "synthtool",`
`29`	`29`	`"remote": "https://github.com/googleapis/synthtool.git",`
`30`		`- "sha": "943bb78606d035001123030067dffcc34f4645f2"`
	`30`	`+ "sha": "5d11bd2888c38ce1fb6fa6bf25494a4219a73928"`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`],`