@@ -353,6 +353,7 @@ _ci_upload_coverage_files() {
353353 --transform=" flags=r;s|\\ (/jacoco.*\\ ).exec$|\\ 1_${testtype} _${testgroup} .exec|" \
354354 --transform=" flags=r;s|\\ (/tmp/jacocoDir/.*\\ ).exec$|\\ 1_${testtype} _${testgroup} .exec|" \
355355 --exclude=" */META-INF/bundled-dependencies/*" \
356+ --exclude=" */META-INF/versions/*" \
356357 $GITHUB_WORKSPACE /target/classpath_* \
357358 $( find " $GITHUB_WORKSPACE " -path " */target/jacoco*.exec" -printf " %p\n%h/classes\n" | sort | uniq) \
358359 $( [ -d /tmp/jacocoDir ] && echo " /tmp/jacocoDir" ) \
@@ -494,11 +495,11 @@ ci_create_test_coverage_report() {
494495 local classfilesArgs=" --classfiles $( {
495496 {
496497 for classpathEntry in $( cat $completeClasspathFile | { grep -v -f $filterArtifactsFile || true ; } | sort | uniq | { grep -v -E " $excludeJarsPattern " || true ; }) ; do
497- if [[ -f $classpathEntry && -n " $( unzip -Z1C $classpathEntry ' META-INF/bundled-dependencies/*' 2> /dev/null) " ]]; then
498- # file must be processed by removing META-INF/bundled-dependencies
498+ if [[ -f $classpathEntry && -n " $( unzip -Z1C $classpathEntry ' META-INF/bundled-dependencies/*' ' META-INF/versions/* ' 2> /dev/null) " ]]; then
499+ # file must be processed by removing META-INF/bundled-dependencies and META-INF/versions
499500 local jartempfile=$( mktemp -t jarfile.XXXX --suffix=.jar)
500501 cp $classpathEntry $jartempfile
501- zip -q -d $jartempfile ' META-INF/bundled-dependencies/*' & > /dev/null
502+ zip -q -d $jartempfile ' META-INF/bundled-dependencies/*' ' META-INF/versions/* ' & > /dev/null
502503 echo $jartempfile
503504 else
504505 echo $classpathEntry
@@ -560,7 +561,7 @@ ci_create_inttest_coverage_report() {
560561 # remove jar file that causes duplicate classes issue
561562 rm /tmp/jacocoDir/pulsar_lib/org.apache.pulsar-bouncy-castle* || true
562563 # remove any bundled dependencies as part of .jar/.nar files
563- find /tmp/jacocoDir/pulsar_lib ' (' -name " *.jar" -or -name " *.nar" ' )' -exec echo " Processing {}" \; -exec zip -q -d {} ' META-INF/bundled-dependencies/*' \; | grep -E -v " Nothing to do|^$" || true
564+ find /tmp/jacocoDir/pulsar_lib ' (' -name " *.jar" -or -name " *.nar" ' )' -exec echo " Processing {}" \; -exec zip -q -d {} ' META-INF/bundled-dependencies/*' ' META-INF/versions/* ' \; | grep -E -v " Nothing to do|^$" || true
564565 fi
565566 # projects that aren't considered as production code and their own src/main/java source code shouldn't be analysed
566567 local excludeProjectsPattern=" testmocks|testclient|buildtools"
0 commit comments