[FLINK-15847][ml] Include flink-ml-api and flink-ml-lib in opt

apache · Feb 27, 2020 · 6deca76 · 6deca76
1 parent a8bb211
commit 6deca76
Show file tree

Hide file tree

Showing 8 changed files with 97 additions and 0 deletions.
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
@@ -400,6 +400,13 @@ under the License.
 			<artifactId>flink-shaded-netty-tcnative-dynamic</artifactId>
 			<scope>provided</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-ml-uber_${scala.binary.version}</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
 		<!-- end optional Flink libraries -->
 
 		<dependency>

diff --git a/flink-dist/src/main/assemblies/opt.xml b/flink-dist/src/main/assemblies/opt.xml
@@ -168,6 +168,14 @@
 			<destName>flink-python_${scala.binary.version}-${project.version}.jar</destName>
 			<fileMode>0644</fileMode>
 		</file>
+
+		<!-- ML (API & LIB)  -->
+		<file>
+			<source>../flink-ml-parent/flink-ml-uber/target/flink-ml-uber_${scala.binary.version}-${project.version}.jar</source>
+			<outputDirectory>opt</outputDirectory>
+			<destName>flink-ml_${scala.binary.version}-${project.version}.jar</destName>
+			<fileMode>0644</fileMode>
+		</file>
 	</files>
 	<dependencySets>
 		<dependencySet>

diff --git a/flink-ml-parent/flink-ml-api/pom.xml b/flink-ml-parent/flink-ml-api/pom.xml
@@ -35,10 +35,12 @@ under the License.
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-table-api-java</artifactId>
 			<version>${project.version}</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-shaded-jackson</artifactId>
+			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/flink-ml-parent/flink-ml-lib/pom.xml b/flink-ml-parent/flink-ml-lib/pom.xml
@@ -34,16 +34,19 @@ under the License.
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-ml-api</artifactId>
 			<version>${project.version}</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-table-api-java</artifactId>
 			<version>${project.version}</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
 			<version>${project.version}</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.flink</groupId>

diff --git a/flink-ml-parent/flink-ml-uber/pom.xml b/flink-ml-parent/flink-ml-uber/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+  http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.flink</groupId>
+		<artifactId>flink-ml-parent</artifactId>
+		<version>1.11-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>flink-ml-uber_${scala.binary.version}</artifactId>
+	<name>flink-ml-uber</name>
+	<description>
+		This module contains both the api and libraries for writing Flink ML programs.
+	</description>
+
+	<packaging>jar</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-ml-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-ml-lib_${scala.binary.version}</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>shade-flink</id>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<artifactSet>
+								<includes combine.children="append">
+									<include>org.apache.flink:flink-ml-api</include>
+									<include>org.apache.flink:flink-ml-lib_${scala.binary.version}</include>
+									<include>com.github.fommil.netlib:core</include>
+								</includes>
+							</artifactSet>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/...ml-lib/src/main/resources/META-INF/NOTICE → ...l-uber/src/main/resources/META-INF/NOTICE b/...ml-lib/src/main/resources/META-INF/NOTICE → ...l-uber/src/main/resources/META-INF/NOTICE
diff --git a/.../resources/META-INF/licenses/LICENSE.core → .../resources/META-INF/licenses/LICENSE.core b/.../resources/META-INF/licenses/LICENSE.core → .../resources/META-INF/licenses/LICENSE.core
diff --git a/flink-ml-parent/pom.xml b/flink-ml-parent/pom.xml
@@ -36,5 +36,6 @@ under the License.
 	<modules>
 		<module>flink-ml-api</module>
 		<module>flink-ml-lib</module>
+		<module>flink-ml-uber</module>
 	</modules>
 </project>