From 30b80c70eb00edcff13f4b789b90951b3f68d004 Mon Sep 17 00:00:00 2001 From: Jungtaek Lim Date: Mon, 19 Dec 2016 07:24:08 +0900 Subject: [PATCH] STORM-2244 Some shaded jars doesn't exclude dependency signature files * Add filter option to all of shade plugin configurations --- examples/storm-elasticsearch-examples/pom.xml | 17 ++++++++++++++++ examples/storm-hbase-examples/pom.xml | 17 ++++++++++++++++ examples/storm-hdfs-examples/pom.xml | 17 ++++++++++++++++ examples/storm-hive-examples/pom.xml | 17 ++++++++++++++++ examples/storm-jdbc-examples/pom.xml | 17 ++++++++++++++++ examples/storm-kafka-client-examples/pom.xml | 17 ++++++++++++++++ examples/storm-kafka-examples/pom.xml | 17 ++++++++++++++++ examples/storm-mongodb-examples/pom.xml | 17 ++++++++++++++++ examples/storm-mqtt-examples/pom.xml | 17 ++++++++++++++++ examples/storm-opentsdb-examples/pom.xml | 17 ++++++++++++++++ examples/storm-redis-examples/pom.xml | 17 ++++++++++++++++ examples/storm-solr-examples/pom.xml | 17 ++++++++++++++++ examples/storm-starter/pom.xml | 17 ++++++++++++++++ external/flux/flux-core/pom.xml | 17 ++++++++++++++++ external/flux/flux-examples/pom.xml | 17 ++++++++++++++++ external/storm-eventhubs/pom.xml | 18 +++++++++++++++++ external/storm-kafka-monitor/pom.xml | 20 +++++++++++++++++++ external/storm-submit-tools/pom.xml | 17 ++++++++++++++++ storm-core/pom.xml | 15 ++++++++++++++ storm-rename-hack/pom.xml | 17 ++++++++++++++++ 20 files changed, 342 insertions(+) diff --git a/examples/storm-elasticsearch-examples/pom.xml b/examples/storm-elasticsearch-examples/pom.xml index 366660722fe..c36a4cc2282 100644 --- a/examples/storm-elasticsearch-examples/pom.xml +++ b/examples/storm-elasticsearch-examples/pom.xml @@ -62,6 +62,23 @@ maven-shade-plugin true + + + *:* + + META-INF/*.SF + META-INF/*.sf + META-INF/*.DSA + META-INF/*.dsa + META-INF/*.RSA + META-INF/*.rsa + META-INF/*.EC + META-INF/*.ec + META-INF/MSFTSIG.SF + META-INF/MSFTSIG.RSA + + + diff --git a/examples/storm-hbase-examples/pom.xml b/examples/storm-hbase-examples/pom.xml index cdee6085950..b802c0c33be 100644 --- a/examples/storm-hbase-examples/pom.xml +++ b/examples/storm-hbase-examples/pom.xml @@ -62,6 +62,23 @@ maven-shade-plugin true + + + *:* + + META-INF/*.SF + META-INF/*.sf + META-INF/*.DSA + META-INF/*.dsa + META-INF/*.RSA + META-INF/*.rsa + META-INF/*.EC + META-INF/*.ec + META-INF/MSFTSIG.SF + META-INF/MSFTSIG.RSA + + + diff --git a/examples/storm-hdfs-examples/pom.xml b/examples/storm-hdfs-examples/pom.xml index 690abbc40a3..80324b917e1 100644 --- a/examples/storm-hdfs-examples/pom.xml +++ b/examples/storm-hdfs-examples/pom.xml @@ -62,6 +62,23 @@ maven-shade-plugin true + + + *:* + + META-INF/*.SF + META-INF/*.sf + META-INF/*.DSA + META-INF/*.dsa + META-INF/*.RSA + META-INF/*.rsa + META-INF/*.EC + META-INF/*.ec + META-INF/MSFTSIG.SF + META-INF/MSFTSIG.RSA + + + diff --git a/examples/storm-hive-examples/pom.xml b/examples/storm-hive-examples/pom.xml index f9418f7c44a..d755bde28fe 100644 --- a/examples/storm-hive-examples/pom.xml +++ b/examples/storm-hive-examples/pom.xml @@ -62,6 +62,23 @@ maven-shade-plugin true + + + *:* + + META-INF/*.SF + META-INF/*.sf + META-INF/*.DSA + META-INF/*.dsa + META-INF/*.RSA + META-INF/*.rsa + META-INF/*.EC + META-INF/*.ec + META-INF/MSFTSIG.SF + META-INF/MSFTSIG.RSA + + + diff --git a/examples/storm-jdbc-examples/pom.xml b/examples/storm-jdbc-examples/pom.xml index ce1e08c40a7..7fc25829808 100644 --- a/examples/storm-jdbc-examples/pom.xml +++ b/examples/storm-jdbc-examples/pom.xml @@ -62,6 +62,23 @@ maven-shade-plugin true + + + *:* + + META-INF/*.SF + META-INF/*.sf + META-INF/*.DSA + META-INF/*.dsa + META-INF/*.RSA + META-INF/*.rsa + META-INF/*.EC + META-INF/*.ec + META-INF/MSFTSIG.SF + META-INF/MSFTSIG.RSA + + + diff --git a/examples/storm-kafka-client-examples/pom.xml b/examples/storm-kafka-client-examples/pom.xml index b024884c654..d11831389fd 100644 --- a/examples/storm-kafka-client-examples/pom.xml +++ b/examples/storm-kafka-client-examples/pom.xml @@ -110,6 +110,23 @@ maven-shade-plugin true + + + *:* + + META-INF/*.SF + META-INF/*.sf + META-INF/*.DSA + META-INF/*.dsa + META-INF/*.RSA + META-INF/*.rsa + META-INF/*.EC + META-INF/*.ec + META-INF/MSFTSIG.SF + META-INF/MSFTSIG.RSA + + + diff --git a/examples/storm-kafka-examples/pom.xml b/examples/storm-kafka-examples/pom.xml index b1c86eafb1a..067453403ab 100644 --- a/examples/storm-kafka-examples/pom.xml +++ b/examples/storm-kafka-examples/pom.xml @@ -80,6 +80,23 @@ maven-shade-plugin true + + + *:* + + META-INF/*.SF + META-INF/*.sf + META-INF/*.DSA + META-INF/*.dsa + META-INF/*.RSA + META-INF/*.rsa + META-INF/*.EC + META-INF/*.ec + META-INF/MSFTSIG.SF + META-INF/MSFTSIG.RSA + + + diff --git a/examples/storm-mongodb-examples/pom.xml b/examples/storm-mongodb-examples/pom.xml index 275c38639ee..a5a34f42b09 100644 --- a/examples/storm-mongodb-examples/pom.xml +++ b/examples/storm-mongodb-examples/pom.xml @@ -62,6 +62,23 @@ maven-shade-plugin true + + + *:* + + META-INF/*.SF + META-INF/*.sf + META-INF/*.DSA + META-INF/*.dsa + META-INF/*.RSA + META-INF/*.rsa + META-INF/*.EC + META-INF/*.ec + META-INF/MSFTSIG.SF + META-INF/MSFTSIG.RSA + + + diff --git a/examples/storm-mqtt-examples/pom.xml b/examples/storm-mqtt-examples/pom.xml index dd04cf334cc..b5cc8de7f38 100644 --- a/examples/storm-mqtt-examples/pom.xml +++ b/examples/storm-mqtt-examples/pom.xml @@ -101,6 +101,23 @@ 1.4 true + + + *:* + + META-INF/*.SF + META-INF/*.sf + META-INF/*.DSA + META-INF/*.dsa + META-INF/*.RSA + META-INF/*.rsa + META-INF/*.EC + META-INF/*.ec + META-INF/MSFTSIG.SF + META-INF/MSFTSIG.RSA + + + diff --git a/examples/storm-opentsdb-examples/pom.xml b/examples/storm-opentsdb-examples/pom.xml index 5ffca52fb58..a87eb078f2d 100644 --- a/examples/storm-opentsdb-examples/pom.xml +++ b/examples/storm-opentsdb-examples/pom.xml @@ -62,6 +62,23 @@ maven-shade-plugin true + + + *:* + + META-INF/*.SF + META-INF/*.sf + META-INF/*.DSA + META-INF/*.dsa + META-INF/*.RSA + META-INF/*.rsa + META-INF/*.EC + META-INF/*.ec + META-INF/MSFTSIG.SF + META-INF/MSFTSIG.RSA + + + diff --git a/examples/storm-redis-examples/pom.xml b/examples/storm-redis-examples/pom.xml index 4192b671fb2..938f9031cde 100644 --- a/examples/storm-redis-examples/pom.xml +++ b/examples/storm-redis-examples/pom.xml @@ -62,6 +62,23 @@ maven-shade-plugin true + + + *:* + + META-INF/*.SF + META-INF/*.sf + META-INF/*.DSA + META-INF/*.dsa + META-INF/*.RSA + META-INF/*.rsa + META-INF/*.EC + META-INF/*.ec + META-INF/MSFTSIG.SF + META-INF/MSFTSIG.RSA + + + diff --git a/examples/storm-solr-examples/pom.xml b/examples/storm-solr-examples/pom.xml index 786321941c8..5a90de488bd 100644 --- a/examples/storm-solr-examples/pom.xml +++ b/examples/storm-solr-examples/pom.xml @@ -62,6 +62,23 @@ maven-shade-plugin true + + + *:* + + META-INF/*.SF + META-INF/*.sf + META-INF/*.DSA + META-INF/*.dsa + META-INF/*.RSA + META-INF/*.rsa + META-INF/*.EC + META-INF/*.ec + META-INF/MSFTSIG.SF + META-INF/MSFTSIG.RSA + + + diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml index 5e981e493d8..910727090a1 100644 --- a/examples/storm-starter/pom.xml +++ b/examples/storm-starter/pom.xml @@ -156,6 +156,23 @@ maven-shade-plugin true + + + *:* + + META-INF/*.SF + META-INF/*.sf + META-INF/*.DSA + META-INF/*.dsa + META-INF/*.RSA + META-INF/*.rsa + META-INF/*.EC + META-INF/*.ec + META-INF/MSFTSIG.SF + META-INF/MSFTSIG.RSA + + + diff --git a/external/flux/flux-core/pom.xml b/external/flux/flux-core/pom.xml index 48e31eb6203..52d25ad1294 100644 --- a/external/flux/flux-core/pom.xml +++ b/external/flux/flux-core/pom.xml @@ -72,6 +72,23 @@ maven-shade-plugin true + + + *:* + + META-INF/*.SF + META-INF/*.sf + META-INF/*.DSA + META-INF/*.dsa + META-INF/*.RSA + META-INF/*.rsa + META-INF/*.EC + META-INF/*.ec + META-INF/MSFTSIG.SF + META-INF/MSFTSIG.RSA + + + diff --git a/external/flux/flux-examples/pom.xml b/external/flux/flux-examples/pom.xml index dc81cf98bf0..adfc6051f21 100644 --- a/external/flux/flux-examples/pom.xml +++ b/external/flux/flux-examples/pom.xml @@ -106,6 +106,23 @@ maven-shade-plugin true + + + *:* + + META-INF/*.SF + META-INF/*.sf + META-INF/*.DSA + META-INF/*.dsa + META-INF/*.RSA + META-INF/*.rsa + META-INF/*.EC + META-INF/*.ec + META-INF/MSFTSIG.SF + META-INF/MSFTSIG.RSA + + + diff --git a/external/storm-eventhubs/pom.xml b/external/storm-eventhubs/pom.xml index 50ad00c1918..38e368dc6cb 100755 --- a/external/storm-eventhubs/pom.xml +++ b/external/storm-eventhubs/pom.xml @@ -50,6 +50,24 @@ target/${project.artifactId}-${project.version}-jar-with-dependencies.jar + true + + + *:* + + META-INF/*.SF + META-INF/*.sf + META-INF/*.DSA + META-INF/*.dsa + META-INF/*.RSA + META-INF/*.rsa + META-INF/*.EC + META-INF/*.ec + META-INF/MSFTSIG.SF + META-INF/MSFTSIG.RSA + + + diff --git a/external/storm-kafka-monitor/pom.xml b/external/storm-kafka-monitor/pom.xml index 58b4aca764d..cd2ec6f3c44 100644 --- a/external/storm-kafka-monitor/pom.xml +++ b/external/storm-kafka-monitor/pom.xml @@ -81,6 +81,26 @@ org.apache.maven.plugins maven-shade-plugin + + true + + + *:* + + META-INF/*.SF + META-INF/*.sf + META-INF/*.DSA + META-INF/*.dsa + META-INF/*.RSA + META-INF/*.rsa + META-INF/*.EC + META-INF/*.ec + META-INF/MSFTSIG.SF + META-INF/MSFTSIG.RSA + + + + package diff --git a/external/storm-submit-tools/pom.xml b/external/storm-submit-tools/pom.xml index 6e21d23202b..b45d577d886 100644 --- a/external/storm-submit-tools/pom.xml +++ b/external/storm-submit-tools/pom.xml @@ -178,6 +178,23 @@ false true + + + *:* + + META-INF/*.SF + META-INF/*.sf + META-INF/*.DSA + META-INF/*.dsa + META-INF/*.RSA + META-INF/*.rsa + META-INF/*.EC + META-INF/*.ec + META-INF/MSFTSIG.SF + META-INF/MSFTSIG.RSA + + + diff --git a/storm-core/pom.xml b/storm-core/pom.xml index b05fd35c841..32ac66348ee 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -830,6 +830,21 @@ META-INF/NOTICE.txt + + *:* + + META-INF/*.SF + META-INF/*.sf + META-INF/*.DSA + META-INF/*.dsa + META-INF/*.RSA + META-INF/*.rsa + META-INF/*.EC + META-INF/*.ec + META-INF/MSFTSIG.SF + META-INF/MSFTSIG.RSA + + diff --git a/storm-rename-hack/pom.xml b/storm-rename-hack/pom.xml index da46bb3b1bd..8ea3c6f9495 100644 --- a/storm-rename-hack/pom.xml +++ b/storm-rename-hack/pom.xml @@ -83,6 +83,23 @@ org.apache.storm.hack.shade.org.objectweb.asm + + + *:* + + META-INF/*.SF + META-INF/*.sf + META-INF/*.DSA + META-INF/*.dsa + META-INF/*.RSA + META-INF/*.rsa + META-INF/*.EC + META-INF/*.ec + META-INF/MSFTSIG.SF + META-INF/MSFTSIG.RSA + + +