Skip to content

Commit 7219417

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 7bcc020 + e21d8be commit 7219417

File tree

13 files changed

+88
-233
lines changed

13 files changed

+88
-233
lines changed

‎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 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
2424
<body>
2525

26+
<release version="2.19.10" date="2023-12-18">
27+
<action type="fix" dev="sseifert">
28+
Update to latest io.wcm.tooling.commons.content-package-builder to fix potential problem with element ordering content packages generated from JSON files.
29+
</action>
30+
</release>
31+
2632
<release version="2.19.8" date="2023-10-18">
2733
<action type="fix" dev="trichter" issue="73">
2834
Increase SnakeYAML codepoint limit to 64MB (from default 3MB).

‎conga-aem-plugin/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm.devops.conga.plugins</groupId>
2727
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
28-
<version>2.19.8</version>
28+
<version>2.19.10</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
34-
<version>2.19.8</version>
34+
<version>2.19.10</version>
3535
<packaging>jar</packaging>
3636

3737
<name>CONGA AEM Plugin</name>

‎parent/pom.xml

+9-9
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
34-
<version>2.19.8</version>
34+
<version>2.19.10</version>
3535
<packaging>pom</packaging>
3636

3737
<name>CONGA AEM Plugin</name>
@@ -48,7 +48,7 @@
4848

4949
<properties>
5050
<maven.version>3.3.9</maven.version>
51-
<oak.version>1.58.0</oak.version>
51+
<oak.version>1.60.0</oak.version>
5252
</properties>
5353

5454
<dependencyManagement>
@@ -68,7 +68,7 @@
6868
<dependency>
6969
<groupId>io.wcm.devops.conga.plugins</groupId>
7070
<artifactId>io.wcm.devops.conga.plugins.sling</artifactId>
71-
<version>1.3.0</version>
71+
<version>1.3.4</version>
7272
</dependency>
7373

7474
<dependency>
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>io.wcm.tooling.commons</groupId>
8282
<artifactId>io.wcm.tooling.commons.content-package-builder</artifactId>
83-
<version>1.7.0</version>
83+
<version>1.7.2</version>
8484
</dependency>
8585
<dependency>
8686
<groupId>io.wcm.tooling.commons</groupId>
@@ -91,7 +91,7 @@
9191
<dependency>
9292
<groupId>org.apache.jackrabbit</groupId>
9393
<artifactId>filevault-package-maven-plugin</artifactId>
94-
<version>1.3.4</version>
94+
<version>1.3.6</version>
9595
</dependency>
9696

9797
<dependency>
@@ -108,22 +108,22 @@
108108
<dependency>
109109
<groupId>org.apache.commons</groupId>
110110
<artifactId>commons-compress</artifactId>
111-
<version>1.24.0</version>
111+
<version>1.25.0</version>
112112
</dependency>
113113
<dependency>
114114
<groupId>commons-cli</groupId>
115115
<artifactId>commons-cli</artifactId>
116-
<version>1.5.0</version>
116+
<version>1.6.0</version>
117117
</dependency>
118118
<dependency>
119119
<groupId>org.apache.commons</groupId>
120120
<artifactId>commons-lang3</artifactId>
121-
<version>3.13.0</version>
121+
<version>3.14.0</version>
122122
</dependency>
123123
<dependency>
124124
<groupId>commons-io</groupId>
125125
<artifactId>commons-io</artifactId>
126-
<version>2.14.0</version>
126+
<version>2.15.1</version>
127127
</dependency>
128128

129129
<dependency>

‎pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
<parent>
2424
<groupId>io.wcm.devops.conga.plugins</groupId>
2525
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
26-
<version>2.19.8</version>
26+
<version>2.19.10</version>
2727
<relativePath>parent/pom.xml</relativePath>
2828
</parent>
2929

3030
<groupId>io.wcm.devops.conga.plugins</groupId>
3131
<artifactId>io.wcm.devops.conga.plugins.aem.root</artifactId>
32-
<version>2.19.8</version>
32+
<version>2.19.10</version>
3333
<packaging>pom</packaging>
3434

3535
<name>CONGA AEM Plugin</name>

‎tooling/conga-aem-crypto-cli/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
<parent>
2626
<groupId>io.wcm.devops.conga.plugins</groupId>
2727
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
28-
<version>2.19.8</version>
28+
<version>2.19.10</version>
2929
<relativePath>../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>conga-aem-crypto-cli</artifactId>
3434
<packaging>jar</packaging>
35-
<version>2.19.8</version>
35+
<version>2.19.10</version>
3636

