You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2015/03/27 20:15:56 UTC
[2/3] flink git commit: [FLINK-1781] [quickstarts] Fix exclusions for
different Scala versions.
[FLINK-1781] [quickstarts] Fix exclusions for different Scala versions.
Also exclude more large transitive dependencies.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/1aba942c
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/1aba942c
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/1aba942c
Branch: refs/heads/master
Commit: 1aba942c1fd7c4dbf1c4d4f30602d69c2cb3540e
Parents: 9c0a453
Author: Stephan Ewen <se...@apache.org>
Authored: Thu Mar 26 18:50:59 2015 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Fri Mar 27 20:15:20 2015 +0100
----------------------------------------------------------------------
.../main/resources/archetype-resources/pom.xml | 22 ++++++++++++--------
.../main/resources/archetype-resources/pom.xml | 21 +++++++++++--------
2 files changed, 25 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/1aba942c/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
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 e40bd9c..efd2016 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
@@ -110,12 +110,14 @@ under the License.
<exclude>org.apache.flink:flink-scala</exclude>
<exclude>org.apache.flink:flink-runtime</exclude>
<exclude>org.apache.flink:flink-optimizer</exclude>
+ <exclude>org.apache.flink:flink-clients</exclude>
<exclude>org.apache.flink:flink-spargel</exclude>
<exclude>org.apache.flink:flink-avro</exclude>
<exclude>org.apache.flink:flink-java-examples</exclude>
<exclude>org.apache.flink:flink-scala-examples</exclude>
<exclude>org.apache.flink:flink-streaming-examples</exclude>
<exclude>org.apache.flink:flink-streaming-core</exclude>
+
<!-- Also exclude very big transitive dependencies of Flink
WARNING: You have to remove these excludes if your code relies on other
@@ -123,12 +125,14 @@ under the License.
-->
<exclude>org.scala-lang:scala-library</exclude>
+ <exclude>org.scala-lang:scala-compiler</exclude>
+ <exclude>org.scala-lang:scala-reflect</exclude>
<exclude>com.amazonaws:aws-java-sdk</exclude>
+ <exclude>com.typesafe.akka:akka-actor_*</exclude>
+ <exclude>com.typesafe.akka:akka-remote_*</exclude>
+ <exclude>com.typesafe.akka:akka-slf4j_*</exclude>
<exclude>io.netty:netty-all</exclude>
- <exclude>com.typesafe.akka:akka-actor_${scala.binary.version}</exclude>
- <exclude>com.typesafe.akka:akka-remote_${scala.binary.version}</exclude>
<exclude>io.netty:netty</exclude>
- <exclude>com.typesafe.akka:akka-slf4j_${scala.binary.version}</exclude>
<exclude>org.eclipse.jetty:jetty-server</exclude>
<exclude>org.eclipse.jetty:jetty-continuation</exclude>
<exclude>org.eclipse.jetty:jetty-http</exclude>
@@ -148,12 +152,12 @@ under the License.
<exclude>com.esotericsoftware.kryo:kryo</exclude>
<exclude>com.esotericsoftware.minlog:minlog</exclude>
<exclude>org.objenesis:objenesis</exclude>
- <exclude>com.twitter:chill_${scala.binary.version}</exclude>
+ <exclude>com.twitter:chill_*</exclude>
<exclude>com.twitter:chill-java</exclude>
- <exclude>com.twitter:chill-avro_${scala.binary.version}</exclude>
- <exclude>com.twitter:chill-bijection_${scala.binary.version}</exclude>
- <exclude>com.twitter:bijection-core_${scala.binary.version}</exclude>
- <exclude>com.twitter:bijection-avro_${scala.binary.version}</exclude>
+ <exclude>com.twitter:chill-avro_*</exclude>
+ <exclude>com.twitter:chill-bijection_*</exclude>
+ <exclude>com.twitter:bijection-core_*</exclude>
+ <exclude>com.twitter:bijection-avro_*</exclude>
<exclude>com.twitter:chill-protobuf</exclude>
<exclude>com.google.protobuf:protobuf-java</exclude>
<exclude>com.twitter:chill-thrift</exclude>
@@ -179,7 +183,7 @@ under the License.
<exclude>stax:stax-api</exclude>
<exclude>com.typesafe:config</exclude>
<exclude>org.uncommons.maths:uncommons-maths</exclude>
- <exclude>com.github.scopt:scopt_${scala.binary.version}</exclude>
+ <exclude>com.github.scopt:scopt_*</exclude>
<exclude>org.mortbay.jetty:servlet-api</exclude>
<exclude>commons-io:commons-io</exclude>
<exclude>commons-cli:commons-cli</exclude>
http://git-wip-us.apache.org/repos/asf/flink/blob/1aba942c/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
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 c092474..76c1688 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
@@ -114,6 +114,7 @@ under the License.
<exclude>org.apache.flink:flink-scala</exclude>
<exclude>org.apache.flink:flink-runtime</exclude>
<exclude>org.apache.flink:flink-optimizer</exclude>
+ <exclude>org.apache.flink:flink-clients</exclude>
<exclude>org.apache.flink:flink-spargel</exclude>
<exclude>org.apache.flink:flink-avro</exclude>
<exclude>org.apache.flink:flink-java-examples</exclude>
@@ -127,12 +128,14 @@ under the License.
-->
<exclude>org.scala-lang:scala-library</exclude>
+ <exclude>org.scala-lang:scala-compiler</exclude>
+ <exclude>org.scala-lang:scala-reflect</exclude>
<exclude>com.amazonaws:aws-java-sdk</exclude>
+ <exclude>com.typesafe.akka:akka-actor_*</exclude>
+ <exclude>com.typesafe.akka:akka-remote_*</exclude>
+ <exclude>com.typesafe.akka:akka-slf4j_*</exclude>
<exclude>io.netty:netty-all</exclude>
- <exclude>com.typesafe.akka:akka-actor_${scala.binary.version}</exclude>
- <exclude>com.typesafe.akka:akka-remote_${scala.binary.version}</exclude>
<exclude>io.netty:netty</exclude>
- <exclude>com.typesafe.akka:akka-slf4j_${scala.binary.version}</exclude>
<exclude>org.eclipse.jetty:jetty-server</exclude>
<exclude>org.eclipse.jetty:jetty-continuation</exclude>
<exclude>org.eclipse.jetty:jetty-http</exclude>
@@ -152,12 +155,12 @@ under the License.
<exclude>com.esotericsoftware.kryo:kryo</exclude>
<exclude>com.esotericsoftware.minlog:minlog</exclude>
<exclude>org.objenesis:objenesis</exclude>
- <exclude>com.twitter:chill_${scala.binary.version}</exclude>
+ <exclude>com.twitter:chill_*</exclude>
<exclude>com.twitter:chill-java</exclude>
- <exclude>com.twitter:chill-avro_${scala.binary.version}</exclude>
- <exclude>com.twitter:chill-bijection_${scala.binary.version}</exclude>
- <exclude>com.twitter:bijection-core_${scala.binary.version}</exclude>
- <exclude>com.twitter:bijection-avro_${scala.binary.version}</exclude>
+ <exclude>com.twitter:chill-avro_*</exclude>
+ <exclude>com.twitter:chill-bijection_*</exclude>
+ <exclude>com.twitter:bijection-core_*</exclude>
+ <exclude>com.twitter:bijection-avro_*</exclude>
<exclude>com.twitter:chill-protobuf</exclude>
<exclude>com.google.protobuf:protobuf-java</exclude>
<exclude>com.twitter:chill-thrift</exclude>
@@ -183,7 +186,7 @@ under the License.
<exclude>stax:stax-api</exclude>
<exclude>com.typesafe:config</exclude>
<exclude>org.uncommons.maths:uncommons-maths</exclude>
- <exclude>com.github.scopt:scopt_${scala.binary.version}</exclude>
+ <exclude>com.github.scopt:scopt_*</exclude>
<exclude>org.mortbay.jetty:servlet-api</exclude>
<exclude>commons-io:commons-io</exclude>
<exclude>commons-cli:commons-cli</exclude>