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 2021/05/07 08:26:37 UTC
[flink] 02/04: [FLINK-22560][build] Filter maven metadata directory
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 06b3e26d9239e31e247588755fe649fec96c256a
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Tue May 4 10:41:14 2021 +0200
[FLINK-22560][build] Filter maven metadata directory
---
flink-connectors/flink-connector-elasticsearch5/pom.xml | 13 -------------
flink-connectors/flink-connector-kafka/pom.xml | 4 ++++
flink-filesystems/flink-azure-fs-hadoop/pom.xml | 1 -
flink-filesystems/flink-fs-hadoop-shaded/pom.xml | 1 -
flink-filesystems/flink-oss-fs-hadoop/pom.xml | 1 -
flink-filesystems/flink-s3-fs-hadoop/pom.xml | 7 -------
flink-filesystems/flink-s3-fs-presto/pom.xml | 7 -------
flink-kubernetes/pom.xml | 1 -
flink-libraries/flink-gelly-scala/pom.xml | 4 ++++
flink-python/pom.xml | 1 -
flink-runtime/pom.xml | 6 ------
flink-test-utils-parent/flink-test-utils/pom.xml | 1 -
pom.xml | 17 +++++++++++++++++
13 files changed, 25 insertions(+), 39 deletions(-)
diff --git a/flink-connectors/flink-connector-elasticsearch5/pom.xml b/flink-connectors/flink-connector-elasticsearch5/pom.xml
index ef38e69..fdf56b8 100644
--- a/flink-connectors/flink-connector-elasticsearch5/pom.xml
+++ b/flink-connectors/flink-connector-elasticsearch5/pom.xml
@@ -245,19 +245,6 @@ under the License.
<exclude>log4j.properties</exclude>
<exclude>config/favicon.ico</exclude>
<exclude>mozilla/**</exclude>
- <exclude>META-INF/maven/com*/**</exclude>
- <exclude>META-INF/maven/io*/**</exclude>
- <exclude>META-INF/maven/joda*/**</exclude>
- <exclude>META-INF/maven/net*/**</exclude>
- <exclude>META-INF/maven/org.an*/**</exclude>
- <exclude>META-INF/maven/org.apache.h*/**</exclude>
- <exclude>META-INF/maven/org.apache.commons/**</exclude>
- <exclude>META-INF/maven/org.apache.flink/force-shading/**</exclude>
- <exclude>META-INF/maven/org.apache.logging*/**</exclude>
- <exclude>META-INF/maven/org.e*/**</exclude>
- <exclude>META-INF/maven/org.h*/**</exclude>
- <exclude>META-INF/maven/org.j*/**</exclude>
- <exclude>META-INF/maven/org.y*/**</exclude>
</excludes>
</filter>
<filter>
diff --git a/flink-connectors/flink-connector-kafka/pom.xml b/flink-connectors/flink-connector-kafka/pom.xml
index e5b65c1..b9b7d9f 100644
--- a/flink-connectors/flink-connector-kafka/pom.xml
+++ b/flink-connectors/flink-connector-kafka/pom.xml
@@ -247,6 +247,10 @@ under the License.
<goal>test-jar-no-fork</goal>
</goals>
<configuration>
+ <archive>
+ <!-- Globally exclude maven metadata, because it may accidentally bundle files we don't intend to -->
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
<includes>
<include>**/KafkaTestEnvironmentImpl*</include>
<include>META-INF/LICENSE</include>
diff --git a/flink-filesystems/flink-azure-fs-hadoop/pom.xml b/flink-filesystems/flink-azure-fs-hadoop/pom.xml
index 906f6c3..b504c95 100644
--- a/flink-filesystems/flink-azure-fs-hadoop/pom.xml
+++ b/flink-filesystems/flink-azure-fs-hadoop/pom.xml
@@ -192,7 +192,6 @@ under the License.
<exclude>properties.dtd</exclude>
<exclude>PropertyList-1.0.dtd</exclude>
<exclude>mozilla/**</exclude>
- <exclude>META-INF/maven/**</exclude>
<exclude>META-INF/LICENSE.txt</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
diff --git a/flink-filesystems/flink-fs-hadoop-shaded/pom.xml b/flink-filesystems/flink-fs-hadoop-shaded/pom.xml
index 4a58e1b..3c6fc61 100644
--- a/flink-filesystems/flink-fs-hadoop-shaded/pom.xml
+++ b/flink-filesystems/flink-fs-hadoop-shaded/pom.xml
@@ -259,7 +259,6 @@ under the License.
<excludes>
<exclude>properties.dtd</exclude>
<exclude>PropertyList-1.0.dtd</exclude>
- <exclude>META-INF/maven/**</exclude>
<exclude>META-INF/services/javax.xml.stream.*</exclude>
<exclude>META-INF/LICENSE.txt</exclude>
</excludes>
diff --git a/flink-filesystems/flink-oss-fs-hadoop/pom.xml b/flink-filesystems/flink-oss-fs-hadoop/pom.xml
index e612f04..edf289c 100644
--- a/flink-filesystems/flink-oss-fs-hadoop/pom.xml
+++ b/flink-filesystems/flink-oss-fs-hadoop/pom.xml
@@ -154,7 +154,6 @@ under the License.
<exclude>.gitkeep</exclude>
<exclude>mime.types</exclude>
<exclude>mozilla/**</exclude>
- <exclude>META-INF/maven/**</exclude>
</excludes>
</filter>
</filters>
diff --git a/flink-filesystems/flink-s3-fs-hadoop/pom.xml b/flink-filesystems/flink-s3-fs-hadoop/pom.xml
index 41572d9..7dc3b1a 100644
--- a/flink-filesystems/flink-s3-fs-hadoop/pom.xml
+++ b/flink-filesystems/flink-s3-fs-hadoop/pom.xml
@@ -206,12 +206,6 @@ under the License.
<filter>
<artifact>*</artifact>
<excludes>
- <exclude>META-INF/maven/org.apache.flink/force-shading/**</exclude>
- </excludes>
- </filter>
- <filter>
- <artifact>*</artifact>
- <excludes>
<exclude>.gitkeep</exclude>
<exclude>mime.types</exclude>
<exclude>mozilla/**</exclude>
@@ -224,7 +218,6 @@ under the License.
<excludes>
<exclude>properties.dtd</exclude>
<exclude>PropertyList-1.0.dtd</exclude>
- <exclude>META-INF/maven/**</exclude>
<exclude>META-INF/services/javax.xml.stream.*</exclude>
<exclude>META-INF/LICENSE.txt</exclude>
</excludes>
diff --git a/flink-filesystems/flink-s3-fs-presto/pom.xml b/flink-filesystems/flink-s3-fs-presto/pom.xml
index 3f690a3..d3bb050 100644
--- a/flink-filesystems/flink-s3-fs-presto/pom.xml
+++ b/flink-filesystems/flink-s3-fs-presto/pom.xml
@@ -401,19 +401,12 @@ under the License.
<exclude>.gitkeep</exclude>
<exclude>mime.types</exclude>
<exclude>mozilla/**</exclude>
- <exclude>META-INF/maven/**</exclude>
<exclude>META-INF/LICENSE.txt</exclude>
</excludes>
</filter>
<filter>
<artifact>*</artifact>
<excludes>
- <exclude>META-INF/maven/org.weakref/**</exclude>
- <exclude>META-INF/maven/org.hdrhistogram/**</exclude>
- <exclude>META-INF/maven/joda-time/**</exclude>
- <exclude>META-INF/maven/io.airlift/**</exclude>
- <exclude>META-INF/maven/com*/**</exclude>
- <exclude>META-INF/maven/org.apache.flink/force-shading/**</exclude>
<exclude>META-INF/LICENSE.txt</exclude>
</excludes>
</filter>
diff --git a/flink-kubernetes/pom.xml b/flink-kubernetes/pom.xml
index 04df35f..62d74b8 100644
--- a/flink-kubernetes/pom.xml
+++ b/flink-kubernetes/pom.xml
@@ -156,7 +156,6 @@ under the License.
<artifact>*:*</artifact>
<excludes>
<exclude>*.aut</exclude>
- <exclude>META-INF/maven/**</exclude>
<exclude>META-INF/services/*com.fasterxml*</exclude>
<exclude>META-INF/proguard/**</exclude>
<exclude>OSGI-INF/**</exclude>
diff --git a/flink-libraries/flink-gelly-scala/pom.xml b/flink-libraries/flink-gelly-scala/pom.xml
index 20e0b14..730a3bd 100644
--- a/flink-libraries/flink-gelly-scala/pom.xml
+++ b/flink-libraries/flink-gelly-scala/pom.xml
@@ -215,6 +215,10 @@ under the License.
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
+ <archive>
+ <!-- Globally exclude maven metadata, because it may accidentally bundle files we don't intend to -->
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
</configuration>
<executions>
<execution>
diff --git a/flink-python/pom.xml b/flink-python/pom.xml
index 43079e1..1482e2a 100644
--- a/flink-python/pom.xml
+++ b/flink-python/pom.xml
@@ -348,7 +348,6 @@ under the License.
<artifact>org.apache.beam:beam-sdks-java-core</artifact>
<excludes>
<exclude>org/apache/beam/repackaged/core/org/antlr/**</exclude>
- <exclude>META-INF/maven/org.antlr/**</exclude>
<exclude>org/apache/beam/repackaged/core/org/apache/commons/compress/**</exclude>
<exclude>org/apache/beam/repackaged/core/org/apache/commons/lang3/**</exclude>
</excludes>
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index 9aa4246..6f5d302 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -572,12 +572,6 @@ under the License.
copied into this modules's NOTICE file. -->
<exclude>META-INF/NOTICE.txt</exclude>
</excludes>
- </filter>
- <filter>
- <artifact>*</artifact>
- <excludes>
- <exclude>META-INF/maven/io.netty/**</exclude>
- </excludes>
</filter>
</filters>
</configuration>
diff --git a/flink-test-utils-parent/flink-test-utils/pom.xml b/flink-test-utils-parent/flink-test-utils/pom.xml
index 8725862..9f71e67e 100644
--- a/flink-test-utils-parent/flink-test-utils/pom.xml
+++ b/flink-test-utils-parent/flink-test-utils/pom.xml
@@ -146,7 +146,6 @@ under the License.
<filter>
<artifact>io.netty:netty</artifact>
<excludes>
- <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>
diff --git a/pom.xml b/pom.xml
index f46d0ac..47f76bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1366,6 +1366,8 @@ under the License.
<version>2.4</version><!--$NO-MVN-MAN-VER$-->
<configuration>
<archive>
+ <!-- Globally exclude maven metadata, because it may accidentally bundle files we don't intend to -->
+ <addMavenDescriptor>false</addMavenDescriptor>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
@@ -1742,6 +1744,21 @@ under the License.
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
+ <!-- META-INF/maven can contain 2 things:
+ - For archetypes, it contains an archetype-metadata.xml.
+ - For other jars, it contains the pom for all dependencies under the respective <groupId>/<artifactId>/ directory.
+
+ We want to exclude the poms because they may be under an incompatible license,
+ however the archetype metadata is required and we need to keep that around.
+
+ This pattern excludes directories under META-INF/maven.
+ ('?*/**' does not work because '**' also matches zero directories;
+ everything that matches '?*' also matches '?*/**')
+
+ The initial '**' allows the pattern to also work for multi-release jars that may contain such entries under
+ 'META-INF/versions/11/META-INF/maven/'.
+ -->
+ <exclude>**/META-INF/maven/?*/?*/**</exclude>
</excludes>
</filter>
</filters>