Skip to content

Commit 1c9113c

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 7d1bed2 + a394e96 commit 1c9113c

File tree

9 files changed

+48
-26
lines changed

9 files changed

+48
-26
lines changed

‎bundles/core/pom.xml

+8-3
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.wcm.core.components.parent</artifactId>
28-
<version>1.12.2-2.21.2</version>
28+
<version>1.12.4-2.21.2</version>
2929
<relativePath>../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm</groupId>
3333
<artifactId>io.wcm.wcm.core.components</artifactId>
34-
<version>1.12.2-2.21.2</version>
34+
<version>1.12.4-2.21.2</version>
3535
<packaging>jar</packaging>
3636

3737
<name>WCM Core Components</name>
@@ -204,7 +204,12 @@
204204
<bnd>
205205
Sling-Initial-Content: \
206206
SLING-INF/app-root;overwrite:=true;ignoreImportProviders:=xml;path:=/apps/wcm-io/wcm/core
207-
Sling-Namespaces: wcmio=http://wcm.io/ns
207+
208+
Sling-Namespaces: \
209+
wcmio=http://wcm.io/ns,\
210+
cq=http://www.day.com/jcr/cq/1.0,\
211+
granite=http://www.adobe.com/jcr/granite/1.0,\
212+
sling=http://sling.apache.org/jcr/sling/1.0
208213

209214
<!-- For build compatibility with Java 11 -->
210215
Import-Package: \

‎changes.xml

+6
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
2424
<body>
2525

26+
<release version="1.12.4-2.21.2" date="2023-02-24">
27+
<action type="fix" dev="sseifert">
28+
Sling-Initial-Content: Register non-standard JCR namespaces for conversion with cp2fm into enhanced DocView files.
29+
</action>
30+
</release>
31+
2632
<release version="1.12.2-2.21.2" date="2023-01-12">
2733
<action type="update" dev="sseifert">
2834
Update to AEM WCM Core Components 2.21.2.

‎examples/bundles/examples-core/pom.xml

+9-3
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.wcm.core.components.parent</artifactId>
28-
<version>1.12.2-2.21.2</version>
28+
<version>1.12.4-2.21.2</version>
2929
<relativePath>../../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.samples</groupId>
3333
<artifactId>io.wcm.wcm.core.components.examples-core</artifactId>
34-
<version>1.12.2-2.21.2</version>
34+
<version>1.12.4-2.21.2</version>
3535
<packaging>jar</packaging>
3636

3737
<name>WCM Core Components Examples Core</name>
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>io.wcm</groupId>
4646
<artifactId>io.wcm.wcm.core.components</artifactId>
47-
<version>1.12.2-2.21.2</version>
47+
<version>1.12.4-2.21.2</version>
4848
<scope>compile</scope>
4949
</dependency>
5050

@@ -70,6 +70,12 @@
7070
SLING-INF/app-root/templates;overwrite:=true;ignoreImportProviders:=xml;path:=/apps/wcm-io-samples/wcm-core-components/templates, \
7171
SLING-INF/app-root/clientlibs;overwrite:=true;ignoreImportProviders:=xml;path:=/apps/wcm-io-samples/wcm-core-components/clientlibs
7272

73+
Sling-Namespaces: \
74+
wcmio=http://wcm.io/ns,\
75+
cq=http://www.day.com/jcr/cq/1.0,\
76+
granite=http://www.adobe.com/jcr/granite/1.0,\
77+
sling=http://sling.apache.org/jcr/sling/1.0
78+
7379
<!-- For build compatibility with Java 11 -->
7480
Import-Package: \
7581
javax.annotation;version="[0.0,2)",\

‎examples/content-packages/examples-libs/pom.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.wcm.core.components.parent</artifactId>
28-
<version>1.12.2-2.21.2</version>
28+
<version>1.12.4-2.21.2</version>
2929
<relativePath>../../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.samples</groupId>
3333
<artifactId>io.wcm.wcm.core.components.examples-libs</artifactId>
34-
<version>1.12.2-2.21.2</version>
34+
<version>1.12.4-2.21.2</version>
3535
<packaging>content-package</packaging>
3636

3737
<name>WCM Core Components Examples wcm.io Libraries</name>
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>io.wcm</groupId>
4444
<artifactId>io.wcm.wcm.core.components</artifactId>
45-
<version>1.12.2-2.21.2</version>
45+
<version>1.12.4-2.21.2</version>
4646
<scope>compile</scope>
4747
</dependency>
4848

