This is an automated email from the ASF dual-hosted git repository. royteeuwen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git
commit 9e47cf3bc526beabd241758ccbf2dae848ae1da2 Merge: 76990ea 03c1072 Author: Roy Teeuwen <[email protected]> AuthorDate: Wed Jun 10 21:27:46 2026 +0200 Merge pull request #100 from apache/feature/additional-feature-files SLING-13233: aggregate features from goal-time paths with optional OSGi BSN collision detection .../sling/feature/maven/mojos/Aggregate.java | 17 ++++++++- .../feature/maven/mojos/AggregateFeaturesMojo.java | 33 ++++++++++++++++ .../maven/mojos/AggregateFeaturesMojoTest.java | 44 ++++++++++++++++++++++ 3 files changed, 92 insertions(+), 2 deletions(-)
