diff --git a/build/pulsar_ci_tool.sh b/build/pulsar_ci_tool.sh index 12dfc4bfcc47a..988a715cdc53d 100755 --- a/build/pulsar_ci_tool.sh +++ b/build/pulsar_ci_tool.sh @@ -37,6 +37,16 @@ function ci_print_thread_dumps() { return 0 } +function _ci_mvn() { + mvn -B -ntp "$@" +} + +# runs OWASP Dependency Check for all projects +function ci_dependency_check() { + _ci_mvn -Pmain,skip-all,skipDocker,owasp-dependency-check initialize verify -pl '!pulsar-client-tools-test' "$@" +} + + if [ -z "$1" ]; then echo "usage: $0 [ci_tool_function_name]" echo "Available ci tool functions:" diff --git a/jclouds-shaded/pom.xml b/jclouds-shaded/pom.xml index 11dff8afcf753..b9fd5655ea96d 100644 --- a/jclouds-shaded/pom.xml +++ b/jclouds-shaded/pom.xml @@ -52,7 +52,7 @@ maven-shade-plugin - package + ${shadePluginPhase} shade diff --git a/kafka-connect-avro-converter-shaded/pom.xml b/kafka-connect-avro-converter-shaded/pom.xml index 87357a0e71861..23befc866a9ae 100644 --- a/kafka-connect-avro-converter-shaded/pom.xml +++ b/kafka-connect-avro-converter-shaded/pom.xml @@ -59,7 +59,7 @@ maven-shade-plugin - package + ${shadePluginPhase} shade diff --git a/pom.xml b/pom.xml index dc2bbec7b1cc1..6561d35ae0856 100644 --- a/pom.xml +++ b/pom.xml @@ -97,6 +97,8 @@ flexible messaging model and an intuitive client API. apachepulsar false false + package + package 1.19 @@ -236,6 +238,7 @@ flexible messaging model and an intuitive client API. 0.1.4 1.3 0.4 + 6.1.5 rename-netty-native-libs.sh @@ -1601,7 +1604,7 @@ flexible messaging model and an intuitive client API. default-nar - package + ${narPluginPhase} nar @@ -1799,8 +1802,8 @@ flexible messaging model and an intuitive client API. rename-netty-native-libs.cmd - + main @@ -2050,6 +2053,101 @@ flexible messaging model and an intuitive client API. tests + + skip-all + + true + true + true + true + true + true + true + true + none + none + true + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + default-testCompile + + testCompile + + none + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + default-test + + test + + none + + + + + + + + owasp-dependency-check + + + + org.owasp + dependency-check-maven + ${dependency-check-maven.version} + + false + false + false + false + false + false + false + false + false + false + false + false + + + + + aggregate + + + + + + + + + + org.owasp + dependency-check-maven + ${dependency-check-maven.version} + + + + aggregate + + + + + + + diff --git a/pulsar-broker-shaded/pom.xml b/pulsar-broker-shaded/pom.xml index 147aaa1f4ebdb..e15b838243869 100644 --- a/pulsar-broker-shaded/pom.xml +++ b/pulsar-broker-shaded/pom.xml @@ -97,7 +97,7 @@ maven-shade-plugin - package + ${shadePluginPhase} shade diff --git a/pulsar-client-1x-base/pulsar-client-2x-shaded/pom.xml b/pulsar-client-1x-base/pulsar-client-2x-shaded/pom.xml index 957de72f09212..beb6b342caad2 100644 --- a/pulsar-client-1x-base/pulsar-client-2x-shaded/pom.xml +++ b/pulsar-client-1x-base/pulsar-client-2x-shaded/pom.xml @@ -48,7 +48,7 @@ maven-shade-plugin - package + ${shadePluginPhase} shade diff --git a/pulsar-client-admin-shaded/pom.xml b/pulsar-client-admin-shaded/pom.xml index 57875e6609918..43a77e4ca1e2d 100644 --- a/pulsar-client-admin-shaded/pom.xml +++ b/pulsar-client-admin-shaded/pom.xml @@ -101,7 +101,7 @@ maven-shade-plugin - package + ${shadePluginPhase} shade diff --git a/pulsar-client-all/pom.xml b/pulsar-client-all/pom.xml index 3938227814cc7..a55d44f307e6d 100644 --- a/pulsar-client-all/pom.xml +++ b/pulsar-client-all/pom.xml @@ -117,7 +117,7 @@ maven-shade-plugin - package + ${shadePluginPhase} shade diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml index 8dc11764f4ef5..e865d16d33a53 100644 --- a/pulsar-client-shaded/pom.xml +++ b/pulsar-client-shaded/pom.xml @@ -112,7 +112,7 @@ maven-shade-plugin - package + ${shadePluginPhase} shade diff --git a/pulsar-functions/localrun-shaded/pom.xml b/pulsar-functions/localrun-shaded/pom.xml index 8ffe431a378e7..7b9c5da1c68b8 100644 --- a/pulsar-functions/localrun-shaded/pom.xml +++ b/pulsar-functions/localrun-shaded/pom.xml @@ -96,7 +96,7 @@ maven-shade-plugin - package + ${shadePluginPhase} shade diff --git a/pulsar-sql/presto-distribution/pom.xml b/pulsar-sql/presto-distribution/pom.xml index 2ad477dc9077e..745a345081a19 100644 --- a/pulsar-sql/presto-distribution/pom.xml +++ b/pulsar-sql/presto-distribution/pom.xml @@ -130,14 +130,6 @@ properties - - ${project.groupId} - pulsar-presto-connector - ${project.version} - tar.gz - provided - - org.objenesis objenesis @@ -268,6 +260,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + + ${skipBuildDistribution} + + + org.apache.maven.plugins maven-assembly-plugin @@ -338,4 +338,25 @@ + + + + skipBuildDistributionDisabled + + + skipBuildDistribution + false + + + + + ${project.groupId} + pulsar-presto-connector + ${project.version} + tar.gz + provided + + + + diff --git a/pulsar-sql/presto-pulsar/pom.xml b/pulsar-sql/presto-pulsar/pom.xml index 12607873c47cb..cb156cdd3f041 100644 --- a/pulsar-sql/presto-pulsar/pom.xml +++ b/pulsar-sql/presto-pulsar/pom.xml @@ -159,7 +159,7 @@ maven-shade-plugin - package + ${shadePluginPhase} shade diff --git a/tests/docker-images/java-test-functions/pom.xml b/tests/docker-images/java-test-functions/pom.xml index 3dee6a755c04b..58dddff46c3a0 100644 --- a/tests/docker-images/java-test-functions/pom.xml +++ b/tests/docker-images/java-test-functions/pom.xml @@ -61,7 +61,7 @@ maven-shade-plugin - package + ${shadePluginPhase} shade