flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmetz...@apache.org
Subject flink git commit: [FLINK-2037] Provide flink-python.jar in lib/
Date Mon, 01 Jun 2015 12:05:44 GMT
Repository: flink
Updated Branches:
  refs/heads/master 93e960d8b -> 2f347a039


[FLINK-2037] Provide flink-python.jar in lib/

This closes #691


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/2f347a03
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/2f347a03
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/2f347a03

Branch: refs/heads/master
Commit: 2f347a039b1d8e10836ca1e2a2ece9b5e3734035
Parents: 93e960d
Author: Robert Metzger <rmetzger@apache.org>
Authored: Mon May 18 16:30:10 2015 +0200
Committer: Robert Metzger <rmetzger@apache.org>
Committed: Mon Jun 1 12:32:48 2015 +0200

----------------------------------------------------------------------
 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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/2f347a03/flink-dist/pom.xml
----------------------------------------------------------------------
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index ae9e8c9..e4ee165 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>

http://git-wip-us.apache.org/repos/asf/flink/blob/2f347a03/flink-dist/src/main/assemblies/bin.xml
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/assemblies/bin.xml b/flink-dist/src/main/assemblies/bin.xml
index 802799c..758e20b 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>

http://git-wip-us.apache.org/repos/asf/flink/blob/2f347a03/flink-dist/src/main/flink-bin/bin/pyflink2.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/pyflink2.sh b/flink-dist/src/main/flink-bin/bin/pyflink2.sh
index 33c175d..8a326e9 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" "$@"

http://git-wip-us.apache.org/repos/asf/flink/blob/2f347a03/flink-dist/src/main/flink-bin/bin/pyflink3.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/pyflink3.sh b/flink-dist/src/main/flink-bin/bin/pyflink3.sh
index 4ebe732..d2d1991 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" "$@"


Mime
View raw message