Skip to content

Commit c06386d

Browse files
zentolzentol
committed
[FLINK-22560][build] Filter maven metadata directory
1 parent a61207d commit c06386d

File tree

13 files changed

+25
-39
lines changed

13 files changed

+25
-39
lines changed

‎flink-connectors/flink-connector-elasticsearch5/pom.xml

-13
Original file line numberDiff line numberDiff line change
@@ -245,19 +245,6 @@ under the License.
245245
<exclude>log4j.properties</exclude>
246246
<exclude>config/favicon.ico</exclude>
247247
<exclude>mozilla/**</exclude>
248-
<exclude>META-INF/maven/com*/**</exclude>
249-
<exclude>META-INF/maven/io*/**</exclude>
250-
<exclude>META-INF/maven/joda*/**</exclude>
251-
<exclude>META-INF/maven/net*/**</exclude>
252-
<exclude>META-INF/maven/org.an*/**</exclude>
253-
<exclude>META-INF/maven/org.apache.h*/**</exclude>
254-
<exclude>META-INF/maven/org.apache.commons/**</exclude>
255-
<exclude>META-INF/maven/org.apache.flink/force-shading/**</exclude>
256-
<exclude>META-INF/maven/org.apache.logging*/**</exclude>
257-
<exclude>META-INF/maven/org.e*/**</exclude>
258-
<exclude>META-INF/maven/org.h*/**</exclude>
259-
<exclude>META-INF/maven/org.j*/**</exclude>
260-
<exclude>META-INF/maven/org.y*/**</exclude>
261248
</excludes>
262249
</filter>
263250
<filter>

‎flink-connectors/flink-connector-kafka/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,10 @@ under the License.
234234
<goal>test-jar-no-fork</goal>
235235
</goals>
236236
<configuration>
237+
<archive>
238+
<!-- Globally exclude maven metadata, because it may accidentally bundle files we don't intend to -->
239+
<addMavenDescriptor>false</addMavenDescriptor>
240+
</archive>
237241
<includes>
238242
<include>**/KafkaTestEnvironmentImpl*</include>
239243
<include>META-INF/LICENSE</include>

