[sling-slingfeature-maven-plugin] branch master updated: SLING-11076 : Remove attributes from bsn

[cziegeler]

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

cziegeler pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new dfd38fb  SLING-11076 : Remove attributes from bsn
dfd38fb is described below

commit dfd38fb40e1c221dc92caa0d39eedb1d1241f4b5
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Wed Jan 19 13:28:54 2022 +0100

    SLING-11076 : Remove attributes from bsn
---
 pom.xml                                                             | 6 +++---
 .../org/apache/sling/feature/maven/mojos/AttachFeaturesMojo.java    | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 04dfd9b..8295906 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     </parent>
 
     <artifactId>slingfeature-maven-plugin</artifactId>
-    <version>1.5.19-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
 
     <name>Apache Sling OSGi Feature Maven Plugin</name>
@@ -173,7 +173,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.feature.analyser</artifactId>
-            <version>1.5.2</version>
+            <version>1.6.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -183,7 +183,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             
<artifactId>org.apache.sling.feature.extension.apiregions</artifactId>
-            <version>1.4.4</version>
+            <version>1.5.0-SNAPSHOT</version>
         </dependency>
         <!-- aux dependencies for Content-Package check -->
         <dependency>
diff --git 
a/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeaturesMojo.java 
b/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeaturesMojo.java
index 12cfa23..7e62ce6 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeaturesMojo.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeaturesMojo.java
@@ -108,7 +108,8 @@ public class AttachFeaturesMojo extends AbstractFeatureMojo 
{
                             final String symbolicName = 
jarFile.getManifest().getMainAttributes().getValue(Constants.BUNDLE_SYMBOLICNAME);
                             final String version = 
jarFile.getManifest().getMainAttributes().getValue(Constants.BUNDLE_VERSION);
                             if ( symbolicName != null && version != null ) {
-                                value = new 
AbstractMap.SimpleImmutableEntry<>(symbolicName, version);
+                                final int idx = symbolicName.indexOf(";");
+                                value = new 
AbstractMap.SimpleImmutableEntry<>(idx == -1 ? symbolicName : 
symbolicName.substring(0, idx), version);
                             }
                         } catch (final IOException e) {
                             // we ignore this