From 2f347a039b1d8e10836ca1e2a2ece9b5e3734035 Mon Sep 17 00:00:00 2001
From: Robert Metzger <rmetzger@apache.org>
Date: Mon, 18 May 2015 16:30:10 +0200
Subject: [PATCH] [FLINK-2037] Provide flink-python.jar in lib/

This closes #691
---
 flink-dist/pom.xml                            |  1 +
 flink-dist/src/main/assemblies/bin.xml        | 16 ++++++++++++++++
 flink-dist/src/main/flink-bin/bin/pyflink2.sh |  2 +-
 flink-dist/src/main/flink-bin/bin/pyflink3.sh |  3 ++-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index ae9e8c91ab3..e4ee165eab4 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -314,6 +314,7 @@ under the License.
 									<exclude>org.apache.flink:flink-java-examples</exclude>
 									<exclude>org.apache.flink:flink-scala-examples</exclude>
 									<exclude>org.apache.flink:flink-streaming-examples</exclude>
+									<exclude>org.apache.flink:flink-python</exclude>
 								</excludes>
 							</artifactSet>
 							<transformers>
diff --git a/flink-dist/src/main/assemblies/bin.xml b/flink-dist/src/main/assemblies/bin.xml
index 802799c8ffe..758e20bc906 100644
--- a/flink-dist/src/main/assemblies/bin.xml
+++ b/flink-dist/src/main/assemblies/bin.xml
@@ -28,6 +28,22 @@ under the License.
 	<includeBaseDirectory>true</includeBaseDirectory>
 	<baseDirectory>flink-${project.version}</baseDirectory>
 
+	<!-- Include flink-python.jar in lib/ -->
+	<dependencySets>
+		<dependencySet>
+			<outputDirectory>lib</outputDirectory>
+			<unpack>false</unpack>
+			<useTransitiveDependencies>true</useTransitiveDependencies>
+			<useProjectArtifact>false</useProjectArtifact>
+			<useProjectAttachments>false</useProjectAttachments>
+			<useTransitiveFiltering>true</useTransitiveFiltering>
+
+			<includes>
+				<include>org.apache.flink:flink-python</include>
+			</includes>
+		</dependencySet>
+	</dependencySets>
+
 	<files>
 		<!-- copy fat jar -->
 		<file>
diff --git a/flink-dist/src/main/flink-bin/bin/pyflink2.sh b/flink-dist/src/main/flink-bin/bin/pyflink2.sh
index 33c175d24f4..8a326e9bc44 100644
--- a/flink-dist/src/main/flink-bin/bin/pyflink2.sh
+++ b/flink-dist/src/main/flink-bin/bin/pyflink2.sh
@@ -22,4 +22,4 @@ bin=`cd "$bin"; pwd`
 
 . "$bin"/config.sh
 
-"$FLINK_BIN_DIR"/flink run -v "$FLINK_ROOT_DIR"/lib/flink-python-0.9-SNAPSHOT.jar "2" "$@"
+"$FLINK_BIN_DIR"/flink run -v "$FLINK_ROOT_DIR"/lib/flink-python*.jar "2" "$@"
diff --git a/flink-dist/src/main/flink-bin/bin/pyflink3.sh b/flink-dist/src/main/flink-bin/bin/pyflink3.sh
index 4ebe7327f9e..d2d19915df7 100644
--- a/flink-dist/src/main/flink-bin/bin/pyflink3.sh
+++ b/flink-dist/src/main/flink-bin/bin/pyflink3.sh
@@ -22,4 +22,5 @@ bin=`cd "$bin"; pwd`
 
 . "$bin"/config.sh
 
-"$FLINK_BIN_DIR"/flink run -v "$FLINK_ROOT_DIR"/lib/flink-python-0.9-SNAPSHOT.jar "3" "$@"
+
+"$FLINK_BIN_DIR"/flink run -v "$FLINK_ROOT_DIR"/lib/flink-python*.jar "3" "$@"
-- 
GitLab