Skip to content

Commit

Permalink
[hotfix] [build] Small improvements to the flink-mesos build
Browse files Browse the repository at this point in the history
  - The newer akka versions have no protobuf dependency and need no exclusion any more
  - The transitive dependency promotion is ineffective here, disabling it makes
    it more robust against accidentally pulling in more dependencies in the future
  - Properly specifying the shaded dependencies is safer
  • Loading branch information
StephanEwen committed Oct 15, 2017
1 parent 5ff7a0b commit 9498f4f
Showing 1 changed file with 3 additions and 13 deletions.
16 changes: 3 additions & 13 deletions flink-mesos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,6 @@ under the License.
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-remote_${scala.binary.version}</artifactId>
<scope>provided</scope>
<exclusions>
<!-- exclude the lower/wrong version of Protobuf here -->
<exclusion>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -269,9 +262,7 @@ under the License.
</configuration>
</plugin>

<!-- Relocate Mesos Protobuf dependency. Mesos 1.0.1 requires Protobuf 2.6.1 whereas
Flakka pulls in Protobuf 2.5.0. It might be feasible to set Protobuf to version 2.6.1,
but we shade to be on the safe side. -->
<!-- Relocate Mesos Protobuf dependency. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand All @@ -283,11 +274,10 @@ under the License.
<goal>shade</goal>
</goals>
<configuration>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<artifactSet>
<includes combine.children="append">
<include>com.google.protobuf:*</include>
<include>org.apache.mesos:*</include>
<include>com.google.protobuf:protobuf-java</include>
<include>org.apache.mesos:mesos</include>
</includes>
</artifactSet>
<relocations combine.children="append">
Expand Down

0 comments on commit 9498f4f

Please sign in to comment.