This is an automated email from the ASF dual-hosted git repository.
mattcasters pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/main by this push:
new 2edeab650c Remove duplicate fileSets from plugin assembly descriptors,
fixes #8847 (#8848)
2edeab650c is described below
commit 2edeab650c1b244fb33425c06bbbaea148e4c27d
Author: Matt Casters <[email protected]>
AuthorDate: Sat Oct 10 12:55:49 2026 +0200
Remove duplicate fileSets from plugin assembly descriptors, fixes #8847
(#8848)
Merging the transform samples and action samples changes left two sibling
fileSets elements in six assembly descriptors. The assembly plugin rejects
the second one, so main fails at package. Both blocks copied the same
samples directory, so one block is enough.
---
plugins/databases/mssqlnative/src/assembly/assembly.xml | 8 --------
plugins/databases/mysql/src/assembly/assembly.xml | 8 --------
plugins/databases/snowflake/src/assembly/assembly.xml | 8 --------
plugins/misc/testing/src/assembly/assembly.xml | 7 -------
plugins/tech/cassandra/src/assembly/assembly.xml | 8 --------
plugins/tech/sftp/src/assembly/assembly.xml | 8 --------
6 files changed, 47 deletions(-)
diff --git a/plugins/databases/mssqlnative/src/assembly/assembly.xml
b/plugins/databases/mssqlnative/src/assembly/assembly.xml
index 2efd1cd2dc..61ea642fc4 100644
--- a/plugins/databases/mssqlnative/src/assembly/assembly.xml
+++ b/plugins/databases/mssqlnative/src/assembly/assembly.xml
@@ -43,14 +43,6 @@
</fileSet>
</fileSets>
-
- <fileSets>
- <fileSet>
- <directory>${project.basedir}/src/main/samples</directory>
- <outputDirectory>config/projects/samples/</outputDirectory>
- </fileSet>
- </fileSets>
-
<componentDescriptors>
<componentDescriptor>${maven.multiModuleProjectDirectory}/assemblies/shared/hop-plugin-libs.xml</componentDescriptor>
</componentDescriptors>
diff --git a/plugins/databases/mysql/src/assembly/assembly.xml
b/plugins/databases/mysql/src/assembly/assembly.xml
index 47e6d59630..a2a8881deb 100644
--- a/plugins/databases/mysql/src/assembly/assembly.xml
+++ b/plugins/databases/mysql/src/assembly/assembly.xml
@@ -38,14 +38,6 @@
</fileSet>
</fileSets>
-
- <fileSets>
- <fileSet>
- <directory>${project.basedir}/src/main/samples</directory>
- <outputDirectory>config/projects/samples/</outputDirectory>
- </fileSet>
- </fileSets>
-
<componentDescriptors>
<componentDescriptor>${maven.multiModuleProjectDirectory}/assemblies/shared/hop-plugin-libs.xml</componentDescriptor>
</componentDescriptors>
diff --git a/plugins/databases/snowflake/src/assembly/assembly.xml
b/plugins/databases/snowflake/src/assembly/assembly.xml
index 2cb1e65e46..e8e7007094 100644
--- a/plugins/databases/snowflake/src/assembly/assembly.xml
+++ b/plugins/databases/snowflake/src/assembly/assembly.xml
@@ -38,14 +38,6 @@
</fileSet>
</fileSets>
-
- <fileSets>
- <fileSet>
- <directory>${project.basedir}/src/main/samples</directory>
- <outputDirectory>config/projects/samples/</outputDirectory>
- </fileSet>
- </fileSets>
-
<componentDescriptors>
<componentDescriptor>${maven.multiModuleProjectDirectory}/assemblies/shared/hop-plugin-libs.xml</componentDescriptor>
</componentDescriptors>
diff --git a/plugins/misc/testing/src/assembly/assembly.xml
b/plugins/misc/testing/src/assembly/assembly.xml
index 92412e4537..be174f99ee 100644
--- a/plugins/misc/testing/src/assembly/assembly.xml
+++ b/plugins/misc/testing/src/assembly/assembly.xml
@@ -38,13 +38,6 @@
</fileSet>
</fileSets>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}/src/main/samples</directory>
- <outputDirectory>config/projects/samples/</outputDirectory>
- </fileSet>
- </fileSets>
-
<componentDescriptors>
<componentDescriptor>${maven.multiModuleProjectDirectory}/assemblies/shared/hop-plugin-libs.xml</componentDescriptor>
</componentDescriptors>
diff --git a/plugins/tech/cassandra/src/assembly/assembly.xml
b/plugins/tech/cassandra/src/assembly/assembly.xml
index 76e8307b32..17073d7ef6 100644
--- a/plugins/tech/cassandra/src/assembly/assembly.xml
+++ b/plugins/tech/cassandra/src/assembly/assembly.xml
@@ -37,14 +37,6 @@
</fileSet>
</fileSets>
-
- <fileSets>
- <fileSet>
- <directory>${project.basedir}/src/main/samples</directory>
- <outputDirectory>config/projects/samples/</outputDirectory>
- </fileSet>
- </fileSets>
-
<componentDescriptors>
<componentDescriptor>${maven.multiModuleProjectDirectory}/assemblies/shared/hop-plugin-libs.xml</componentDescriptor>
</componentDescriptors>
diff --git a/plugins/tech/sftp/src/assembly/assembly.xml
b/plugins/tech/sftp/src/assembly/assembly.xml
index bf593a910a..16495f49b7 100644
--- a/plugins/tech/sftp/src/assembly/assembly.xml
+++ b/plugins/tech/sftp/src/assembly/assembly.xml
@@ -37,14 +37,6 @@
</fileSet>
</fileSets>
-
- <fileSets>
- <fileSet>
- <directory>${project.basedir}/src/main/samples</directory>
- <outputDirectory>config/projects/samples/</outputDirectory>
- </fileSet>
- </fileSets>
-
<componentDescriptors>
<componentDescriptor>${maven.multiModuleProjectDirectory}/assemblies/shared/hop-plugin-libs.xml</componentDescriptor>
</componentDescriptors>
