From 0c826b04704ed5205365b685b7e0e73acbe3378d Mon Sep 17 00:00:00 2001 From: stephwang Date: Tue, 26 Oct 2021 14:03:50 -0400 Subject: [PATCH 1/2] chore(ci): remove dependencies.sh exclusions --- .kokoro/dependencies.sh | 4 +--- owlbot.py | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 4e4085d68..0a01c3ab8 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -69,9 +69,7 @@ function completenessCheck() { # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes) msg "Generating dependency list using flattened pom..." - # Excluding commons-codec,commons-logging from the comparison as a temp fix - # Explanation and issue filed in maven-dependency-plugin: https://issues.apache.org/jira/browse/MDEP-737 - mvn dependency:list -f .flattened-pom.xml -DexcludeArtifactIds=commons-codec,commons-logging -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt + mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt # Compare two dependency lists msg "Comparing dependency lists..." diff --git a/owlbot.py b/owlbot.py index f514ca823..3148c55e7 100644 --- a/owlbot.py +++ b/owlbot.py @@ -24,7 +24,6 @@ '.kokoro/nightly/samples.cfg', '.kokoro/presubmit/java8-samples.cfg', '.kokoro/presubmit/java11-samples.cfg', - '.kokoro/dependencies.sh', 'codecov.yaml', 'renovate.json', ]) From 73cf5f22a2278c04e468b954adc468d4019726c9 Mon Sep 17 00:00:00 2001 From: stephwang Date: Tue, 26 Oct 2021 14:06:52 -0400 Subject: [PATCH 2/2] chore(ci): ensure dependencies.sh comparisons are consistent --- .kokoro/dependencies.sh | 8 ++++++-- owlbot.py | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 0a01c3ab8..586b78bb9 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -65,11 +65,15 @@ function completenessCheck() { # This is stripped from the output as it is not present in the flattened pom. # Only dependencies with 'compile' or 'runtime' scope are included from original dependency list. msg "Generating dependency list using original pom..." - mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt + # Excluding commons-codec,commons-logging from the comparison as a temp fix + # Explanation and issue filed in maven-dependency-plugin: https://issues.apache.org/jira/browse/MDEP-737 + mvn dependency:list -f pom.xml -DexcludeArtifactIds=commons-codec,commons-logging -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) msg "Generating dependency list using flattened pom..." - mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt + # Excluding commons-codec,commons-logging from the comparison as a temp fix + # Explanation and issue filed in maven-dependency-plugin: https://issues.apache.org/jira/browse/MDEP-737 + mvn dependency:list -f .flattened-pom.xml -DexcludeArtifactIds=commons-codec,commons-logging -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt # Compare two dependency lists msg "Comparing dependency lists..." diff --git a/owlbot.py b/owlbot.py index 3148c55e7..f514ca823 100644 --- a/owlbot.py +++ b/owlbot.py @@ -24,6 +24,7 @@ '.kokoro/nightly/samples.cfg', '.kokoro/presubmit/java8-samples.cfg', '.kokoro/presubmit/java11-samples.cfg', + '.kokoro/dependencies.sh', 'codecov.yaml', 'renovate.json', ])