[jgitflow-maven-plugin] merging 'release/1.2.6' into 'master'

wcm-io-devops · May 8, 2019 · 399754a · 399754a
2 parents 64bd804 + 6889c7d
commit 399754a
Show file tree

Hide file tree

Showing 14 changed files with 847 additions and 60 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,16 +21,17 @@ language: java
 
 jdk:
 - oraclejdk8
+- openjdk11
 
 # Make sure travis can use container-based infrastructure
 sudo: false
 
 install: "mvn -s ./.travis.maven-settings.xml clean"
 
 script:
-- "mvn -s ./.travis.maven-settings.xml -Pcontinuous-integration -U -Dmaven.javadoc.skip=true install"
+- "mvn -s ./.travis.maven-settings.xml -Pcontinuous-integration -U install"
 # Separate build for example due to dependeny on conga-maven-plugin
-- "mvn -s ./.travis.maven-settings.xml -Pcontinuous-integration -U -Dmaven.javadoc.skip=true install -f example"
+- "mvn -s ./.travis.maven-settings.xml -Pcontinuous-integration -U install -f example"
 # Remove wcm.io artefacts from repository before cache
 - rm -rf $HOME/.m2/repository/io/wcm
 

diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="1.2.6" date="2019-05-08">
+      <action type="update" dev="sseifert">
+        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>
+
     <release version="1.2.4" date="2018-01-15">
       <action type="update" dev="sseifert">
         Update to latest CONGA SPI.

diff --git a/conga-sling-plugin/pom.xml b/conga-sling-plugin/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.0.10</version>
+    <version>1.1.4</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.sling</artifactId>
-  <version>1.2.4</version>
+  <version>1.2.6</version>
   <packaging>jar</packaging>
 
   <name>CONGA Sling Plugin</name>
@@ -47,29 +47,29 @@
   <properties>
     <site.url.module.prefix>conga/plugins/sling/conga-sling-plugin</site.url.module.prefix>
   </properties>
-  
+
   <dependencies>
 
     <dependency>
       <groupId>io.wcm.devops.conga</groupId>
       <artifactId>io.wcm.devops.conga.generator</artifactId>
-      <version>1.5.0</version>
+      <version>1.11.0</version>
       <scope>compile</scope>
     </dependency>
 
     <!-- Place this dependency always before the provisiong.model because this includes ConfigurationHandler as well -->
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.configadmin</artifactId>
-      <!-- Not use version 1.8.6 or above because arrays with multiple lines are not supported by older configadmin versions -->
-      <version>1.8.4</version>
+      <!-- Support latest config file format for reading, stick with version 1.8.4 for writing (ConfigurationHandler class is copied to this plugin) -->
+      <version>1.9.14</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.provisioning.model</artifactId>
-      <version>1.4.2</version>
+      <version>1.8.4</version>
       <scope>compile</scope>
     </dependency>
 

diff --git a/.../io/wcm/devops/conga/plugins/sling/postprocessor/ProvisioningOsgiConfigPostProcessor.java b/.../io/wcm/devops/conga/plugins/sling/postprocessor/ProvisioningOsgiConfigPostProcessor.java
@@ -26,14 +26,14 @@
 import java.util.Dictionary;
 import java.util.List;
 
-import org.apache.felix.cm.file.ConfigurationHandler;
 import org.apache.sling.provisioning.model.Model;
 
 import io.wcm.devops.conga.generator.GeneratorException;
 import io.wcm.devops.conga.generator.spi.PostProcessorPlugin;
 import io.wcm.devops.conga.generator.spi.context.FileContext;
 import io.wcm.devops.conga.generator.spi.context.PostProcessorContext;
 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;
 
 /**
@@ -91,7 +91,7 @@ public FileContext accept(String path, Dictionary<String, Object> properties) th
         File confFile = new File(dir, path);
         confFile.getParentFile().mkdirs();
         try (FileOutputStream os = new FileOutputStream(confFile)) {
-          ConfigurationHandler.write(os, properties);
+          OsgiConfigUtil.write(os, properties);
         }
 
         return new FileContext().file(confFile).charset(StandardCharsets.UTF_8);