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 2016/12/20 16:49:11 UTC
[06/10] flink git commit: [FLINK-4861] [build] Make sure 'opt'
artifacts are not in the 'flink-dist' uber jar
[FLINK-4861] [build] Make sure 'opt' artifacts are not in the 'flink-dist' uber jar
This also removes gelly-examples from 'opt' assembly
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/862e347a
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/862e347a
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/862e347a
Branch: refs/heads/master
Commit: 862e347a8db37eab979b908969730c8eeb1dab2e
Parents: 5c76baa
Author: Stephan Ewen <se...@apache.org>
Authored: Mon Dec 19 21:50:31 2016 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Tue Dec 20 17:01:43 2016 +0100
----------------------------------------------------------------------
flink-dist/pom.xml | 22 ++++++++++++++++++++--
flink-dist/src/main/assemblies/opt.xml | 7 -------
2 files changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/862e347a/flink-dist/pom.xml
----------------------------------------------------------------------
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 6e9edf1..1af0775 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -155,31 +155,39 @@ under the License.
<scope>compile</scope>
</dependency>
- <!-- the following dependencies are packaged in opt/ -->
+ <!--
+ The following dependencies are packaged in 'opt/'
+ The scope of these dependencies needs to be 'provided' so that
+ they are not included into the 'flink-dist' uber jar.
+ -->
<!-- start optional Flink metrics reporters -->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-metrics-dropwizard</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-metrics-ganglia</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-metrics-graphite</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-metrics-statsd</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<!-- end optional Flink metrics reporters -->
@@ -188,36 +196,42 @@ under the License.
<groupId>org.apache.flink</groupId>
<artifactId>flink-cep_2.10</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-cep-scala_2.10</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-gelly_2.10</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-gelly-scala_2.10</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-gelly-examples_2.10</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-ml_2.10</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<!-- end optional Flink libraries -->
</dependencies>
@@ -277,6 +291,8 @@ under the License.
<build>
<plugins>
+
+ <!-- binary compatibility checks -->
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
@@ -284,8 +300,9 @@ under the License.
<skip>true</skip>
</configuration>
</plugin>
+
+ <!--Build uber jar-->
<plugin>
- <!--Build uber jar-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
@@ -375,6 +392,7 @@ under the License.
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/flink/blob/862e347a/flink-dist/src/main/assemblies/opt.xml
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/assemblies/opt.xml b/flink-dist/src/main/assemblies/opt.xml
index c6dc307..3622ece 100644
--- a/flink-dist/src/main/assemblies/opt.xml
+++ b/flink-dist/src/main/assemblies/opt.xml
@@ -53,13 +53,6 @@
</file>
<file>
- <source>../flink-libraries/flink-gelly-examples/target/flink-gelly-examples_2.10-${project.version}.jar</source>
- <outputDirectory>opt/</outputDirectory>
- <destName>flink-gelly-examples_2.10-${project.version}.jar</destName>
- <fileMode>0644</fileMode>
- </file>
-
- <file>
<source>../flink-libraries/flink-gelly-scala/target/flink-gelly-scala_2.10-${project.version}-jar-with-dependencies.jar</source>
<outputDirectory>opt/</outputDirectory>
<destName>flink-gelly-scala_2.10-${project.version}.jar</destName>