You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2019/11/26 10:49:32 UTC

[flink] branch release-1.9 updated: [FLINK-13995][legal] Properly exclude netty license directory

This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a commit to branch release-1.9
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/release-1.9 by this push:
     new 53c1c18  [FLINK-13995][legal] Properly exclude netty license directory
53c1c18 is described below

commit 53c1c183fb6b4059627f4a66cd8feaeed45c1b4c
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Thu Nov 14 14:51:19 2019 +0100

    [FLINK-13995][legal] Properly exclude netty license directory
---
 flink-connectors/flink-connector-elasticsearch2/pom.xml | 2 +-
 flink-connectors/flink-connector-elasticsearch5/pom.xml | 2 +-
 flink-runtime/pom.xml                                   | 2 +-
 flink-test-utils-parent/flink-test-utils/pom.xml        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/flink-connectors/flink-connector-elasticsearch2/pom.xml b/flink-connectors/flink-connector-elasticsearch2/pom.xml
index 603af80..81dce9a 100644
--- a/flink-connectors/flink-connector-elasticsearch2/pom.xml
+++ b/flink-connectors/flink-connector-elasticsearch2/pom.xml
@@ -212,7 +212,7 @@ under the License.
 									<excludes>
 										<!-- Only some of these licenses actually apply to the JAR and have been manually
 										 	placed in this module's resources directory. -->
-										<exclude>META-INF/license</exclude>
+										<exclude>META-INF/license/**</exclude>
 										<!-- Only parts of NOTICE file actually apply to the netty JAR and have been manually
 										 	copied into this modules's NOTICE file. -->
 										<exclude>META-INF/NOTICE.txt</exclude>
diff --git a/flink-connectors/flink-connector-elasticsearch5/pom.xml b/flink-connectors/flink-connector-elasticsearch5/pom.xml
index 0750123..45ba332 100644
--- a/flink-connectors/flink-connector-elasticsearch5/pom.xml
+++ b/flink-connectors/flink-connector-elasticsearch5/pom.xml
@@ -275,7 +275,7 @@ under the License.
 									<excludes>
 										<!-- Only some of these licenses actually apply to the JAR and have been manually
 										 	placed in this module's resources directory. -->
-										<exclude>META-INF/license</exclude>
+										<exclude>META-INF/license/**</exclude>
 										<!-- Only parts of NOTICE file actually apply to the netty JAR and have been manually
 										 	copied into this modules's NOTICE file. -->
 										<exclude>META-INF/NOTICE.txt</exclude>
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index b97e1db..50ae268 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -577,7 +577,7 @@ under the License.
 									<excludes>
 										<!-- Only some of these licenses actually apply to the JAR and have been manually
 										 	placed in this module's resources directory. -->
-										<exclude>META-INF/license</exclude>
+										<exclude>META-INF/license/**</exclude>
 										<!-- Only parts of NOTICE file actually apply to the netty JAR and have been manually
 										 	copied into this modules's NOTICE file. -->
 										<exclude>META-INF/NOTICE.txt</exclude>
diff --git a/flink-test-utils-parent/flink-test-utils/pom.xml b/flink-test-utils-parent/flink-test-utils/pom.xml
index 09bfab8..604a40b 100644
--- a/flink-test-utils-parent/flink-test-utils/pom.xml
+++ b/flink-test-utils-parent/flink-test-utils/pom.xml
@@ -150,7 +150,7 @@ under the License.
 										<exclude>META-INF/maven/io.netty/**</exclude>
 										<!-- Only some of these licenses actually apply to the JAR and have been manually
 										 	placed in this module's resources directory. -->
-										<exclude>META-INF/license</exclude>
+										<exclude>META-INF/license/**</exclude>
 										<!-- Only parts of NOTICE file actually apply to the netty JAR and have been manually
 										 	copied into this modules's NOTICE file. -->
 										<exclude>META-INF/NOTICE.txt</exclude>