From 07f44f0a125b6f67287b8dfd5ce3c834baca06e3 Mon Sep 17 00:00:00 2001
From: stephwang <stephwang@google.com>
Date: Thu, 9 Apr 2020 12:39:56 -0400
Subject: [PATCH 01/10] ci: add dependency list completeness check

---
 .kokoro/completeness-check.sh | 50 +++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 .kokoro/completeness-check.sh

diff --git a/.kokoro/completeness-check.sh b/.kokoro/completeness-check.sh
new file mode 100644
index 0000000000..d53b73d45b
--- /dev/null
+++ b/.kokoro/completeness-check.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+## Get the directory of the build script
+scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; }
+function msg() { println "$*" >&2; }
+function println() { printf '%s\n' "$(now) $*"; }
+
+function cleanup() {
+  rm .org-list.txt .new-list.txt .diff.txt
+}
+
+## cd to the parent directory, i.e. the root of the git repo
+cd ${scriptDir}/..
+
+## Locally install artifacts
+#mvn verify -DskipTests
+
+## Find client directory that continas flattened pom and cd into it
+clientDir=$(find -iname ".flattened-pom.xml" | cut -d"/" -f1-2)
+cd "$clientDir"
+
+## Run dependency list completeness check
+
+# Output dep list with compile scope generated using the original pom
+msg "Generating dependency list using original pom..."
+mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:compile' >.org-list.txt
+
+# Output dep list with compile scope generated using the flattened pom
+msg "Generating dependency list using flattened pom..."
+mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:compile' >.new-list.txt
+
+# Compare two dependency lists
+msg "Comparing dependency lists..."
+diff .org-list.txt .new-list.txt >.diff.txt && (msg "Success. No diff!" && cleanup) || (msg "Diff found: " && cat .diff.txt)

From ddaf37071b819d5d9638a947b1f5114d38ac66e1 Mon Sep 17 00:00:00 2001
From: stephwang <stephwang@google.com>
Date: Thu, 9 Apr 2020 17:55:58 -0400
Subject: [PATCH 02/10] update based on comments

---
 .kokoro/completeness-check.sh | 45 +++++++++++++++--------------------
 .kokoro/dependencies.sh       | 13 ++++++++++
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/.kokoro/completeness-check.sh b/.kokoro/completeness-check.sh
index d53b73d45b..d124864cd4 100644
--- a/.kokoro/completeness-check.sh
+++ b/.kokoro/completeness-check.sh
@@ -13,38 +13,31 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -eo pipefail
+#set -eo pipefail
 
-## Get the directory of the build script
-scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+## Helper functions
 function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; }
 function msg() { println "$*" >&2; }
 function println() { printf '%s\n' "$(now) $*"; }
 
-function cleanup() {
-  rm .org-list.txt .new-list.txt .diff.txt
-}
-
-## cd to the parent directory, i.e. the root of the git repo
-cd ${scriptDir}/..
-
-## Locally install artifacts
-#mvn verify -DskipTests
-
-## Find client directory that continas flattened pom and cd into it
-clientDir=$(find -iname ".flattened-pom.xml" | cut -d"/" -f1-2)
-cd "$clientDir"
-
 ## Run dependency list completeness check
+function completenessCheck() {
+  # cd into dir containing flattened pom
+  cd "$1" || exit
+  echo "checking in dir: $1"
+
+  # Output dep list with compile scope generated using the original pom
+  msg "Generating dependency list using original pom..."
+  mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:compile' >.org-list.txt
 
-# Output dep list with compile scope generated using the original pom
-msg "Generating dependency list using original pom..."
-mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:compile' >.org-list.txt
+  # Output dep list generated using the flattened pom (test scope deps are ommitted)
+  msg "Generating dependency list using flattened pom..."
+  mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.new-list.txt
 
-# Output dep list with compile scope generated using the flattened pom
-msg "Generating dependency list using flattened pom..."
-mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:compile' >.new-list.txt
+  # Compare two dependency lists
+  msg "Comparing dependency lists..."
+  diff .org-list.txt .new-list.txt >.diff.txt && msg "Success. No diff!" || msg "Diff found. Check .diff.txt file located in $1. Exiting with exit code $?." && exit 1
 
-# Compare two dependency lists
-msg "Comparing dependency lists..."
-diff .org-list.txt .new-list.txt >.diff.txt && (msg "Success. No diff!" && cleanup) || (msg "Diff found: " && cat .diff.txt)
+  # cd back to root of git repo
+  cd ..
+}
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 0aade871ce..32a1fb1d0d 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -36,3 +36,16 @@ retry_with_backoff 3 10 \
     -Dclirr.skip=true
 
 mvn -B dependency:analyze -DfailOnWarning=true
