diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index fecbc6e9..b7d959ba 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -48,12 +48,12 @@ function completenessCheck() { mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes) - # [3/1/2021] Adding -DexcludeArtifactIds=annotations,gson,protobuf-java-util,commons-codec,commons-logging,perfmark-api + # [3/1/2021] Adding -DexcludeArtifactIds=annotations,gson,protobuf-java-util,commons-codec,commons-logging,animal-sniffer-annotations # due to maven dependency plugin setting transitive compile/runtime deps scope to test when it is also a test dep # Raised issue: https://issues.apache.org/jira/browse/MDEP-737 msg "Generating dependency list using flattened pom..." - mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -DexcludeArtifactIds=annotations,protobuf-java-util,commons-codec,commons-logging,perfmark-api -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt - + mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -DexcludeArtifactIds=annotations,protobuf-java-util,commons-codec,commons-logging,animal-sniffer-annotations -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt + # Compare two dependency lists msg "Comparing dependency lists..." diff .org-list.txt .new-list.txt >.diff.txt diff --git a/pom.xml b/pom.xml index 2e9c8cdf..39396ab2 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ com.google.cloud google-cloud-shared-dependencies - 1.3.0 + 1.4.0 pom import