From 5b31d4114698b28fb2e3555cf956a417afec109f Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@gmail.com>
Date: Wed, 1 Feb 2023 16:37:18 -0500
Subject: [PATCH] ci: use java-shared-dependencies in google-cloud-java
 repository for downstream test (#1291)

* ci: use java-shared-dependencies in google-cloud-java

* No need to modify google-cloud-jar-parent
---
 .kokoro/presubmit/downstream-build.sh | 47 ++++++++++++---------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/.kokoro/presubmit/downstream-build.sh b/.kokoro/presubmit/downstream-build.sh
index 813a64ebd8..81b974b806 100755
--- a/.kokoro/presubmit/downstream-build.sh
+++ b/.kokoro/presubmit/downstream-build.sh
@@ -39,8 +39,8 @@ GAPIC_BOM_VERSION=$(sed -e 's/xmlns=".*"//' gapic-generator-java-bom/pom.xml | x
 
 ### Round 2
 # Run the updated GAPIC BOM against HEAD of java-shared-dependencies
-git clone "https://github.com/googleapis/java-shared-dependencies.git" --depth=1
-pushd java-shared-dependencies/first-party-dependencies
+git clone "https://github.com/googleapis/google-cloud-java.git" --depth=1
+pushd google-cloud-java/java-shared-dependencies/first-party-dependencies
 
 # Replace GAPIC BOM version
 xmllint --shell pom.xml <<EOF
@@ -55,41 +55,36 @@ echo "Modifications to java-shared-dependencies:"
 git diff
 echo
 
-cd ..
-mvn verify install -B -V -ntp -fae \
-  -DskipTests=true \
-  -Dmaven.javadoc.skip=true \
-  -Dgcloud.download.skip=true \
-  -Denforcer.skip=true
-
 # Namespace (xmlns) prevents xmllint from specifying tag names in XPath
 SHARED_DEPS_VERSION=$(sed -e 's/xmlns=".*"//' pom.xml | xmllint --xpath '/project/version/text()' -)
-
 if [ -z "${SHARED_DEPS_VERSION}" ]; then
   echo "Shared dependencies version is not found in pom.xml"
   exit 1
 fi
+
 popd
+pushd google-cloud-java
+mvn -B -V -ntp install --also-make --projects \
+    java-shared-dependencies,java-shared-dependencies/first-party-dependencies,java-shared-dependencies/third-party-dependencies \
+    -DskipTests=true \
+    -Dmaven.javadoc.skip=true \
+    -Dgcloud.download.skip=true \
+    -Denforcer.skip=true
 
 ### Round 3
-# Run the updated java-shared-dependencies BOM against google-cloud-java
-git clone "https://github.com/googleapis/google-cloud-java.git" --depth=1
-pushd google-cloud-java/google-cloud-jar-parent
-
-# Replace java-shared-dependencies version
-xmllint --shell pom.xml <<EOF
-setns x=http://maven.apache.org/POM/4.0.0
-cd .//x:artifactId[text()="google-cloud-shared-dependencies"]
-cd ../x:version
-set ${SHARED_DEPS_VERSION}
-save pom.xml
-EOF
+# Install google-cloud-core-bom (part of java-shared-dependencies)
+echo "Installing java-core"
+mvn -B -V -ntp install -DskipTests --also-make -f java-core \
+    -DskipTests=true \
+    -Dmaven.javadoc.skip=true \
+    -Dgcloud.download.skip=true \
+    -Denforcer.skip=true
+popd
 
-echo "Modifications to google-cloud-java:"
-git diff
-echo
+### Round 4
+# Run the updated java-shared-dependencies BOM against google-cloud-java
+pushd google-cloud-java
 
-cd ..
 source ./.kokoro/common.sh
 RETURN_CODE=0
 setup_application_credentials