This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 4a841c4028 NIFI-12496 Moved Python extensions unpacking to common.xml
4a841c4028 is described below
commit 4a841c4028f0dffaa0fed8fda7c36a4dc6270841
Author: Pierre Villard <[email protected]>
AuthorDate: Fri Dec 8 19:38:45 2023 +0100
NIFI-12496 Moved Python extensions unpacking to common.xml
This closes #8148
Signed-off-by: David Handermann <[email protected]>
---
nifi-assembly/src/main/assembly/common.xml | 22 +++++++++++++++++++++-
nifi-assembly/src/main/assembly/dependencies.xml | 21 ---------------------
2 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/nifi-assembly/src/main/assembly/common.xml
b/nifi-assembly/src/main/assembly/common.xml
index a2ccc5ab05..0d15d8a9da 100644
--- a/nifi-assembly/src/main/assembly/common.xml
+++ b/nifi-assembly/src/main/assembly/common.xml
@@ -170,6 +170,26 @@
</unpackOptions>
</dependencySet>
+ <!-- Unpack Python extensions -->
+ <dependencySet>
+ <scope>runtime</scope>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>./python/extensions</outputDirectory>
+ <directoryMode>0770</directoryMode>
+ <fileMode>0664</fileMode>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <includes>
+ <include>*:nifi-python-extensions-bundle</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/</exclude>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+
</dependencySets>
<fileSets>
<fileSet>
@@ -203,4 +223,4 @@
<filtered>true</filtered>
</file>
</files>
-</component>
\ No newline at end of file
+</component>
diff --git a/nifi-assembly/src/main/assembly/dependencies.xml
b/nifi-assembly/src/main/assembly/dependencies.xml
index 7807fc321d..767a8baf92 100644
--- a/nifi-assembly/src/main/assembly/dependencies.xml
+++ b/nifi-assembly/src/main/assembly/dependencies.xml
@@ -43,27 +43,6 @@
<exclude>org.aspectj:aspectjweaver</exclude>
</excludes>
</dependencySet>
-
- <!-- Unpack Python extensions -->
- <dependencySet>
- <scope>runtime</scope>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>./python/extensions</outputDirectory>
- <directoryMode>0770</directoryMode>
- <fileMode>0664</fileMode>
- <useTransitiveFiltering>true</useTransitiveFiltering>
- <includes>
- <include>*:nifi-python-extensions-bundle</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/</exclude>
- <exclude>META-INF/**</exclude>
- </excludes>
- </unpackOptions>
- </dependencySet>
-
</dependencySets>
</assembly>
