mattcasters opened a new pull request, #8848: URL: https://github.com/apache/hop/pull/8848
Removes the duplicate `<fileSets>` block from the six plugin assembly descriptors that break `package` on main. Fixes #8847. #8786 and #8790 each added a `<fileSets>` element that copies `src/main/samples` to `config/projects/samples/`. The hunks did not overlap, so the merge kept both. `maven-assembly-plugin` allows that element once and fails with `Duplicated tag: 'fileSets'`. The remaining block is unchanged, so the samples still ship. Verified with: `./mvnw -pl plugins/databases/mysql,plugins/databases/mssqlnative,plugins/databases/snowflake,plugins/misc/testing,plugins/tech/cassandra,plugins/tech/sftp -DskipTests -Pfast-build package` All six assemblies built. The MySQL zip still contains `config/projects/samples/transforms/mysql-bulk-loader.hpl` and `config/projects/samples/actions/requires-setup/mysql-bulk-file-and-load.hwf`. ------------------------ Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Run `mvn clean install apache-rat:check` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [x] If you have a group of commits related to the same change, please squash your commits into one and force push your branch using `git rebase -i`. - [x] Mention the appropriate issue in your description (for example: `addresses #123`), if applicable. To make clear that you license your contribution under the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0) you have to acknowledge this by using the following check-box. - [x] I hereby declare this contribution to be licensed under the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0) - [ ] In any other case, please file an [Apache Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
