@@ -43,24 +43,16 @@ for repo in ${REPOS_UNDER_TEST//,/ }; do # Split on comma
4343
4444 # Match all artifacts that start with google-cloud (rules out proto and grpc modules)
4545 # Exclude any matches to BOM artifacts or emulators
46- ARTIFACT_LIST=$( cat " versions.txt" | grep " ^google-cloud" | grep -vE " (bom|emulator) " | tr ' \n' ' ,' )
46+ ARTIFACT_LIST=$( cat " versions.txt" | grep " ^google-cloud" | grep -vE " (bom|emulator|google-cloud-java) " | awk -F: ' {$1="com.google.cloud:"$1; $2=""; print} ' OFS=: | sed ' s/::/:/ ' | tr ' \n' ' ,' )
4747 ARTIFACT_LIST=${ARTIFACT_LIST% ,}
4848
4949 echo " Found artifacts ${ARTIFACT_LIST} "
5050 popd
5151
52- for artifact in ${ARTIFACT_LIST// ,/ } ; do
53- artifact_id=$( echo " ${artifact} " | tr ' :' ' \n' | head -n 1)
54- version=$( echo " ${artifact} " | tr ' :' ' \n' | tail -n 1)
55-
56- maven_coordinates=" com.google.cloud:${artifact_id} :${version} "
57- echo " Using ${maven_coordinates} "
58-
59- # The `-s` argument filters the linkage check problems that stem from the artifact
60- program_args=" -r --artifacts ${maven_coordinates} ,com.google.protobuf:protobuf-java:${PROTOBUF_RUNTIME_VERSION} ,com.google.protobuf:protobuf-java-util:${PROTOBUF_RUNTIME_VERSION} -s ${maven_coordinates} "
61- echo " Linkage Checker Program Arguments: ${program_args} "
62- mvn -B -ntp exec:java -Dexec.mainClass=" com.google.cloud.tools.opensource.classpath.LinkageCheckerMain" -Dexec.args=" ${program_args} "
63- done
52+ # The `-s` argument filters the linkage check problems that stem from the artifact
53+ program_args=" -r --artifacts ${ARTIFACT_LIST} ,com.google.protobuf:protobuf-java:${PROTOBUF_RUNTIME_VERSION} ,com.google.protobuf:protobuf-java-util:${PROTOBUF_RUNTIME_VERSION} -s ${maven_coordinates} "
54+ echo " Linkage Checker Program Arguments: ${program_args} "
55+ mvn -B -ntp exec:java -Dexec.mainClass=" com.google.cloud.tools.opensource.classpath.LinkageCheckerMain" -Dexec.args=" ${program_args} "
6456done
6557popd
6658popd
0 commit comments