You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by rm...@apache.org on 2017/05/15 09:31:53 UTC
[3/5] flink git commit: [FLINK-6546] [build] Fix dependencies of
flink-mesos
[FLINK-6546] [build] Fix dependencies of flink-mesos
- This makes all flink-related dependencies 'provided' to not have the
transitive dependencies promoted
- Drops the unnecessary dependency on the Hadoop artifact
- Adds directly referenced libraries, like jackson
- Deactivates default logging of tests
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/63bbb4f5
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/63bbb4f5
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/63bbb4f5
Branch: refs/heads/master
Commit: 63bbb4f533a0f11376834d584308e90b6b8b5f10
Parents: 6fdec89
Author: Stephan Ewen <se...@apache.org>
Authored: Thu May 11 15:12:50 2017 +0200
Committer: Robert Metzger <rm...@apache.org>
Committed: Mon May 15 11:29:12 2017 +0200
----------------------------------------------------------------------
flink-mesos/pom.xml | 41 +++++++++++++-------
.../src/test/resources/log4j-test.properties | 6 +--
flink-runtime-web/pom.xml | 2 -
pom.xml | 6 +++
4 files changed, 37 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/63bbb4f5/flink-mesos/pom.xml
----------------------------------------------------------------------
diff --git a/flink-mesos/pom.xml b/flink-mesos/pom.xml
index a1ef900..4dae731 100644
--- a/flink-mesos/pom.xml
+++ b/flink-mesos/pom.xml
@@ -30,46 +30,49 @@ under the License.
<artifactId>flink-mesos_${scala.binary.version}</artifactId>
<name>flink-mesos</name>
<packaging>jar</packaging>
-
- <properties>
- <mesos.version>1.0.1</mesos.version>
- </properties>
- <dependencies>
+ <properties>
+ <mesos.version>1.0.1</mesos.version>
+ </properties>
+
+ <dependencies>
+
+ <!-- set all Flink dependencies to provided, so they and their transitive -->
+ <!-- dependencies do not get promoted to direct dependencies during shading -->
+
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-runtime_${scala.binary.version}</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients_${scala.binary.version}</artifactId>
<version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-hadoop2</artifactId>
- <version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-curator-recipes</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.data-artisans</groupId>
<artifactId>flakka-actor_${scala.binary.version}</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.data-artisans</groupId>
<artifactId>flakka-remote_${scala.binary.version}</artifactId>
+ <scope>provided</scope>
<exclusions>
- <!-- exclude protobuf here to allow the mesos library to provide it -->
+ <!-- exclude the lower/wrong version of Protobuf here -->
<exclusion>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
@@ -80,8 +83,11 @@ under the License.
<dependency>
<groupId>com.data-artisans</groupId>
<artifactId>flakka-slf4j_${scala.binary.version}</artifactId>
+ <scope>provided</scope>
</dependency>
+ <!-- Mesos and Mesos Resource Manager dependencies -->
+
<dependency>
<groupId>org.apache.mesos</groupId>
<artifactId>mesos</artifactId>
@@ -104,7 +110,16 @@ under the License.
<dependency>
<groupId>tv.cntt</groupId>
<artifactId>netty-router</artifactId>
- <version>1.10</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
<!-- test dependencies -->
http://git-wip-us.apache.org/repos/asf/flink/blob/63bbb4f5/flink-mesos/src/test/resources/log4j-test.properties
----------------------------------------------------------------------
diff --git a/flink-mesos/src/test/resources/log4j-test.properties b/flink-mesos/src/test/resources/log4j-test.properties
index 3476c19..b85f2f2 100644
--- a/flink-mesos/src/test/resources/log4j-test.properties
+++ b/flink-mesos/src/test/resources/log4j-test.properties
@@ -16,7 +16,7 @@
# limitations under the License.
################################################################################
-log4j.rootLogger=INFO, console
+log4j.rootLogger=OFF, console
# Log all infos in the given file
log4j.appender.console=org.apache.log4j.ConsoleAppender
@@ -27,6 +27,6 @@ log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x -
log4j.logger.org.jboss.netty.channel.DefaultChannelPipeline=ERROR, console
# log whats going on between the tests
-log4j.logger.org.apache.flink.runtime.leaderelection=INFO
-log4j.logger.org.apache.flink.runtime.leaderretrieval=INFO
+log4j.logger.org.apache.flink.runtime.leaderelection=OFF
+log4j.logger.org.apache.flink.runtime.leaderretrieval=OFF
http://git-wip-us.apache.org/repos/asf/flink/blob/63bbb4f5/flink-runtime-web/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime-web/pom.xml b/flink-runtime-web/pom.xml
index 8a4671b..ef1580d 100644
--- a/flink-runtime-web/pom.xml
+++ b/flink-runtime-web/pom.xml
@@ -58,13 +58,11 @@ under the License.
<dependency>
<groupId>tv.cntt</groupId>
<artifactId>netty-router</artifactId>
- <version>1.10</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.18.2-GA</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/63bbb4f5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index db19b9d..a8377e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -441,6 +441,12 @@ under the License.
</dependency>
<dependency>
+ <groupId>tv.cntt</groupId>
+ <artifactId>netty-router</artifactId>
+ <version>1.10</version>
+ </dependency>
+
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>