This is an automated email from the ASF dual-hosted git repository.
royteeuwen pushed a change to branch feature/additional-feature-files
in repository
https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git
omit dde019c SLING-13233: aggregate additional feature files from
goal-time paths
add f221d5b SLING-13237: optional OSGi Bundle-SymbolicName collision
detection on aggregate
add 76990ea Merge pull request #101 from
apache/feature/SLING-13237-osgi-bsn-collision-detection
add 03c1072 SLING-13233: aggregate additional feature files from
goal-time paths
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (dde019c)
\
N -- N -- N refs/heads/feature/additional-feature-files (03c1072)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
pom.xml | 2 +-
.../org/apache/sling/feature/maven/mojos/Aggregate.java | 13 ++++++++++++-
.../sling/feature/maven/mojos/AggregateFeaturesMojo.java | 4 ++++
.../feature/maven/mojos/AggregateFeaturesMojoTest.java | 14 ++++++++++++++
4 files changed, 31 insertions(+), 2 deletions(-)
