[FLINK-26842][python] Remove scala-bridge dependency

mbalassi · Mar 28, 2022 · 8f51746 · 8f51746
1 parent 45ba303
commit 8f51746
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -116,7 +116,7 @@ def find_file_path(pattern):
  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
@@ -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>
@@ -72,12 +72,6 @@ under the License.
  <version>${project.version}</version>
  <scope>provided</scope>
  </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>

diff --git 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>