From 19b1b83292f74cc49f518f18dd94d81768b6ba1a Mon Sep 17 00:00:00 2001 From: zentol Date: Mon, 4 Dec 2017 13:38:17 +0100 Subject: [PATCH] [FLINK-8193][quickstart] Cleanup quickstart poms This closes #5118. --- .../resources/archetype-resources/pom.xml | 188 +++++----------- .../resources/archetype-resources/pom.xml | 206 ++++++------------ 2 files changed, 112 insertions(+), 282 deletions(-) diff --git a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml index 0299d0c4c00..b5f9f1bd4cd 100644 --- a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml +++ b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml @@ -59,38 +59,37 @@ under the License. a) Adding new dependencies: You can add dependencies to the list below. - Please check if the maven-shade-plugin below is filtering out your dependency - and remove the exclude from there. b) Build a jar for running on the cluster: - There are two options for creating a jar from this project - b.1) "mvn clean package" -> this will create a fat jar which contains all - dependencies necessary for running the jar created by this pom in a cluster. - The "maven-shade-plugin" excludes everything that is provided on a running Flink cluster. - - b.2) "mvn clean package -Pbuild-jar" -> This will also create a fat-jar, but with much - nicer dependency exclusion handling. This approach is preferred and leads to - much cleaner jar files. + "mvn clean package -Pbuild-jar" + This will create a fat-jar which contains all dependencies necessary for running the created jar in a cluster. --> org.apache.flink - flink-java + flink-core ${flink.version} org.apache.flink - flink-streaming-java_${scala.binary.version} + flink-java ${flink.version} + org.apache.flink flink-clients_${scala.binary.version} ${flink.version} + + org.apache.flink + flink-streaming-java_${scala.binary.version} + ${flink.version} + @@ -118,13 +117,13 @@ under the License. org.apache.flink - flink-java + flink-core ${flink.version} provided org.apache.flink - flink-streaming-java_${scala.binary.version} + flink-java ${flink.version} provided @@ -134,6 +133,12 @@ under the License. ${flink.version} provided + + org.apache.flink + flink-streaming-java_${scala.binary.version} + ${flink.version} + provided + org.slf4j slf4j-log4j12 @@ -150,12 +155,15 @@ under the License. - + org.apache.maven.plugins maven-shade-plugin 3.0.0 + package @@ -163,8 +171,33 @@ under the License. - + + org.apache.flink:force-shading + com.google.code.findbgs:jsr305 + org.slf4j:slf4j-api + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + @@ -176,129 +209,6 @@ under the License. - - - org.apache.maven.plugins - maven-shade-plugin - 3.0.0 - - - - package - - shade - - - - - - org.apache.flink:flink-annotations - org.apache.flink:flink-shaded-hadoop2 - org.apache.flink:flink-shaded-curator - org.apache.flink:flink-core - org.apache.flink:flink-java - org.apache.flink:flink-scala_${scala.binary.version} - org.apache.flink:flink-runtime_${scala.binary.version} - org.apache.flink:flink-optimizer_${scala.binary.version} - org.apache.flink:flink-clients_${scala.binary.version} - org.apache.flink:flink-avro - org.apache.flink:flink-examples-batch_${scala.binary.version} - org.apache.flink:flink-examples-streaming_${scala.binary.version} - org.apache.flink:flink-streaming-java_${scala.binary.version} - org.apache.flink:flink-streaming-scala_${scala.binary.version} - org.apache.flink:flink-scala-shell_${scala.binary.version} - org.apache.flink:flink-python - org.apache.flink:flink-metrics-core - org.apache.flink:flink-metrics-jmx - org.apache.flink:flink-statebackend-rocksdb_${scala.binary.version} - org.apache.flink:flink-shaded-jackson - - - - log4j:log4j - org.scala-lang:scala-library - org.scala-lang:scala-compiler - org.scala-lang:scala-reflect - com.typesafe.akka:akka-actor_* - com.typesafe.akka:akka-remote_* - com.typesafe.akka:akka-slf4j_* - io.netty:netty-all - io.netty:netty - commons-fileupload:commons-fileupload - org.apache.avro:avro - commons-collections:commons-collections - org.codehaus.jackson:jackson-core-asl - org.codehaus.jackson:jackson-mapper-asl - com.thoughtworks.paranamer:paranamer - org.xerial.snappy:snappy-java - org.apache.commons:commons-compress - org.tukaani:xz - com.esotericsoftware.kryo:kryo - com.esotericsoftware.minlog:minlog - org.objenesis:objenesis - com.twitter:chill_* - com.twitter:chill-java - commons-lang:commons-lang - junit:junit - org.apache.commons:commons-lang3 - org.slf4j:slf4j-api - org.slf4j:slf4j-log4j12 - log4j:log4j - org.apache.commons:commons-math - org.apache.sling:org.apache.sling.commons.json - commons-logging:commons-logging - commons-codec:commons-codec - stax:stax-api - com.typesafe:config - org.uncommons.maths:uncommons-maths - com.github.scopt:scopt_* - commons-io:commons-io - commons-cli:commons-cli - - - - - org.apache.flink:* - - - org/apache/flink/shaded/com/** - web-docs/** - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - false - - - - org.apache.maven.plugins diff --git a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml index d438f618160..89c297d66b2 100644 --- a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml +++ b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml @@ -49,6 +49,7 @@ under the License. @slf4j.version@ @log4j.version@ 2.11 + 2.11.11 org.apache.flink - flink-scala_${scala.binary.version} + flink-core ${flink.version} + org.apache.flink - flink-streaming-scala_${scala.binary.version} + flink-clients_${scala.binary.version} ${flink.version} org.apache.flink - flink-clients_${scala.binary.version} + flink-scala_${scala.binary.version} + ${flink.version} + + + org.apache.flink + flink-streaming-scala_${scala.binary.version} ${flink.version} + + org.scala-lang + scala-library + ${scala.version} + + @@ -117,22 +123,33 @@ under the License. org.apache.flink - flink-scala_${scala.binary.version} + flink-core + ${flink.version} + + + org.apache.flink + flink-clients_${scala.binary.version} ${flink.version} provided org.apache.flink - flink-streaming-scala_${scala.binary.version} + flink-scala_${scala.binary.version} ${flink.version} provided org.apache.flink - flink-clients_${scala.binary.version} + flink-streaming-scala_${scala.binary.version} ${flink.version} provided + + org.scala-lang + scala-library + ${scala.version} + provided + org.slf4j slf4j-log4j12 @@ -149,12 +166,15 @@ under the License. - + org.apache.maven.plugins maven-shade-plugin 3.0.0 + package @@ -162,8 +182,33 @@ under the License. - + + org.apache.flink:force-shading + com.google.code.findbgs:jsr305 + org.slf4j:slf4j-api + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + @@ -173,133 +218,8 @@ under the License. - - - - org.apache.maven.plugins - maven-shade-plugin - 3.0.0 - - - - package - - shade - - - - - - org.apache.flink:flink-annotations - org.apache.flink:flink-shaded-hadoop2 - org.apache.flink:flink-shaded-curator - org.apache.flink:flink-core - org.apache.flink:flink-java - org.apache.flink:flink-scala_${scala.binary.version} - org.apache.flink:flink-runtime_${scala.binary.version} - org.apache.flink:flink-optimizer_${scala.binary.version} - org.apache.flink:flink-clients_${scala.binary.version} - org.apache.flink:flink-avro - org.apache.flink:flink-examples-batch_${scala.binary.version} - org.apache.flink:flink-examples-streaming_${scala.binary.version} - org.apache.flink:flink-streaming-java_${scala.binary.version} - org.apache.flink:flink-streaming-scala_${scala.binary.version} - org.apache.flink:flink-scala-shell_${scala.binary.version} - org.apache.flink:flink-python - org.apache.flink:flink-metrics-core - org.apache.flink:flink-metrics-jmx - org.apache.flink:flink-statebackend-rocksdb_${scala.binary.version} - org.apache.flink:flink-shaded-jackson - - - - log4j:log4j - org.scala-lang:scala-library - org.scala-lang:scala-compiler - org.scala-lang:scala-reflect - com.typesafe.akka:akka-actor_* - com.typesafe.akka:akka-remote_* - com.typesafe.akka:akka-slf4j_* - io.netty:netty-all - io.netty:netty - commons-fileupload:commons-fileupload - org.apache.avro:avro - commons-collections:commons-collections - com.thoughtworks.paranamer:paranamer - org.xerial.snappy:snappy-java - org.apache.commons:commons-compress - org.tukaani:xz - com.esotericsoftware.kryo:kryo - com.esotericsoftware.minlog:minlog - org.objenesis:objenesis - com.twitter:chill_* - com.twitter:chill-java - commons-lang:commons-lang - junit:junit - org.apache.commons:commons-lang3 - org.slf4j:slf4j-api - org.slf4j:slf4j-log4j12 - log4j:log4j - org.apache.commons:commons-math - org.apache.sling:org.apache.sling.commons.json - commons-logging:commons-logging - commons-codec:commons-codec - stax:stax-api - com.typesafe:config - org.uncommons.maths:uncommons-maths - com.github.scopt:scopt_* - commons-io:commons-io - commons-cli:commons-cli - - - - - org.apache.flink:* - - - org/apache/flink/shaded/com/** - web-docs/** - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - false - - - - - org.apache.maven.plugins maven-compiler-plugin -- GitLab