+
+echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************"
+source ${scriptDir}/completeness-check.sh
+
+## Locally install artifacts
+mvn verify -DskipTests
+
+for path in $(find -name ".flattened-pom.xml")
+do
+  dir=$(dirname "$path")
+  # Check flattened pom in each dir that contains it for completeness
+  completenessCheck "$dir"
+done

From becdc177bb74b8d9985605cd44ca8cd804f1f046 Mon Sep 17 00:00:00 2001
From: stephwang <stephwang@google.com>
Date: Thu, 9 Apr 2020 18:46:16 -0400
Subject: [PATCH 03/10] update based on comments

---
 .kokoro/completeness-check.sh |  6 +++---
 .kokoro/dependencies.sh       | 23 ++++++++++-------------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/.kokoro/completeness-check.sh b/.kokoro/completeness-check.sh
index d124864cd4..0054076c21 100644
--- a/.kokoro/completeness-check.sh
+++ b/.kokoro/completeness-check.sh
@@ -23,8 +23,8 @@ function println() { printf '%s\n' "$(now) $*"; }
 ## Run dependency list completeness check
 function completenessCheck() {
   # cd into dir containing flattened pom
-  cd "$1" || exit
-  echo "checking in dir: $1"
+  cd "$1" || return 1
+  echo "Checking in dir: $1"
 
   # Output dep list with compile scope generated using the original pom
   msg "Generating dependency list using original pom..."
@@ -36,7 +36,7 @@ function completenessCheck() {
 
   # Compare two dependency lists
   msg "Comparing dependency lists..."
-  diff .org-list.txt .new-list.txt >.diff.txt && msg "Success. No diff!" || msg "Diff found. Check .diff.txt file located in $1. Exiting with exit code $?." && exit 1
+  diff .org-list.txt .new-list.txt >.diff.txt && msg "Success. No diff!" && return 0|| msg "Diff found. Check .diff.txt file located in $1. Exiting with exit code $?." && return 1
 
   # cd back to root of git repo
   cd ..
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 32a1fb1d0d..3569fd929c 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -27,25 +27,22 @@ source ${scriptDir}/common.sh
 java -version
 echo $JOB_TYPE
 
-export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
-
-# this should run maven enforcer
-retry_with_backoff 3 10 \
-  mvn install -B -V \
-    -DskipTests=true \
-    -Dclirr.skip=true
-
-mvn -B dependency:analyze -DfailOnWarning=true
-
 echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************"
 source ${scriptDir}/completeness-check.sh
 
-## Locally install artifacts
-mvn verify -DskipTests
-
 for path in $(find -name ".flattened-pom.xml")
 do
   dir=$(dirname "$path")
   # Check flattened pom in each dir that contains it for completeness
   completenessCheck "$dir"
 done
+
+export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
+
+# this should run maven enforcer
+retry_with_backoff 3 10 \
+  mvn install -B -V \
+    -DskipTests=true \
+    -Dclirr.skip=true
+
+mvn -B dependency:analyze -DfailOnWarning=true

From 17cacedb2cd58b782853372328730051b4d50029 Mon Sep 17 00:00:00 2001
From: stephwang <stephwang@google.com>
Date: Thu, 9 Apr 2020 20:02:53 -0400
Subject: [PATCH 04/10] update based on comments

---
 .kokoro/completeness-check.sh | 16 +++++++++-------
 .kokoro/dependencies.sh       | 20 ++++++++++----------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/.kokoro/completeness-check.sh b/.kokoro/completeness-check.sh
index 0054076c21..c76cc56898 100644
--- a/.kokoro/completeness-check.sh
+++ b/.kokoro/completeness-check.sh
@@ -22,22 +22,24 @@ function println() { printf '%s\n' "$(now) $*"; }
 
 ## Run dependency list completeness check
 function completenessCheck() {
-  # cd into dir containing flattened pom
-  cd "$1" || return 1
+  # Go into dir containing flattened pom
+  pushd "$1" || return 1
   echo "Checking in dir: $1"
 
   # Output dep list with compile scope generated using the original pom
   msg "Generating dependency list using original pom..."
-  mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:compile' >.org-list.txt
+  mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.org-list.txt || true
 
   # Output dep list generated using the flattened pom (test scope deps are ommitted)
   msg "Generating dependency list using flattened pom..."
-  mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.new-list.txt
+  mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.new-list.txt || true
 
   # Compare two dependency lists
   msg "Comparing dependency lists..."
-  diff .org-list.txt .new-list.txt >.diff.txt && msg "Success. No diff!" && return 0|| msg "Diff found. Check .diff.txt file located in $1. Exiting with exit code $?." && return 1
 
-  # cd back to root of git repo
-  cd ..
+  (diff .org-list.txt .new-list.txt >.diff.txt && msg "Success. No diff!" || msg "Diff found. Check .diff.txt file located in $1." && exit 1) || true
+
+  # Go back to root of git repo
+  echo "Going back to the root"
+  popd
 }
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 3569fd929c..aa43d57736 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -27,16 +27,6 @@ source ${scriptDir}/common.sh
 java -version
 echo $JOB_TYPE
 
-echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************"
-source ${scriptDir}/completeness-check.sh
-
-for path in $(find -name ".flattened-pom.xml")
-do
-  dir=$(dirname "$path")
-  # Check flattened pom in each dir that contains it for completeness
-  completenessCheck "$dir"
-done
-
 export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
 
 # this should run maven enforcer
@@ -46,3 +36,13 @@ retry_with_backoff 3 10 \
     -Dclirr.skip=true
 
 mvn -B dependency:analyze -DfailOnWarning=true
+
+echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************"
+source ${scriptDir}/completeness-check.sh
+
+for path in $(find -name ".flattened-pom.xml")
+do
+  dir=$(dirname "$path")
+  # Check flattened pom in each dir that contains it for completeness
+  completenessCheck "$dir"
+done

From a2404301be08d72f6755236c13cab593401c1572 Mon Sep 17 00:00:00 2001
From: stephwang <stephwang@google.com>
Date: Fri, 10 Apr 2020 16:03:58 -0400
Subject: [PATCH 05/10] update based on comments

---
 .kokoro/completeness-check.sh | 22 ++++++++++------------
 .kokoro/dependencies.sh       | 19 +++++++++++++++++--
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/.kokoro/completeness-check.sh b/.kokoro/completeness-check.sh
index c76cc56898..f012d8a615 100644
--- a/.kokoro/completeness-check.sh
+++ b/.kokoro/completeness-check.sh
@@ -22,24 +22,22 @@ function println() { printf '%s\n' "$(now) $*"; }
 
 ## Run dependency list completeness check
 function completenessCheck() {
-  # Go into dir containing flattened pom
-  pushd "$1" || return 1
-  echo "Checking in dir: $1"
-
   # Output dep list with compile scope generated using the original pom
   msg "Generating dependency list using original pom..."
-  mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.org-list.txt || true
+  mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | grep -v ':test$' >.org-list.txt || true # continue without error if list is empty
 
   # Output dep list generated using the flattened pom (test scope deps are ommitted)
   msg "Generating dependency list using flattened pom..."
-  mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.new-list.txt || true
+  mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.new-list.txt || true # continue without error if list is empty
 
   # Compare two dependency lists
   msg "Comparing dependency lists..."
-
-  (diff .org-list.txt .new-list.txt >.diff.txt && msg "Success. No diff!" || msg "Diff found. Check .diff.txt file located in $1." && exit 1) || true
-
-  # Go back to root of git repo
-  echo "Going back to the root"
-  popd
+  diff .org-list.txt .new-list.txt >.diff.txt
+  if [[ $? == 0 ]]
+    then
+      msg "Success. No diff!"
+  else
+    msg "Diff found. Check .diff.txt file located in $1."
+    return 1
+  fi
 }
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index aa43d57736..3d3b98e1e9 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -eo pipefail
+set -o pipefail
 
 ## Get the directory of the build script
 scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
@@ -40,9 +40,24 @@ mvn -B dependency:analyze -DfailOnWarning=true
 echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************"
 source ${scriptDir}/completeness-check.sh
 
+# Allow failures to continue running the script
+error_count=0
+
 for path in $(find -name ".flattened-pom.xml")
 do
-  dir=$(dirname "$path")
   # Check flattened pom in each dir that contains it for completeness
+  dir=$(dirname "$path")
+  pushd "$dir"
   completenessCheck "$dir"
+  error_count=$(($error_count + $?))
+  popd
 done
+
+if [[ $error_count == 0 ]]
+then
+  msg "All checks passed."
+  exit 0
+else
+  msg "Errors found. See log statements above."
+  exit 1
+fi

From 96743f89518cfd5331c1dad4614e2cfee31be25a Mon Sep 17 00:00:00 2001
From: stephwang <stephwang@google.com>
Date: Fri, 10 Apr 2020 18:48:27 -0400
Subject: [PATCH 06/10] update based on comments

---
 .kokoro/dependencies.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 3d3b98e1e9..bb0c90f414 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -o pipefail
+set -eo pipefail
 
 ## Get the directory of the build script
 scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
@@ -41,6 +41,7 @@ echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************"
 source ${scriptDir}/completeness-check.sh
 
 # Allow failures to continue running the script
+set +e
 error_count=0
 
 for path in $(find -name ".flattened-pom.xml")

From c647878dee41889f38d953d46be1e0e12883b277 Mon Sep 17 00:00:00 2001
From: stephwang <stephwang@google.com>
Date: Fri, 10 Apr 2020 19:32:37 -0400
Subject: [PATCH 07/10] update based on comments

---
 .kokoro/completeness-check.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.kokoro/completeness-check.sh b/.kokoro/completeness-check.sh
index f012d8a615..d001cb8ba9 100644
--- a/.kokoro/completeness-check.sh
+++ b/.kokoro/completeness-check.sh
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#set -eo pipefail
-
 ## Helper functions
 function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; }
 function msg() { println "$*" >&2; }
@@ -24,11 +22,11 @@ function println() { printf '%s\n' "$(now) $*"; }
 function completenessCheck() {
   # Output dep list with compile scope generated using the original pom
   msg "Generating dependency list using original pom..."
-  mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | grep -v ':test$' >.org-list.txt || true # continue without error if list is empty
+  mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | grep -v ':test$' >.org-list.txt
 
   # Output dep list generated using the flattened pom (test scope deps are ommitted)
   msg "Generating dependency list using flattened pom..."
-  mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.new-list.txt || true # continue without error if list is empty
+  mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.new-list.txt
 
   # Compare two dependency lists
   msg "Comparing dependency lists..."

From cd12a6495dd70425753238d00f0d16a401a6e553 Mon Sep 17 00:00:00 2001
From: stephwang <stephwang@google.com>
Date: Sat, 11 Apr 2020 09:42:44 -0400
Subject: [PATCH 08/10] update based on comments

---
 .kokoro/common.sh             |  7 +++++-
 .kokoro/completeness-check.sh | 41 -----------------------------------
 .kokoro/dependencies.sh       | 24 ++++++++++++++++++--
 3 files changed, 28 insertions(+), 44 deletions(-)
 delete mode 100644 .kokoro/completeness-check.sh

diff --git a/.kokoro/common.sh b/.kokoro/common.sh
index a3bbc5f679..054315eacc 100644
--- a/.kokoro/common.sh
+++ b/.kokoro/common.sh
@@ -15,6 +15,11 @@
 
 # set -eo pipefail
 
+## Helper functionss
+function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; }
+function msg() { println "$*" >&2; }
+function println() { printf '%s\n' "$(now) $*"; }
+
 function retry_with_backoff {
     attempts_left=$1
     sleep_seconds=$2
@@ -41,4 +46,4 @@ function retry_with_backoff {
     fi
 
     return $exit_code
-}
+}
\ No newline at end of file
diff --git a/.kokoro/completeness-check.sh b/.kokoro/completeness-check.sh
deleted file mode 100644
index d001cb8ba9..0000000000
--- a/.kokoro/completeness-check.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-## Helper functions
-function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; }
-function msg() { println "$*" >&2; }
-function println() { printf '%s\n' "$(now) $*"; }
-
-## Run dependency list completeness check
-function completenessCheck() {
-  # Output dep list with compile scope generated using the original pom
-  msg "Generating dependency list using original pom..."
-  mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | grep -v ':test$' >.org-list.txt
-
-  # Output dep list generated using the flattened pom (test scope deps are ommitted)
-  msg "Generating dependency list using flattened pom..."
-  mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.new-list.txt
-
-  # Compare two dependency lists
-  msg "Comparing dependency lists..."
-  diff .org-list.txt .new-list.txt >.diff.txt
-  if [[ $? == 0 ]]
-    then
-      msg "Success. No diff!"
-  else
-    msg "Diff found. Check .diff.txt file located in $1."
-    return 1
-  fi
-}
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index bb0c90f414..32901b4a25 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -38,12 +38,32 @@ retry_with_backoff 3 10 \
 mvn -B dependency:analyze -DfailOnWarning=true
 
 echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************"
