diff --git a/dinky-app/dinky-app-1.14/pom.xml b/dinky-app/dinky-app-1.14/pom.xml index 7203f9783d..09679c952b 100644 --- a/dinky-app/dinky-app-1.14/pom.xml +++ b/dinky-app/dinky-app-1.14/pom.xml @@ -64,25 +64,56 @@ org.apache.maven.plugins - maven-assembly-plugin - 2.6 + maven-shade-plugin - - jar-with-dependencies - - - - - org.dinky.app.MainApp - - + ${project.build.finalName}-jar-with-dependencies ${project.parent.parent.basedir}/build/extends + true + false + + + org.dinky:* + + org/dinky/** + org/apache/flink/** + org/apache/calcite/** + META-INF/** + + + + *:* + + tpch/** + tpcds/** + support/** + springfox/** + org/slf4j/** + org/springframework/** + javax/** + javassist/** + Class50/** + lombok/** + freemarker/** + META-INF/resources/** + META-INF/spring/** + META-INF/services/javax** + META-INF/services/lombok** + META-INF/services/org.apache.logging** + + + + + + + + org.dinky.app.MainApp + + - make-assembly - single + shade package diff --git a/dinky-app/dinky-app-1.15/pom.xml b/dinky-app/dinky-app-1.15/pom.xml index 948bc7e8b2..f20db97a70 100644 --- a/dinky-app/dinky-app-1.15/pom.xml +++ b/dinky-app/dinky-app-1.15/pom.xml @@ -74,6 +74,8 @@ org.dinky:* org/dinky/** + org/apache/flink/** + org/apache/calcite/** META-INF/** @@ -91,8 +93,11 @@ Class50/** lombok/** freemarker/** - com.sun/** META-INF/resources/** + META-INF/spring/** + META-INF/services/javax** + META-INF/services/lombok** + META-INF/services/org.apache.logging** diff --git a/dinky-app/dinky-app-1.16/pom.xml b/dinky-app/dinky-app-1.16/pom.xml index 6be6856c88..b66832fc87 100644 --- a/dinky-app/dinky-app-1.16/pom.xml +++ b/dinky-app/dinky-app-1.16/pom.xml @@ -58,6 +58,8 @@ org.dinky:* org/dinky/** + org/apache/flink/** + org/apache/calcite/** META-INF/** @@ -75,8 +77,11 @@ Class50/** lombok/** freemarker/** - com.sun/** META-INF/resources/** + META-INF/spring/** + META-INF/services/javax** + META-INF/services/lombok** + META-INF/services/org.apache.logging** diff --git a/dinky-app/dinky-app-1.17/pom.xml b/dinky-app/dinky-app-1.17/pom.xml index 391ef7abb3..ddaf4d3a24 100644 --- a/dinky-app/dinky-app-1.17/pom.xml +++ b/dinky-app/dinky-app-1.17/pom.xml @@ -58,6 +58,8 @@ org.dinky:* org/dinky/** + org/apache/flink/** + org/apache/calcite/** META-INF/** @@ -75,8 +77,11 @@ Class50/** lombok/** freemarker/** - com.sun/** META-INF/resources/** + META-INF/spring/** + META-INF/services/javax** + META-INF/services/lombok** + META-INF/services/org.apache.logging** diff --git a/dinky-app/dinky-app-1.18/pom.xml b/dinky-app/dinky-app-1.18/pom.xml index c24aa73f87..2516336720 100644 --- a/dinky-app/dinky-app-1.18/pom.xml +++ b/dinky-app/dinky-app-1.18/pom.xml @@ -58,6 +58,8 @@ org.dinky:* org/dinky/** + org/apache/flink/** + org/apache/calcite/** META-INF/** @@ -75,8 +77,11 @@ Class50/** lombok/** freemarker/** - com.sun/** META-INF/resources/** + META-INF/spring/** + META-INF/services/javax** + META-INF/services/lombok** + META-INF/services/org.apache.logging** diff --git a/dinky-app/dinky-app-1.19/pom.xml b/dinky-app/dinky-app-1.19/pom.xml index 248fba0f5d..cf75c56bd9 100644 --- a/dinky-app/dinky-app-1.19/pom.xml +++ b/dinky-app/dinky-app-1.19/pom.xml @@ -58,6 +58,8 @@ org.dinky:* org/dinky/** + org/apache/flink/** + org/apache/calcite/** META-INF/** @@ -75,8 +77,11 @@ Class50/** lombok/** freemarker/** - com.sun/** META-INF/resources/** + META-INF/spring/** + META-INF/services/javax** + META-INF/services/lombok** + META-INF/services/org.apache.logging** diff --git a/dinky-app/dinky-app-1.20/pom.xml b/dinky-app/dinky-app-1.20/pom.xml index 0de8c5ad21..a9dd099378 100644 --- a/dinky-app/dinky-app-1.20/pom.xml +++ b/dinky-app/dinky-app-1.20/pom.xml @@ -58,6 +58,8 @@ org.dinky:* org/dinky/** + org/apache/flink/** + org/apache/calcite/** META-INF/** @@ -75,8 +77,11 @@ Class50/** lombok/** freemarker/** - com.sun/** META-INF/resources/** + META-INF/spring/** + META-INF/services/javax** + META-INF/services/lombok** + META-INF/services/org.apache.logging**