Skip to content

Commit

Permalink
[FLINK-8011][dist] Set flink-python to provided
Browse files Browse the repository at this point in the history
This closes apache#4973.
  • Loading branch information
zentol committed Nov 14, 2017
1 parent 3f80f8e commit 1190067
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 8 deletions.
15 changes: 8 additions & 7 deletions flink-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,6 @@ under the License.
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-python_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-scala-shell_${scala.binary.version}</artifactId>
Expand Down Expand Up @@ -263,6 +257,14 @@ under the License.
<!-- end optional Flink metrics reporters -->

<!-- start optional Flink libraries -->

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-python_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-cep_${scala.binary.version}</artifactId>
Expand Down Expand Up @@ -485,7 +487,6 @@ under the License.
</filters>
<artifactSet>
<excludes>
<exclude>org.apache.flink:flink-python_${scala.binary.version}</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude>
<exclude>log4j:log4j</exclude>
</excludes>
Expand Down
11 changes: 10 additions & 1 deletion flink-dist/src/main/assemblies/bin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ under the License.
<useTransitiveFiltering>true</useTransitiveFiltering>

<includes>
<include>org.apache.flink:flink-python_${scala.binary.version}</include>
<include>org.slf4j:slf4j-log4j12</include>
<include>log4j:log4j</include>
</includes>
Expand Down Expand Up @@ -184,6 +183,16 @@ under the License.
</includes>
</fileSet>

<!-- copy python jar -->
<fileSet>
<directory>../flink-libraries/flink-python/target</directory>
<outputDirectory>lib</outputDirectory>
<fileMode>0644</fileMode>
<includes>
<include>flink-python_${scala.binary.version}-${project.version}.jar</include>
</includes>
</fileSet>

<!-- copy python package -->
<fileSet>
<directory>../flink-libraries/flink-python/src/main/python/org/apache/flink/python/api</directory>
Expand Down

0 comments on commit 1190067

Please sign in to comment.