-source ${scriptDir}/completeness-check.sh
+## Run dependency list completeness check
+function completenessCheck() {
+  # Output dep list with compile scope generated using the original pom
+  msg "Generating dependency list using original pom..."
+  mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | grep -v ':test$' >.org-list.txt
+
+  # Output dep list generated using the flattened pom (test scope deps are ommitted)
+  msg "Generating dependency list using flattened pom..."
+  mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.new-list.txt
+
+  # Compare two dependency lists
+  msg "Comparing dependency lists..."
+  diff .org-list.txt .new-list.txt >.diff.txt
+  if [[ $? == 0 ]]
+    then
+      msg "Success. No diff!"
+  else
+    msg "Diff found. Check .diff.txt file located in $1."
+    return 1
+  fi
+}
 
 # Allow failures to continue running the script
 set +e
-error_count=0
 
+error_count=0
 for path in $(find -name ".flattened-pom.xml")
 do
   # Check flattened pom in each dir that contains it for completeness

From b9790f569d5b4d4a3b3c34140f72be459c3a1186 Mon Sep 17 00:00:00 2001
From: stephwang <stephwang@google.com>
Date: Sat, 11 Apr 2020 09:44:39 -0400
Subject: [PATCH 09/10] update based on comments

---
 .kokoro/common.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.kokoro/common.sh b/.kokoro/common.sh
