Merge branch 'develop'

wcm-io · Feb 24, 2023 · 1c9113c · 1c9113c
2 parents 7d1bed2 + a394e96
commit 1c9113c
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 26 deletions.
diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>1.12.2-2.21.2</version>
+    <version>1.12.4-2.21.2</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.wcm.core.components</artifactId>
-  <version>1.12.2-2.21.2</version>
+  <version>1.12.4-2.21.2</version>
   <packaging>jar</packaging>
 
   <name>WCM Core Components</name>
@@ -204,7 +204,12 @@
           <bnd>
             Sling-Initial-Content: \
               SLING-INF/app-root;overwrite:=true;ignoreImportProviders:=xml;path:=/apps/wcm-io/wcm/core
-            Sling-Namespaces: wcmio=http://wcm.io/ns
+
+            Sling-Namespaces: \
+              wcmio=http://wcm.io/ns,\
+              cq=http://www.day.com/jcr/cq/1.0,\
+              granite=http://www.adobe.com/jcr/granite/1.0,\
+              sling=http://sling.apache.org/jcr/sling/1.0
 
             <!-- For build compatibility with Java 11 -->
             Import-Package: \

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.12.4-2.21.2" date="2023-02-24">
+      <action type="fix" dev="sseifert">
+        Sling-Initial-Content: Register non-standard JCR namespaces for conversion with cp2fm into enhanced DocView files.
+      </action>
+    </release>
+
     <release version="1.12.2-2.21.2" date="2023-01-12">
       <action type="update" dev="sseifert">
         Update to AEM WCM Core Components 2.21.2.

diff --git a/examples/bundles/examples-core/pom.xml b/examples/bundles/examples-core/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>1.12.2-2.21.2</version>
+    <version>1.12.4-2.21.2</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>
   <artifactId>io.wcm.wcm.core.components.examples-core</artifactId>
-  <version>1.12.2-2.21.2</version>
+  <version>1.12.4-2.21.2</version>
   <packaging>jar</packaging>
 
   <name>WCM Core Components Examples Core</name>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.wcm.core.components</artifactId>
-      <version>1.12.2-2.21.2</version>
+      <version>1.12.4-2.21.2</version>
       <scope>compile</scope>
     </dependency>
 
@@ -70,6 +70,12 @@
               SLING-INF/app-root/templates;overwrite:=true;ignoreImportProviders:=xml;path:=/apps/wcm-io-samples/wcm-core-components/templates, \
               SLING-INF/app-root/clientlibs;overwrite:=true;ignoreImportProviders:=xml;path:=/apps/wcm-io-samples/wcm-core-components/clientlibs
 
+            Sling-Namespaces: \
+              wcmio=http://wcm.io/ns,\
+              cq=http://www.day.com/jcr/cq/1.0,\
+              granite=http://www.adobe.com/jcr/granite/1.0,\
+              sling=http://sling.apache.org/jcr/sling/1.0
+
             <!-- For build compatibility with Java 11 -->
             Import-Package: \
               javax.annotation;version="[0.0,2)",\

diff --git a/examples/content-packages/examples-libs/pom.xml b/examples/content-packages/examples-libs/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>1.12.2-2.21.2</version>
+    <version>1.12.4-2.21.2</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>  
   <artifactId>io.wcm.wcm.core.components.examples-libs</artifactId>
-  <version>1.12.2-2.21.2</version>
+  <version>1.12.4-2.21.2</version>
   <packaging>content-package</packaging>
 
   <name>WCM Core Components Examples wcm.io Libraries</name>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.wcm.core.components</artifactId>
-      <version>1.12.2-2.21.2</version>
+      <version>1.12.4-2.21.2</version>
       <scope>compile</scope>
     </dependency>
 
@@ -143,7 +143,7 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.caconfig.editor</artifactId>
-        <version>1.15.2</version>
+        <version>1.15.4</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
@@ -168,12 +168,12 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.handler.link</artifactId>
-        <version>1.10.0</version>
+        <version>1.10.2</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.handler.media</artifactId>
-        <version>1.15.2</version>
+        <version>1.15.4</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
@@ -188,7 +188,7 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.wcm.ui.granite</artifactId>
-        <version>1.9.8</version>
+        <version>1.9.10</version>
       </dependency>
 
     </dependencies>

diff --git a/examples/content-packages/examples-sample-content/pom.xml b/examples/content-packages/examples-sample-content/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>1.12.2-2.21.2</version>
+    <version>1.12.4-2.21.2</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>  
   <artifactId>io.wcm.wcm.core.components.examples-sample-content</artifactId>
-  <version>1.12.2-2.21.2</version>
+  <version>1.12.4-2.21.2</version>
   <packaging>content-package</packaging>
 
   <name>WCM Core Components Examples Content</name>

diff --git a/examples/content-packages/examples/pom.xml b/examples/content-packages/examples/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>1.12.2-2.21.2</version>
+    <version>1.12.4-2.21.2</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>  
   <artifactId>io.wcm.wcm.core.components.examples</artifactId>
-  <version>1.12.2-2.21.2</version>
+  <version>1.12.4-2.21.2</version>
   <packaging>content-package</packaging>
 
   <name>WCM Core Components Examples</name>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>io.wcm.samples</groupId>  
       <artifactId>io.wcm.wcm.core.components.examples-core</artifactId>
-      <version>1.12.2-2.21.2</version>
+      <version>1.12.4-2.21.2</version>
       <scope>compile</scope>
     </dependency>
 

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>1.12.2-2.21.2</version>
+    <version>1.12.4-2.21.2</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>
   <artifactId>io.wcm.wcm.core.components.examples.root</artifactId>
-  <version>1.12.2-2.21.2</version>
+  <version>1.12.4-2.21.2</version>
   <packaging>pom</packaging>
 
   <modules>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -31,25 +31,30 @@
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-  <version>1.12.2-2.21.2</version>
+  <version>1.12.4-2.21.2</version>
   <packaging>pom</packaging>
 
   <name>WCM Core Components</name>
   <description>Enhances AEM WCM Core Components with wcm.io functionality.</description>
-  
+
   <ciManagement>
     <system>GitHub Actions</system>
-    <url>https://github.com/wcm-io/wcm-io-wcm-core-components/actions</url>
+    <url>https://github.com/wcm-io/io.wcm.wcm.core.components/actions</url>
   </ciManagement>
 
+  <issueManagement>
+    <system>GitHub</system>
+    <url>https://github.com/wcm-io/io.wcm.wcm.core.components/issues/</url>
+  </issueManagement>
+
   <properties>
     <core.wcm.components.version>2.21.2</core.wcm.components.version>
 
     <sling.url>http://localhost:4502</sling.url>
     <sling.publish.url>http://localhost:4503</sling.publish.url>
 
     <!-- Enable reproducible builds -->
-    <project.build.outputTimestamp>2023-01-12T21:29:46Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2023-02-24T15:12:45Z</project.build.outputTimestamp>
   </properties>
 
   <dependencyManagement>

diff --git a/pom.xml b/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>1.12.2-2.21.2</version>
+    <version>1.12.4-2.21.2</version>
     <relativePath>parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.wcm.core.components.root</artifactId>
-  <version>1.12.2-2.21.2</version>
+  <version>1.12.4-2.21.2</version>
   <packaging>pom</packaging>
   <url>${site.url}/${site.url.module.prefix}/</url>