You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2019/07/19 09:58:06 UTC
[flink] branch release-1.9 updated (3f33e83 -> d8f544b)
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a change to branch release-1.9
in repository https://gitbox.apache.org/repos/asf/flink.git.
from 3f33e83 [FLINK-12916][tests] Rework regex
new c16fe4c [hotfix] Add directory link-python/apache_flink.egg-info to gitignore
new d8f544b [FLINK-13308][python] Drop the classifier of the flink-python jar
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 1 +
flink-container/docker/Dockerfile | 2 +-
flink-dist/pom.xml | 1 -
flink-dist/src/main/assemblies/opt.xml | 4 ++--
flink-dist/src/main/flink-bin/bin/pyflink-gateway-server.sh | 2 +-
flink-dist/src/main/flink-bin/bin/pyflink-shell.sh | 2 +-
flink-python/pom.xml | 9 +++++----
tools/travis_controller.sh | 2 +-
8 files changed, 12 insertions(+), 11 deletions(-)
[flink] 01/02: [hotfix] Add directory
link-python/apache_flink.egg-info to gitignore
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch release-1.9
in repository https://gitbox.apache.org/repos/asf/flink.git
commit c16fe4c5f7309903418f0c0a0ac7352df86655a7
Author: Dian Fu <fu...@alibaba-inc.com>
AuthorDate: Wed Jul 17 20:45:39 2019 +0800
[hotfix] Add directory link-python/apache_flink.egg-info to gitignore
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 22fac14..88c4488 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ flink-runtime-web/web-dashboard/web/
flink-python/dist/
flink-python/build/
flink-python/pyflink.egg-info/
+flink-python/apache_flink.egg-info/
flink-python/docs/_build
flink-python/.tox/
flink-python/dev/download
[flink] 02/02: [FLINK-13308][python] Drop the classifier of the
flink-python jar
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch release-1.9
in repository https://gitbox.apache.org/repos/asf/flink.git
commit d8f544ba7fe6d9a7b784b285967d20a2edfc6d94
Author: Dian Fu <fu...@alibaba-inc.com>
AuthorDate: Wed Jul 17 21:39:06 2019 +0800
[FLINK-13308][python] Drop the classifier of the flink-python jar
---
flink-container/docker/Dockerfile | 2 +-
flink-dist/pom.xml | 1 -
flink-dist/src/main/assemblies/opt.xml | 4 ++--
flink-dist/src/main/flink-bin/bin/pyflink-gateway-server.sh | 2 +-
flink-dist/src/main/flink-bin/bin/pyflink-shell.sh | 2 +-
flink-python/pom.xml | 9 +++++----
tools/travis_controller.sh | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/flink-container/docker/Dockerfile b/flink-container/docker/Dockerfile
index 129b5c5..a68835e 100644
--- a/flink-container/docker/Dockerfile
+++ b/flink-container/docker/Dockerfile
@@ -52,7 +52,7 @@ ADD $job_artifacts/* $FLINK_JOB_ARTIFACTS_DIR/
RUN set -x && \
ln -s $FLINK_INSTALL_PATH/flink-[0-9]* $FLINK_HOME && \
for jar in $FLINK_JOB_ARTIFACTS_DIR/*.jar; do [ -f "$jar" ] || continue; ln -s $jar $FLINK_LIB_DIR; done && \
- if [ -n "$python_version" ]; then ln -s $FLINK_OPT_DIR/flink-python-*-java-binding.jar $FLINK_LIB_DIR; fi && \
+ if [ -n "$python_version" ]; then ln -s $FLINK_OPT_DIR/flink-python*.jar $FLINK_LIB_DIR; fi && \
if [ -f ${FLINK_INSTALL_PATH}/flink-shaded-hadoop* ]; then ln -s ${FLINK_INSTALL_PATH}/flink-shaded-hadoop* $FLINK_LIB_DIR; fi && \
addgroup -S flink && adduser -D -S -H -G flink -h $FLINK_HOME flink && \
chown -R flink:flink ${FLINK_INSTALL_PATH}/flink-* && \
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index ca59ba2..f6c491b 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -351,7 +351,6 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-python_${scala.binary.version}</artifactId>
- <classifier>java-binding</classifier>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/flink-dist/src/main/assemblies/opt.xml b/flink-dist/src/main/assemblies/opt.xml
index ac8bd85..1c2444e 100644
--- a/flink-dist/src/main/assemblies/opt.xml
+++ b/flink-dist/src/main/assemblies/opt.xml
@@ -163,9 +163,9 @@
<!-- Python -->
<file>
- <source>../flink-python/target/flink-python_${scala.binary.version}-${project.version}-java-binding.jar</source>
+ <source>../flink-python/target/flink-python_${scala.binary.version}-${project.version}.jar</source>
<outputDirectory>opt</outputDirectory>
- <destName>flink-python-${project.version}-java-binding.jar</destName>
+ <destName>flink-python_${scala.binary.version}-${project.version}.jar</destName>
<fileMode>0644</fileMode>
</file>
</files>
diff --git a/flink-dist/src/main/flink-bin/bin/pyflink-gateway-server.sh b/flink-dist/src/main/flink-bin/bin/pyflink-gateway-server.sh
index 49cdaf0..ce79f1a 100644
--- a/flink-dist/src/main/flink-bin/bin/pyflink-gateway-server.sh
+++ b/flink-dist/src/main/flink-bin/bin/pyflink-gateway-server.sh
@@ -51,7 +51,7 @@ log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-python-$HOSTNAME.log
log_setting=(-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j-cli.properties -Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback.xml)
TABLE_JAR_PATH=`echo "$FLINK_HOME"/opt/flink-table*.jar`
-PYTHON_JAR_PATH=`echo "$FLINK_HOME"/opt/flink-python*java-binding.jar`
+PYTHON_JAR_PATH=`echo "$FLINK_HOME"/opt/flink-python*.jar`
FLINK_TEST_CLASSPATH=""
if [[ -n "$FLINK_TESTING" ]]; then
diff --git a/flink-dist/src/main/flink-bin/bin/pyflink-shell.sh b/flink-dist/src/main/flink-bin/bin/pyflink-shell.sh
index 6bbc942..2c83cc7 100755
--- a/flink-dist/src/main/flink-bin/bin/pyflink-shell.sh
+++ b/flink-dist/src/main/flink-bin/bin/pyflink-shell.sh
@@ -25,7 +25,7 @@ _FLINK_HOME_DETERMINED=1
. "$FLINK_HOME"/bin/config.sh
FLINK_CLASSPATH=`constructFlinkClassPath`
-PYTHON_JAR_PATH=`echo "$FLINK_OPT_DIR"/flink-python*java-binding.jar`
+PYTHON_JAR_PATH=`echo "$FLINK_OPT_DIR"/flink-python*.jar`
PYFLINK_PYTHON="${PYFLINK_PYTHON:-"python"}"
diff --git a/flink-python/pom.xml b/flink-python/pom.xml
index ad4929f..b906df5 100644
--- a/flink-python/pom.xml
+++ b/flink-python/pom.xml
@@ -135,17 +135,18 @@ under the License.
<executions>
<execution>
<id>shade-flink</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
<configuration>
- <shadeTestJar>false</shadeTestJar>
- <shadedArtifactAttached>true</shadedArtifactAttached>
- <shadedClassifierName>java-binding</shadedClassifierName>
<artifactSet>
<includes combine.children="append">
<include>net.razorvine:*</include>
<include>net.sf.py4j:*</include>
</includes>
</artifactSet>
- <relocations>
+ <relocations combine.children="append">
<relocation>
<pattern>py4j</pattern>
<shadedPattern>org.apache.flink.api.python.shaded.py4j</shadedPattern>
diff --git a/tools/travis_controller.sh b/tools/travis_controller.sh
index 2649fe6..211551d 100755
--- a/tools/travis_controller.sh
+++ b/tools/travis_controller.sh
@@ -147,7 +147,7 @@ if [ $STAGE == "$STAGE_COMPILE" ]; then
! -path "$CACHE_FLINK_DIR/flink-streaming-java/target/flink-streaming-java*tests.jar" \
! -path "$CACHE_FLINK_DIR/flink-dist/target/flink-*-bin/flink-*/lib/flink-dist*.jar" \
! -path "$CACHE_FLINK_DIR/flink-dist/target/flink-*-bin/flink-*/opt/flink-table*.jar" \
- ! -path "$CACHE_FLINK_DIR/flink-dist/target/flink-*-bin/flink-*/opt/flink-python*java-binding.jar" \
+ ! -path "$CACHE_FLINK_DIR/flink-dist/target/flink-*-bin/flink-*/opt/flink-python*.jar" \
! -path "$CACHE_FLINK_DIR/flink-connectors/flink-connector-elasticsearch-base/target/flink-*.jar" \
! -path "$CACHE_FLINK_DIR/flink-connectors/flink-connector-kafka-base/target/flink-*.jar" \
! -path "$CACHE_FLINK_DIR/flink-table/flink-table-planner/target/flink-table-planner*tests.jar" | xargs rm -rf