‎flink-filesystems/flink-azure-fs-hadoop/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ under the License.
192192
<exclude>properties.dtd</exclude>
193193
<exclude>PropertyList-1.0.dtd</exclude>
194194
<exclude>mozilla/**</exclude>
195-
<exclude>META-INF/maven/**</exclude>
196195
<exclude>META-INF/LICENSE.txt</exclude>
197196
<exclude>META-INF/*.SF</exclude>
198197
<exclude>META-INF/*.DSA</exclude>

‎flink-filesystems/flink-fs-hadoop-shaded/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ under the License.
259259
<excludes>
260260
<exclude>properties.dtd</exclude>
261261
<exclude>PropertyList-1.0.dtd</exclude>
262-
<exclude>META-INF/maven/**</exclude>
263262
<exclude>META-INF/services/javax.xml.stream.*</exclude>
264263
<exclude>META-INF/LICENSE.txt</exclude>
265264
</excludes>

‎flink-filesystems/flink-oss-fs-hadoop/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ under the License.
154154
<exclude>.gitkeep</exclude>
155155
<exclude>mime.types</exclude>
156156
<exclude>mozilla/**</exclude>
157-
<exclude>META-INF/maven/**</exclude>
158157
</excludes>
159158
</filter>
160159
</filters>

‎flink-filesystems/flink-s3-fs-hadoop/pom.xml

-7
Original file line numberDiff line numberDiff line change
@@ -203,12 +203,6 @@ under the License.
203203
</relocation>
204204
</relocations>
205205
<filters>
206-
<filter>
207-
<artifact>*</artifact>
208-
<excludes>
209-
<exclude>META-INF/maven/org.apache.flink/force-shading/**</exclude>
210-
</excludes>
211-
</filter>
212206
<filter>
213207
<artifact>*</artifact>
214208
<excludes>
@@ -224,7 +218,6 @@ under the License.
224218
<excludes>
225219
<exclude>properties.dtd</exclude>
226220
<exclude>PropertyList-1.0.dtd</exclude>
227-
<exclude>META-INF/maven/**</exclude>
228221
<exclude>META-INF/services/javax.xml.stream.*</exclude>
229222
<exclude>META-INF/LICENSE.txt</exclude>
230223
</excludes>

‎flink-filesystems/flink-s3-fs-presto/pom.xml

-7
Original file line numberDiff line numberDiff line change
@@ -401,19 +401,12 @@ under the License.
401401
<exclude>.gitkeep</exclude>
402402
<exclude>mime.types</exclude>
403403
<exclude>mozilla/**</exclude>
404-
<exclude>META-INF/maven/**</exclude>
405404
<exclude>META-INF/LICENSE.txt</exclude>
406405
</excludes>
407406
</filter>
408407
<filter>
409408
<artifact>*</artifact>
410409
<excludes>
411-
<exclude>META-INF/maven/org.weakref/**</exclude>
412-
<exclude>META-INF/maven/org.hdrhistogram/**</exclude>
413-
<exclude>META-INF/maven/joda-time/**</exclude>
414-
<exclude>META-INF/maven/io.airlift/**</exclude>
415-
<exclude>META-INF/maven/com*/**</exclude>
416-
<exclude>META-INF/maven/org.apache.flink/force-shading/**</exclude>
417410
<exclude>META-INF/LICENSE.txt</exclude>
418411
</excludes>
419412
</filter>

‎flink-kubernetes/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ under the License.
156156
<artifact>*:*</artifact>
157157
<excludes>
158158
<exclude>*.aut</exclude>
159-
<exclude>META-INF/maven/**</exclude>
160159
<exclude>META-INF/services/*com.fasterxml*</exclude>
161160
<exclude>META-INF/proguard/**</exclude>
162161
<exclude>OSGI-INF/**</exclude>

‎flink-libraries/flink-gelly-scala/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,10 @@ under the License.
215215
<descriptorRefs>
216216
<descriptorRef>jar-with-dependencies</descriptorRef>
217217
</descriptorRefs>
218+
<archive>
219+
<!-- Globally exclude maven metadata, because it may accidentally bundle files we don't intend to -->
220+
<addMavenDescriptor>false</addMavenDescriptor>
221+
</archive>
218222
</configuration>
219223
<executions>
220224
<execution>

‎flink-python/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,6 @@ under the License.
339339
<artifact>org.apache.beam:beam-sdks-java-core</artifact>
340340
<excludes>
341341
<exclude>org/apache/beam/repackaged/core/org/antlr/**</exclude>
342-
<exclude>META-INF/maven/org.antlr/**</exclude>
343342
<exclude>org/apache/beam/repackaged/core/org/apache/commons/compress/**</exclude>
344343
<exclude>org/apache/beam/repackaged/core/org/apache/commons/lang3/**</exclude>
345344
</excludes>

‎flink-runtime/pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -571,12 +571,6 @@ under the License.
571571
copied into this modules's NOTICE file. -->
572572
<exclude>META-INF/NOTICE.txt</exclude>
573573
</excludes>
574-
</filter>
575-
<filter>
576-
<artifact>*</artifact>
577-
<excludes>
578-
<exclude>META-INF/maven/io.netty/**</exclude>
579-
</excludes>
580574
</filter>
581575
</filters>
582576
</configuration>

‎flink-test-utils-parent/flink-test-utils/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ under the License.
146146
<filter>
147147
<artifact>io.netty:netty</artifact>
148148
<excludes>
149-
<exclude>META-INF/maven/io.netty/**</exclude>
150149
<!-- Only some of these licenses actually apply to the JAR and have been manually
151150
placed in this module's resources directory. -->
152151
<exclude>META-INF/license/**</exclude>

‎pom.xml

+17
Original file line numberDiff line numberDiff line change
@@ -1345,6 +1345,8 @@ under the License.
13451345
<version>2.4</version><!--$NO-MVN-MAN-VER$-->
13461346
<configuration>
13471347
<archive>
1348+
<!-- Globally exclude maven metadata, because it may accidentally bundle files we don't intend to -->
1349+
<addMavenDescriptor>false</addMavenDescriptor>
13481350
<manifest>
13491351
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
13501352
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
@@ -1713,6 +1715,21 @@ under the License.
17131715
<exclude>META-INF/*.SF</exclude>
17141716
<exclude>META-INF/*.DSA</exclude>
17151717
<exclude>META-INF/*.RSA</exclude>
1718+
<!-- META-INF/maven can contain 2 things:
1719+
- For archetypes, it contains an archetype-metadata.xml.
1720+
- For other jars, it contains the pom for all dependencies under the respective <groupId>/<artifactId>/ directory.
1721+
1722+
We want to exclude the poms because they may be under an incompatible license,
1723+
however the archetype metadata is required and we need to keep that around.
1724+
1725+
This pattern excludes directories under META-INF/maven.
1726+
('?*/**' does not work because '**' also matches zero directories;
1727+
everything that matches '?*' also matches '?*/**')
1728+
1729+
The initial '**' allows the pattern to also work for multi-release jars that may contain such entries under
1730+
'META-INF/versions/11/META-INF/maven/'.
1731+
-->
1732+
<exclude>**/META-INF/maven/?*/?*/**</exclude>
17161733
</excludes>
17171734
</filter>
17181735
</filters>

0 commit comments

Comments
 (0)