SLING-9218 configuration writeback must emit comments starting with
correct prefix
diff --git a/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java b/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
index 371a5cc..5d8dcc1 100644
--- a/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
+++ b/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
@@ -586,17 +586,6 @@
}
/**
- * @see org.apache.sling.installer.api.UpdateHandler#handleUpdate(java.lang.String, java.lang.String, java.lang.String, java.util.Dictionary, Map)
- */
- public UpdateResult handleUpdate(final String resourceType,
- final String id,
- final String url,
- final Dictionary<String, Object> dict,
- final Map<String, Object> attributes) {
- return this.handleUpdate(resourceType, id, url, null, dict, attributes);
- }
-
- /**
* @see org.apache.sling.installer.api.UpdateHandler#handleUpdate(java.lang.String, java.lang.String, java.lang.String, java.io.InputStream, Map)
*/
public UpdateResult handleUpdate(final String resourceType,
@@ -692,7 +681,8 @@
// write to a byte array stream
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- baos.write("# Configuration created by Apache Sling JCR Installer\n".getBytes("UTF-8"));
+ // comments starting with "//" allowed according to https://osgi.org/specification/osgi.cmpn/7.0.0/service.configurator.html#d0e131566
+ baos.write("// Configuration created by Apache Sling JCR Installer\n".getBytes("UTF-8"));
ConfigurationSerializer serializer = ConfigurationSerializerFactory.create(ConfigurationSerializerFactory.Format.JSON);
serializer.serialize(dict, baos);
baos.close();