3737
<name>CONGA AEM Crypto Command Line Interface</name>
3838
<description>Command line tool to generate Crypto keys for AEM.</description>
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>io.wcm.devops.conga.plugins</groupId>
4444
<artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
45-
<version>2.19.8</version>
45+
<version>2.19.10</version>
4646
<scope>compile</scope>
4747
<exclusions>
4848
<!-- Exclude all deps - only crypto util classes are used -->

‎tooling/conga-aem-maven-plugin/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
<parent>
2626
<groupId>io.wcm.devops.conga.plugins</groupId>
2727
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
28-
<version>2.19.8</version>
28+
<version>2.19.10</version>
2929
<relativePath>../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>conga-aem-maven-plugin</artifactId>
3434
<packaging>maven-plugin</packaging>
35-
<version>2.19.8</version>
35+
<version>2.19.10</version>
3636

3737
<name>CONGA AEM Maven Plugin</name>
3838
<description>wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM</description>
@@ -41,7 +41,7 @@
4141
<site.url.module.prefix>tooling/conga-aem-maven-plugin</site.url.module.prefix>
4242

4343
<!-- Versions -->
44-
<maven-plugin-plugin.version>3.9.0</maven-plugin-plugin.version>
44+
<maven-plugin-plugin.version>3.10.2</maven-plugin-plugin.version>
4545

4646
<!-- Enable recording of coverage during execution of maven-invoker-plugin -->
4747
<jacoco.propertyName>invoker.mavenOpts</jacoco.propertyName>
@@ -62,7 +62,7 @@
6262
<dependency>
6363
<groupId>io.wcm.devops.conga.plugins</groupId>
6464
<artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
65-
<version>2.19.8</version>
65+
<version>2.19.10</version>
6666
<scope>compile</scope>
6767
</dependency>
6868
<dependency>

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/bundles/core/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@
182182
<dependency>
183183
<groupId>com.adobe.aem</groupId>
184184
<artifactId>uber-jar</artifactId>
185-
<classifier>apis</classifier>
186185
<scope>provided</scope>
187186
</dependency>
188187
<dependency>

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/parent/pom.xml

+25-25
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.wcm.maven</groupId>
77
<artifactId>io.wcm.maven.aem-global-parent</artifactId>
8-
<version>2.0.16</version>
8+
<version>2.1.12</version>
99
<relativePath/>
1010
</parent>
1111

@@ -29,8 +29,8 @@
2929
<eclipse.settings.nullanalysis>enabled</eclipse.settings.nullanalysis>
3030

3131
<!-- Versions -->
32-
<core.wcm.components.version>2.21.0</core.wcm.components.version>
33-
<acs.aem.commons.version>5.3.2</acs.aem.commons.version>
32+
<core.wcm.components.version>2.23.4</core.wcm.components.version>
33+
<acs.aem.commons.version>6.3.0</acs.aem.commons.version>
3434

3535
<!-- Enable reproducible builds -->
3636
<project.build.outputTimestamp>2021-01-01T00:00:00Z</project.build.outputTimestamp>
@@ -84,12 +84,12 @@
8484
<dependency>
8585
<groupId>org.apache.sling</groupId>
8686
<artifactId>org.apache.sling.models.api</artifactId>
87-
<version>1.4.0</version>
87+
<version>1.5.0</version>
8888
</dependency>
8989
<dependency>
9090
<groupId>org.apache.sling</groupId>
9191
<artifactId>org.apache.sling.models.impl</artifactId>
92-
<version>1.5.0</version>
92+
<version>1.6.4</version>
9393
</dependency>
9494

