Skip to content

Commit

Permalink
[FLINK-6546] [build] Fix dependencies of flink-mesos
Browse files Browse the repository at this point in the history
  - 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
  • Loading branch information
StephanEwen authored and rmetzger committed May 15, 2017
1 parent 6fdec89 commit 63bbb4f
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 18 deletions.
41 changes: 28 additions & 13 deletions flink-mesos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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 -->
Expand Down
6 changes: 3 additions & 3 deletions flink-mesos/src/test/resources/log4j-test.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

2 changes: 0 additions & 2 deletions flink-runtime-web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,12 @@ under the License.
<version>4.0.27.Final</version>
</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>
Expand Down

0 comments on commit 63bbb4f

Please sign in to comment.