[FLINK-12495][python][client] Move PythonGatewayServer into flink-cli…

…ents.

This closes apache#8423

flink-clients/pom.xml

@@ -68,6 +68,13 @@ under the License.
  <artifactId>commons-cli</artifactId>
  </dependency>
 
+ <!-- Python API dependencies -->
+ <dependency>
+ <groupId>net.sf.py4j</groupId>
+ <artifactId>py4j</artifactId>
+ <version>${py4j.version}</version>
+ </dependency>
+
  <!-- test dependencies -->
 
  <dependency>

flink-core/src/main/java/org/apache/flink/api/python/PythonGatewayServer.java → flink-clients/src/main/java/org/apache/flink/client/python/PythonGatewayServer.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.python;
+package org.apache.flink.client.python;
 
 import py4j.GatewayServer;
 

flink-core/pom.xml

@@ -86,13 +86,6 @@ under the License.
  <artifactId>flink-shaded-guava</artifactId>
  </dependency>
 
- <!-- Python API dependencies -->
- <dependency>
- <groupId>net.sf.py4j</groupId>
- <artifactId>py4j</artifactId>
- <version>0.10.8.1</version>
- </dependency>
-
  <!-- ================== test dependencies ================== -->
 
  <dependency>

flink-python/pyflink/java_gateway.py

@@ -62,7 +62,7 @@ def launch_gateway():
  raise Exception("Windows system is not supported currently.")
  script = "./bin/pyflink-gateway-server.sh"
  command = [os.path.join(FLINK_HOME, script)]
- command += ['-c', 'org.apache.flink.api.python.PythonGatewayServer']
+ command += ['-c', 'org.apache.flink.client.python.PythonGatewayServer']
 
  # Create a temporary directory where the gateway server should write the connection information.
  conn_info_dir = tempfile.mkdtemp()

pom.xml

@@ -128,6 +128,7 @@ under the License.
  <mockito.version>2.21.0</mockito.version>
  <powermock.version>2.0.0-RC.4</powermock.version>
  <hamcrest.version>1.3</hamcrest.version>
+ <py4j.version>0.10.8.1</py4j.version>
  <japicmp.skip>false</japicmp.skip>
  <flink.convergence.phase>validate</flink.convergence.phase>
  <!--