9595
<!-- Latest Sling Context-Aware Configuration bundles -->
@@ -118,17 +118,17 @@
118118
<dependency>
119119
<groupId>io.wcm</groupId>
120120
<artifactId>io.wcm.caconfig.extensions</artifactId>
121-
<version>1.9.0</version>
121+
<version>1.9.4</version>
122122
</dependency>
123123
<dependency>
124124
<groupId>io.wcm</groupId>
125125
<artifactId>io.wcm.caconfig.editor</artifactId>
126-
<version>1.13.0</version>
126+
<version>1.15.6</version>
127127
</dependency>
128128
<dependency>
129129
<groupId>io.wcm</groupId>
130130
<artifactId>io.wcm.sling.commons</artifactId>
131-
<version>1.5.0</version>
131+
<version>1.6.4</version>
132132
</dependency>
133133
<dependency>
134134
<groupId>io.wcm</groupId>
@@ -138,17 +138,17 @@
138138
<dependency>
139139
<groupId>io.wcm</groupId>
140140
<artifactId>io.wcm.wcm.commons</artifactId>
141-
<version>1.9.0</version>
141+
<version>1.10.0</version>
142142
</dependency>
143143
<dependency>
144144
<groupId>io.wcm</groupId>
145145
<artifactId>io.wcm.wcm.parsys</artifactId>
146-
<version>1.6.8</version>
146+
<version>1.7.0</version>
147147
</dependency>
148148
<dependency>
149149
<groupId>io.wcm</groupId>
150150
<artifactId>io.wcm.wcm.ui.granite</artifactId>
151-
<version>1.9.8</version>
151+
<version>1.9.14</version>
152152
</dependency>
153153
<dependency>
154154
<groupId>io.wcm</groupId>
@@ -158,44 +158,44 @@
158158
<dependency>
159159
<groupId>io.wcm</groupId>
160160
<artifactId>io.wcm.handler.commons</artifactId>
161-
<version>1.4.4</version>
161+
<version>1.5.0</version>
162162
</dependency>
163163
<dependency>
164164
<groupId>io.wcm</groupId>
165165
<artifactId>io.wcm.handler.url</artifactId>
166-
<version>1.9.0</version>
166+
<version>1.10.2</version>
167167
</dependency>
168168
<dependency>
169169
<groupId>io.wcm</groupId>
170170
<artifactId>io.wcm.handler.media</artifactId>
171-
<version>1.14.12</version>
171+
<version>1.15.8</version>
172172
</dependency>
173173
<dependency>
174174
<groupId>io.wcm</groupId>
175175
<artifactId>io.wcm.handler.link</artifactId>
176-
<version>1.9.2</version>
176+
<version>1.10.2</version>
177177
</dependency>
178178
<dependency>
179179
<groupId>io.wcm</groupId>
180180
<artifactId>io.wcm.handler.richtext</artifactId>
181-
<version>1.6.0</version>
181+
<version>1.6.4</version>
182182
</dependency>
183183
<dependency>
184184
<groupId>io.wcm</groupId>
185185
<artifactId>io.wcm.wcm.core.components</artifactId>
186-
<version>1.12.0-2.20.0</version>
186+
<version>1.14.0-2.23.2</version>
187187
</dependency>
188188
<dependency>
189189
<groupId>io.wcm.devops.conga.definitions</groupId>
190190
<artifactId>io.wcm.devops.conga.definitions.aem</artifactId>
191-
<version>1.13.0</version>
191+
<version>2.0.2</version>
192192
</dependency>
193193

194194
<!-- wcm.io Testing -->
195195
<dependency>
196196
<groupId>io.wcm</groupId>
197197
<artifactId>io.wcm.testing.aem-mock.junit5</artifactId>
198-
<version>5.1.0</version>
198+
<version>5.4.0</version>
199199
</dependency>
200200
<dependency>
201201
<groupId>org.apache.sling</groupId>
@@ -210,7 +210,7 @@
210210
<dependency>
211211
<groupId>org.apache.sling</groupId>
212212
<artifactId>org.apache.sling.testing.caconfig-mock-plugin</artifactId>
213-
<version>1.4.0</version>
213+
<version>1.5.2</version>
214214
</dependency>
215215
<dependency>
216216
<groupId>io.wcm</groupId>
@@ -220,7 +220,7 @@
220220
<dependency>
221221
<groupId>io.wcm</groupId>
222222
<artifactId>io.wcm.testing.wcm-io-mock.sling</artifactId>
223-
<version>1.1.0</version>
223+
<version>1.2.0</version>
224224
</dependency>
225225
<dependency>
226226
<groupId>io.wcm</groupId>
@@ -237,7 +237,7 @@
237237
<dependency>
238238
<groupId>io.wcm.maven</groupId>
239239
<artifactId>io.wcm.maven.aem-dependencies</artifactId>
240-
<version>6.5.0.0005</version>
240+
<version>6.5.18.0000</version>
241241
<type>pom</type>
242242
<scope>import</scope>
243243
</dependency>
@@ -278,19 +278,19 @@
278278
<dependency>
279279
<groupId>org.junit</groupId>
280280
<artifactId>junit-bom</artifactId>
281-
<version>5.9.1</version>
281+
<version>5.10.1</version>
282282
<type>pom</type>
283283
<scope>import</scope>
284284
</dependency>
285285
<dependency>
286286
<groupId>org.mockito</groupId>
287287
<artifactId>mockito-core</artifactId>
288-
<version>4.8.0</version>
288+
<version>5.7.0</version>
289289
</dependency>
290290
<dependency>
291291
<groupId>org.mockito</groupId>
292292
<artifactId>mockito-junit-jupiter</artifactId>
293-
<version>4.8.0</version>
293+
<version>5.7.0</version>
294294
</dependency>
295295

296296
</dependencies>

0 commit comments

Comments
 (0)