@@ -143,7 +143,7 @@
143143
<dependency>
144144
<groupId>io.wcm</groupId>
145145
<artifactId>io.wcm.caconfig.editor</artifactId>
146-
<version>1.15.2</version>
146+
<version>1.15.4</version>
147147
</dependency>
148148
<dependency>
149149
<groupId>io.wcm</groupId>
@@ -168,12 +168,12 @@
168168
<dependency>
169169
<groupId>io.wcm</groupId>
170170
<artifactId>io.wcm.handler.link</artifactId>
171-
<version>1.10.0</version>
171+
<version>1.10.2</version>
172172
</dependency>
173173
<dependency>
174174
<groupId>io.wcm</groupId>
175175
<artifactId>io.wcm.handler.media</artifactId>
176-
<version>1.15.2</version>
176+
<version>1.15.4</version>
177177
</dependency>
178178
<dependency>
179179
<groupId>io.wcm</groupId>
@@ -188,7 +188,7 @@
188188
<dependency>
189189
<groupId>io.wcm</groupId>
190190
<artifactId>io.wcm.wcm.ui.granite</artifactId>
191-
<version>1.9.8</version>
191+
<version>1.9.10</version>
192192
</dependency>
193193

194194
</dependencies>

‎examples/content-packages/examples-sample-content/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.wcm.core.components.parent</artifactId>
28-
<version>1.12.2-2.21.2</version>
28+
<version>1.12.4-2.21.2</version>
2929
<relativePath>../../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.samples</groupId>
3333
<artifactId>io.wcm.wcm.core.components.examples-sample-content</artifactId>
34-
<version>1.12.2-2.21.2</version>
34+
<version>1.12.4-2.21.2</version>
3535
<packaging>content-package</packaging>
3636

3737
<name>WCM Core Components Examples Content</name>

‎examples/content-packages/examples/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.wcm.core.components.parent</artifactId>
28-
<version>1.12.2-2.21.2</version>
28+
<version>1.12.4-2.21.2</version>
2929
<relativePath>../../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.samples</groupId>
3333
<artifactId>io.wcm.wcm.core.components.examples</artifactId>
34-
<version>1.12.2-2.21.2</version>
34+
<version>1.12.4-2.21.2</version>
3535
<packaging>content-package</packaging>
3636

3737
<name>WCM Core Components Examples</name>
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>io.wcm.samples</groupId>
4444
<artifactId>io.wcm.wcm.core.components.examples-core</artifactId>
45-
<version>1.12.2-2.21.2</version>
45+
<version>1.12.4-2.21.2</version>
4646
<scope>compile</scope>
4747
</dependency>
4848

‎examples/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.wcm.core.components.parent</artifactId>
28-
<version>1.12.2-2.21.2</version>
28+
<version>1.12.4-2.21.2</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.samples</groupId>
3333
<artifactId>io.wcm.wcm.core.components.examples.root</artifactId>
34-
<version>1.12.2-2.21.2</version>
34+
<version>1.12.4-2.21.2</version>
3535
<packaging>pom</packaging>
3636

3737
<modules>

‎parent/pom.xml

+9-4
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,30 @@
3131

3232
<groupId>io.wcm</groupId>
3333
<artifactId>io.wcm.wcm.core.components.parent</artifactId>
34-
<version>1.12.2-2.21.2</version>
34+
<version>1.12.4-2.21.2</version>
3535
<packaging>pom</packaging>
3636

3737
<name>WCM Core Components</name>
3838
<description>Enhances AEM WCM Core Components with wcm.io functionality.</description>
39-
39+
4040
<ciManagement>
4141
<system>GitHub Actions</system>
42-
<url>https://github.com/wcm-io/wcm-io-wcm-core-components/actions</url>
42+
<url>https://github.com/wcm-io/io.wcm.wcm.core.components/actions</url>
4343
</ciManagement>
4444

45+
<issueManagement>
46+
<system>GitHub</system>
47+
<url>https://github.com/wcm-io/io.wcm.wcm.core.components/issues/</url>
48+
</issueManagement>
49+
4550
<properties>
4651
<core.wcm.components.version>2.21.2</core.wcm.components.version>
4752

4853
<sling.url>http://localhost:4502</sling.url>
4954
<sling.publish.url>http://localhost:4503</sling.publish.url>
5055

5156
<!-- Enable reproducible builds -->
52-
<project.build.outputTimestamp>2023-01-12T21:29:46Z</project.build.outputTimestamp>
57+
<project.build.outputTimestamp>2023-02-24T15:12:45Z</project.build.outputTimestamp>
5358
</properties>
5459

5560
<dependencyManagement>

‎pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.wcm.core.components.parent</artifactId>
28-
<version>1.12.2-2.21.2</version>
28+
<version>1.12.4-2.21.2</version>
2929
<relativePath>parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm</groupId>
3333
<artifactId>io.wcm.wcm.core.components.root</artifactId>
34-
<version>1.12.2-2.21.2</version>
34+
<version>1.12.4-2.21.2</version>
3535
<packaging>pom</packaging>
3636
<url>${site.url}/${site.url.module.prefix}/</url>
3737

0 commit comments

Comments
 (0)