Read Felix ConfigAdmin configuration files with latest version (1.9.14), but write it using the old file format form ConfigAdmin 1.8.4 to support AEM 6.1 and below.

Author: stefanseifert

changes.xml

@@ -28,7 +28,7 @@
         aem-contentpackage-properties plugin: Also support "jar" file extension for AEM content packages (but only when explicitly defined as post processor).
       </action>
       <action type="update" dev="sseifert">
-        Update dependencies.
+        Read Felix ConfigAdmin configuration files with latest version (1.9.14), but write it using the old file format form ConfigAdmin 1.8.4 to support AEM 6.1 and below.
       </action>
     </release>
 

conga-aem-plugin/pom.xml

@@ -60,7 +60,7 @@
     <dependency>
       <groupId>io.wcm.devops.conga.plugins</groupId>
       <artifactId>io.wcm.devops.conga.plugins.sling</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
 
@@ -77,12 +77,6 @@
       <scope>compile</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.7</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>com.day.commons</groupId>
       <artifactId>day-commons-any</artifactId>
@@ -106,7 +100,7 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.jcr.contentparser</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.6</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -149,19 +143,19 @@
     <dependency>
       <groupId>org.xmlunit</groupId>
       <artifactId>xmlunit-core</artifactId>
-      <version>2.6.0</version>
+      <version>2.6.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.xmlunit</groupId>
       <artifactId>xmlunit-legacy</artifactId>
-      <version>2.6.0</version>
+      <version>2.6.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.zeroturnaround</groupId>
       <artifactId>zt-zip</artifactId>
-      <version>1.12</version>
+      <version>1.13</version>
       <scope>test</scope>
     </dependency>
 

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/postprocessor/ContentPackageOsgiConfigPostProcessor.java

@@ -36,7 +36,6 @@
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.felix.cm.file.ConfigurationHandler;
 import org.apache.sling.provisioning.model.Model;
 import org.slf4j.Logger;
 
@@ -50,6 +49,7 @@
 import io.wcm.devops.conga.generator.spi.context.PostProcessorContext;
 import io.wcm.devops.conga.plugins.aem.util.ContentPackageUtil;
 import io.wcm.devops.conga.plugins.sling.util.ConfigConsumer;
+import io.wcm.devops.conga.plugins.sling.util.OsgiConfigUtil;
 import io.wcm.devops.conga.plugins.sling.util.ProvisioningUtil;
 import io.wcm.tooling.commons.contentpackagebuilder.ContentPackage;
 import io.wcm.tooling.commons.contentpackagebuilder.ContentPackageBuilder;
@@ -139,7 +139,7 @@ public Void accept(String path, Dictionary<String, Object> properties) throws IO
         // write configuration to temporary file
         File tempFile = File.createTempFile(NAME, ".config");
         try (OutputStream os = new FileOutputStream(tempFile)) {
-          ConfigurationHandler.write(os, properties);
+          OsgiConfigUtil.write(os, properties);
         }
         try {
           FileContext tempFileContext = new FileContext().file(tempFile).charset(StandardCharsets.UTF_8);