[GitHub] asfgit closed pull request #7176: [FLINK-11005] Define flink-sql-client uber-jar dependencies via artifactSet

[GitBox <gi...@apache.org>]

asfgit closed pull request #7176: [FLINK-11005] Define flink-sql-client uber-jar dependencies via artifactSet
URL: https://github.com/apache/flink/pull/7176
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/flink-libraries/flink-sql-client/pom.xml b/flink-libraries/flink-sql-client/pom.xml
index d703aeccac4..c447bc03ba7 100644
--- a/flink-libraries/flink-sql-client/pom.xml
+++ b/flink-libraries/flink-sql-client/pom.xml
@@ -144,30 +144,19 @@ under the License.
 				<executions>
 					<!-- Exclude all flink-dist files and only include flink-table and flink-sql-client -->
 					<execution>
+						<id>shade</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/apache/flink/cep/**</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.apache.flink:flink-cep_${scala.binary.version}</include>
+									<include>org.jline:*</include>
+								</includes>
+							</artifactSet>
 						</configuration>
 					</execution>
 				</executions>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services