This is an automated email from the ASF dual-hosted git repository. chesnay pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 8f51746a8c768ba61660e4693030349afab825a5 Author: Chesnay Schepler <[email protected]> AuthorDate: Tue Mar 22 11:14:02 2022 +0100 [FLINK-26842][python] Remove scala-bridge dependency --- flink-dist/pom.xml | 2 +- flink-dist/src/main/assemblies/opt.xml | 4 ++-- flink-docs/pom.xml | 2 +- flink-end-to-end-tests/flink-python-test/pom.xml | 2 +- flink-python/apache-flink-libraries/setup.py | 2 +- flink-python/pom.xml | 8 +------- flink-table/flink-sql-client/pom.xml | 2 +- 7 files changed, 8 insertions(+), 14 deletions(-) diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml index 70eda2b..61f2a51 100644 --- a/flink-dist/pom.xml +++ b/flink-dist/pom.xml @@ -446,7 +446,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-python_${scala.binary.version}</artifactId> + <artifactId>flink-python</artifactId> <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 364151b..c56ac25 100644 --- a/flink-dist/src/main/assemblies/opt.xml +++ b/flink-dist/src/main/assemblies/opt.xml @@ -119,9 +119,9 @@ <!-- Python --> <file> - <source>../flink-python/target/flink-python_${scala.binary.version}-${project.version}.jar</source> + <source>../flink-python/target/flink-python-${project.version}.jar</source> <outputDirectory>opt</outputDirectory> - <destName>flink-python_${scala.binary.version}-${project.version}.jar</destName> + <destName>flink-python-${project.version}.jar</destName> <fileMode>0644</fileMode> </file> diff --git a/flink-docs/pom.xml b/flink-docs/pom.xml index fb3f9fa..4cb4e29 100644 --- a/flink-docs/pom.xml +++ b/flink-docs/pom.xml @@ -127,7 +127,7 @@ under the License. </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-python_${scala.binary.version}</artifactId> + <artifactId>flink-python</artifactId> <version>${project.version}</version> </dependency> diff --git a/flink-end-to-end-tests/flink-python-test/pom.xml b/flink-end-to-end-tests/flink-python-test/pom.xml index 7ac723c..c5d5cec 100644 --- a/flink-end-to-end-tests/flink-python-test/pom.xml +++ b/flink-end-to-end-tests/flink-python-test/pom.xml @@ -57,7 +57,7 @@ </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-python_${scala.binary.version}</artifactId> + <artifactId>flink-python</artifactId> <version>${project.version}</version> </dependency> </dependencies> diff --git a/flink-python/apache-flink-libraries/setup.py b/flink-python/apache-flink-libraries/setup.py index d269626..0d83f73 100644 --- a/flink-python/apache-flink-libraries/setup.py +++ b/flink-python/apache-flink-libraries/setup.py @@ -116,7 +116,7 @@ run sdist. LIB_PATH = os.path.join(FLINK_HOME, "lib") OPT_PATH = os.path.join(FLINK_HOME, "opt") OPT_PYTHON_JAR_NAME = os.path.basename( - find_file_path(os.path.join(OPT_PATH, "flink-python_*.jar"))) + find_file_path(os.path.join(OPT_PATH, "flink-python*.jar"))) OPT_SQL_CLIENT_JAR_NAME = os.path.basename( find_file_path(os.path.join(OPT_PATH, "flink-sql-client*.jar"))) LICENSES_PATH = os.path.join(FLINK_HOME, "licenses") diff --git a/flink-python/pom.xml b/flink-python/pom.xml index 46371a4..5257786 100644 --- a/flink-python/pom.xml +++ b/flink-python/pom.xml @@ -29,7 +29,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-python_${scala.binary.version}</artifactId> + <artifactId>flink-python</artifactId> <name>Flink : Python</name> <packaging>jar</packaging> @@ -74,12 +74,6 @@ under the License. </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-table-api-scala-bridge_${scala.binary.version}</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> <artifactId>flink-table-runtime</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/flink-table/flink-sql-client/pom.xml b/flink-table/flink-sql-client/pom.xml index 1906bde..bf93bc8 100644 --- a/flink-table/flink-sql-client/pom.xml +++ b/flink-table/flink-sql-client/pom.xml @@ -126,7 +126,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-python_${scala.binary.version}</artifactId> + <artifactId>flink-python</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency>