index 054315eacc..da1f2b45d6 100644
--- a/.kokoro/common.sh
+++ b/.kokoro/common.sh
@@ -15,11 +15,6 @@
 
 # set -eo pipefail
 
-## Helper functionss
-function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; }
-function msg() { println "$*" >&2; }
-function println() { printf '%s\n' "$(now) $*"; }
-
 function retry_with_backoff {
     attempts_left=$1
     sleep_seconds=$2
@@ -46,4 +41,9 @@ function retry_with_backoff {
     fi
 
     return $exit_code
-}
\ No newline at end of file
+}
+
+## Helper functionss
+function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; }
+function msg() { println "$*" >&2; }
+function println() { printf '%s\n' "$(now) $*"; }

From 03aa928e1b6184854ca58f717d6845d720a80e8d Mon Sep 17 00:00:00 2001
From: stephwang <stephwang@google.com>
Date: Mon, 13 Apr 2020 17:27:37 -0400
Subject: [PATCH 10/10] dump out diff

---
 .kokoro/dependencies.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 32901b4a25..cf3bb4347e 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -55,7 +55,9 @@ function completenessCheck() {
     then
       msg "Success. No diff!"
   else
-    msg "Diff found. Check .diff.txt file located in $1."
+    msg "Diff found. See below: "
+    msg "You can also check .diff.txt file located in $1."
+    cat .diff.txt
     return 1
   fi
 }