This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a commit to branch release-1.6
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.6 by this push:
new c1d9714 [FLINK-11005] Define flink-sql-client uber-jar dependencies
via artifactSet
c1d9714 is described below
commit c1d9714e36f0b471ff4730e50b9c4a4657192683
Author: Till Rohrmann <[email protected]>
AuthorDate: Mon Nov 26 15:58:38 2018 +0100
[FLINK-11005] Define flink-sql-client uber-jar dependencies via artifactSet
Instead of including every dependency and then limiting the set of included
files via a filter condition of the maven-shade-pluging, this commit defines
an artifact set of included dependencies. That way we will properly include
all files belonging to the listed dependencies (e.g. also the NOTICE file).
This closes #7176.
---
flink-libraries/flink-sql-client/pom.xml | 25 +++++++------------------
1 file changed, 7 insertions(+), 18 deletions(-)
diff --git a/flink-libraries/flink-sql-client/pom.xml
b/flink-libraries/flink-sql-client/pom.xml
index 2c6e2ba..e28a752 100644
--- a/flink-libraries/flink-sql-client/pom.xml
+++ b/flink-libraries/flink-sql-client/pom.xml
@@ -143,29 +143,18 @@ under the License.
<executions>
<!-- Exclude all flink-dist files and
only include flink-table and flink-sql-client -->
<execution>
+ <id>shade-flink</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
- <filters>
- <filter>
-
<artifact>*:*</artifact>
-
<includes>
-
<!-- flink-table + flink-sql-client -->
-
<include>org/apache/calcite/**</include>
-
<include>org/apache/flink/calcite/shaded/**</include>
-
<include>org/apache/flink/table/**</include>
-
<include>org.codehaus.commons.compiler.properties</include>
-
<include>org/codehaus/janino/**</include>
-
<include>org/codehaus/commons/**</include>
-
<include>META-INF/services/org.apache.flink.table.factories.TableFactory</include>
-
<!-- flink-sql-client -->
-
<include>org/jline/**</include>
-
<include>com/fasterxml/jackson/**</include>
-
</includes>
- </filter>
- </filters>
+ <artifactSet>
+ <includes
combine.children="append">
+
<include>org.apache.flink:flink-table_${scala.binary.version}</include>
+
<include>org.jline:*</include>
+ </includes>
+ </artifactSet>
</configuration>
</execution>
</executions>
