ProvisioningOsgiConfigPostProcessor: Write OSGi configurations as .cf…

…g.json files instead of .config files (#6)
wcm-io-devops · Jan 9, 2024 · 17ddd48 · 17ddd48
1 parent a81b1e0
commit 17ddd48
Show file tree

Hide file tree

Showing 10 changed files with 72 additions and 761 deletions.
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,15 @@
     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.4.0" date="not released">
+      <action type="add" dev="sseifert" issue="6">
+        Add OsgiCfgJsonFileHeader to provide file header support for .cfg.json files.
+      </action>
+      <action type="update" dev="sseifert" issue="6">
+        ProvisioningOsgiConfigPostProcessor: Write OSGi configurations as .cfg.json files instead of .config files.
+      </action>
+    </release>
+
     <release version="1.3.4" date="2023-11-20">
       <action type="fix" dev="sseifert" issue="5">
         Generate run modes for configurations in order as expected by AEM Analyser Plugin.

diff --git a/conga-sling-plugin/pom.xml b/conga-sling-plugin/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.devops.conga.plugins</groupId>
     <artifactId>io.wcm.devops.conga.plugins.sling.parent</artifactId>
-    <version>1.3.5-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.sling</artifactId>
-  <version>1.3.5-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>CONGA Sling Plugin</name>
@@ -60,15 +60,14 @@
     <dependency>
       <groupId>io.wcm.devops.conga</groupId>
       <artifactId>io.wcm.devops.conga.generator</artifactId>
-      <version>1.16.2</version>
+      <version>1.16.5-SNAPSHOT</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>
-      <!-- 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.26</version>
       <scope>compile</scope>
     </dependency>
@@ -80,6 +79,31 @@
       <scope>compile</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.felix</groupId>      
+      <artifactId>org.apache.felix.cm.json</artifactId>
+      <version>2.0.4</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.json</groupId>
+      <artifactId>jakarta.json-api</artifactId>
+      <version>2.1.3</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.parsson</groupId>
+      <artifactId>parsson</artifactId>
+      <version>1.1.5</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.util.converter</artifactId>
+      <version>1.0.9</version>
+      <scope>compile</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>

diff --git a/conga-sling-plugin/src/it/example/pom.xml b/conga-sling-plugin/src/it/example/pom.xml
@@ -45,7 +45,7 @@
       <plugin>
         <groupId>io.wcm.devops.conga</groupId>
         <artifactId>conga-maven-plugin</artifactId>
-        <version>1.16.2</version>
+        <version>1.16.5-SNAPSHOT</version>
         <extensions>true</extensions>
         <dependencies>