You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2026/05/19 19:13:28 UTC

(sling-org-apache-sling-feature) branch master updated (f8872f2 -> d0644d0)

This is an automated email from the ASF dual-hosted git repository.

royteeuwen pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature.git


    from f8872f2  SLING-12866 - Restrict force pushes, auto-delete branches on merge
     add 73a41e6  SLING-13197: add OSGi bsn collision detection
     new d0644d0  Merge pull request #37 from apache/feature/osgi-identity-collision-check

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 docs/aggregation.md                                |  40 +++-
 docs/features.md                                   |   2 +-
 pom.xml                                            |   2 +-
 .../sling/feature/builder/BuilderContext.java      |  27 +++
 .../sling/feature/builder/FeatureBuilder.java      |   4 +
 .../sling/feature/builder/OsgiBsnDeduplicator.java | 193 +++++++++++++++
 .../apache/sling/feature/builder/package-info.java |   2 +-
 .../feature/builder/OsgiBsnDeduplicatorTest.java   | 263 +++++++++++++++++++++
 8 files changed, 529 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/org/apache/sling/feature/builder/OsgiBsnDeduplicator.java
 create mode 100644 src/test/java/org/apache/sling/feature/builder/OsgiBsnDeduplicatorTest.java


(sling-org-apache-sling-feature) 01/01: Merge pull request #37 from apache/feature/osgi-identity-collision-check

Posted by ro...@apache.org.
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-org-apache-sling-feature.git

commit d0644d0f525f80a30587229769cac6cf1683fd38
Merge: f8872f2 73a41e6
Author: Roy Teeuwen <ro...@apache.org>
AuthorDate: Tue May 19 21:13:21 2026 +0200

    Merge pull request #37 from apache/feature/osgi-identity-collision-check
    
    SLING-13197: add OSGi bsn collision detection

 docs/aggregation.md                                |  40 +++-
 docs/features.md                                   |   2 +-
 pom.xml                                            |   2 +-
 .../sling/feature/builder/BuilderContext.java      |  27 +++
 .../sling/feature/builder/FeatureBuilder.java      |   4 +
 .../sling/feature/builder/OsgiBsnDeduplicator.java | 193 +++++++++++++++
 .../apache/sling/feature/builder/package-info.java |   2 +-
 .../feature/builder/OsgiBsnDeduplicatorTest.java   | 263 +++++++++++++++++++++
 8 files changed, 529 insertions(+), 4 deletions(-)