[sling-org-apache-sling-provisioning-model] branch master updated: SLING-9333 : Artifact metadata is incorrectly writing a comma to separate the parameters

[cz...@apache.org]

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-org-apache-sling-provisioning-model.git


The following commit(s) were added to refs/heads/master by this push:
     new 6330b54  SLING-9333 : Artifact metadata is incorrectly writing a comma to separate the parameters
6330b54 is described below

commit 6330b54a142bd3fc5c1e3a8541cd551cb711ef8c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Apr 6 14:00:59 2020 +0200

    SLING-9333 : Artifact metadata is incorrectly writing a comma to separate the parameters
---
 bnd.bnd                                            |  1 +
 pom.xml                                            | 26 ++++++----------------
 .../sling/provisioning/model/io/ModelWriter.java   |  2 +-
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..f800b6d
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1 @@
+-includeresource: @org.apache.felix.configadmin-[0-9.]*.jar!/org/apache/felix/cm/file/ConfigurationHandler.*,\
diff --git a/pom.xml b/pom.xml
index 27f4ac5..a48dde7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,14 +16,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.sling</groupId>
-        <artifactId>sling</artifactId>
-        <version>32</version>
+        <artifactId>sling-bundle-parent</artifactId>
+        <version>38</version>
         <relativePath />
     </parent>
 
     <artifactId>org.apache.sling.provisioning.model</artifactId>
     <version>1.8.5-SNAPSHOT</version>
-    <packaging>bundle</packaging>
 
     <name>Apache Sling Provisioning Model</name>
     <description>
@@ -36,23 +35,12 @@
         <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-provisioning-model.git</url>
     </scm>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Embed-Dependency>
-                            org.apache.felix.configadmin;inline="org/apache/felix/cm/file/ConfigurationHandler.*"
-                        </Embed-Dependency>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
     <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.annotation.versioning</artifactId>
+            <scope>provided</scope>
+        </dependency>
       <!-- We use a class from the config admin implementation to read config files -->
         <dependency>
             <groupId>org.apache.felix</groupId>
diff --git a/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java b/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java
index ab0fa8b..012a2e7 100644
--- a/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java
+++ b/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java
@@ -165,7 +165,7 @@ public class ModelWriter {
                                     first = false;
                                     pw.print(" [");
                                 } else {
-                                    pw.print(", ");
+                                    pw.print(" ");
                                 }
                                 pw.print(entry.getKey());
                                 pw.print("=");