Skip to content

Commit b78bbf7

Browse files
stefanseifertstefanseifert
committed
update dependencies in ITs to latest versions
1 parent 2dd30b9 commit b78bbf7

6 files changed

Lines changed: 48 additions & 209 deletions

File tree

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

Lines changed: 0 additions & 1 deletion
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‎

Lines changed: 25 additions & 25 deletions
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.10</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>

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/pom.xml‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,6 @@
7878
<artifactId>io.wcm.caconfig.editor</artifactId>
7979
<scope>compile</scope>
8080
</dependency>
81-
<dependency>
82-
<groupId>io.wcm</groupId>
83-
<artifactId>io.wcm.caconfig.editor</artifactId>
84-
<classifier>content</classifier>
85-
<type>zip</type>
86-
<scope>compile</scope>
87-
</dependency>
8881
<dependency>
8982
<groupId>io.wcm</groupId>
9083
<artifactId>io.wcm.sling.commons</artifactId>
@@ -100,49 +93,21 @@
10093
<artifactId>io.wcm.wcm.commons</artifactId>
10194
<scope>compile</scope>
10295
</dependency>
103-
<dependency>
104-
<groupId>io.wcm</groupId>
105-
<artifactId>io.wcm.wcm.commons</artifactId>
106-
<classifier>content</classifier>
107-
<type>zip</type>
108-
<scope>compile</scope>
109-
</dependency>
110-
<dependency>
111-
<groupId>io.wcm</groupId>
112-
<artifactId>io.wcm.wcm.parsys</artifactId>
113-
<scope>compile</scope>
114-
</dependency>
11596
<dependency>
11697
<groupId>io.wcm</groupId>
11798
<artifactId>io.wcm.wcm.parsys</artifactId>
118-
<classifier>content</classifier>
119-
<type>zip</type>
12099
<scope>compile</scope>
121100
</dependency>
122101
<dependency>
123102
<groupId>io.wcm</groupId>
124103
<artifactId>io.wcm.wcm.ui.granite</artifactId>
125104
<scope>compile</scope>
126105
</dependency>
127-
<dependency>
128-
<groupId>io.wcm</groupId>
129-
<artifactId>io.wcm.wcm.ui.granite</artifactId>
130-
<classifier>content</classifier>
131-
<type>zip</type>
132-
<scope>compile</scope>
133-
</dependency>
134106
<dependency>
135107
<groupId>io.wcm</groupId>
136108
<artifactId>io.wcm.wcm.ui.clientlibs</artifactId>
137109
<scope>compile</scope>
138110
</dependency>
139-
<dependency>
140-
<groupId>io.wcm</groupId>
141-
<artifactId>io.wcm.wcm.ui.clientlibs</artifactId>
142-
<classifier>content</classifier>
143-
<type>zip</type>
144-
<scope>compile</scope>
145-
</dependency>
146111
<dependency>
147112
<groupId>io.wcm</groupId>
148113
<artifactId>io.wcm.handler.commons</artifactId>
@@ -153,61 +118,26 @@
153118
<artifactId>io.wcm.handler.url</artifactId>
154119
<scope>compile</scope>
155120
</dependency>
156-
<dependency>
157-
<groupId>io.wcm</groupId>
158-
<artifactId>io.wcm.handler.url</artifactId>
159-
<classifier>content</classifier>
160-
<type>zip</type>
161-
<scope>compile</scope>
162-
</dependency>
163121
<dependency>
164122
<groupId>io.wcm</groupId>
165123
<artifactId>io.wcm.handler.media</artifactId>
166124
<scope>compile</scope>
167125
</dependency>
168-
<dependency>
169-
<groupId>io.wcm</groupId>
170-
<artifactId>io.wcm.handler.media</artifactId>
171-
<classifier>content</classifier>
172-
<type>zip</type>
173-
<scope>compile</scope>
174-
</dependency>
175-
<dependency>
176-
<groupId>io.wcm</groupId>
177-
<artifactId>io.wcm.handler.link</artifactId>
178-
<scope>compile</scope>
179-
</dependency>
180126
<dependency>
181127
<groupId>io.wcm</groupId>
182128
<artifactId>io.wcm.handler.link</artifactId>
183-
<classifier>content</classifier>
184-
<type>zip</type>
185129
<scope>compile</scope>
186130
</dependency>
187131
<dependency>
188132
<groupId>io.wcm</groupId>
189133
<artifactId>io.wcm.handler.richtext</artifactId>
190134
<scope>compile</scope>
191135
</dependency>
192-
<dependency>
193-
<groupId>io.wcm</groupId>
194-
<artifactId>io.wcm.handler.richtext</artifactId>
195-
<classifier>content</classifier>
196-
<type>zip</type>
197-
<scope>compile</scope>
198-
</dependency>
199136
<dependency>
200137
<groupId>io.wcm</groupId>
201138
<artifactId>io.wcm.wcm.core.components</artifactId>
202139
<scope>compile</scope>
203140
</dependency>
204-
<dependency>
205-
<groupId>io.wcm</groupId>
206-
<artifactId>io.wcm.wcm.core.components</artifactId>
207-
<classifier>content</classifier>
208-
<type>zip</type>
209-
<scope>compile</scope>
210-
</dependency>
211141

212142
</dependencies>
213143

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/src/main/environments/cloud.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ config:
4545
httpd:
4646
headers:
4747
# Set default expiration time for text/html responses (also affects dispatcher caching/invalidation)
48-
htmlExpirationTimeMin: 0
48+
htmlExpirationTimeSec: 0
4949

5050
# Replication configuration not required for AEM cloud service
5151
replication:

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/src/main/roles/wcmio-archetype-cloud-aem-cms.yaml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -65,50 +65,30 @@ files:
6565
dir: bundles
6666
- url: mvn:io.wcm/io.wcm.caconfig.editor
6767
dir: bundles
68-
- url: mvn:io.wcm/io.wcm.caconfig.editor//zip/content
69-
dir: packages
7068
- url: mvn:io.wcm/io.wcm.sling.commons
7169
dir: bundles
7270
- url: mvn:io.wcm/io.wcm.sling.models
7371
dir: bundles
7472
- url: mvn:io.wcm/io.wcm.wcm.commons
7573
dir: bundles
76-
- url: mvn:io.wcm/io.wcm.wcm.commons//zip/content
77-
dir: packages
7874
- url: mvn:io.wcm/io.wcm.wcm.parsys
7975
dir: bundles
80-
- url: mvn:io.wcm/io.wcm.wcm.parsys//zip/content
81-
dir: packages
8276
- url: mvn:io.wcm/io.wcm.wcm.ui.granite
8377
dir: bundles
84-
- url: mvn:io.wcm/io.wcm.wcm.ui.granite//zip/content
85-
dir: packages
8678
- url: mvn:io.wcm/io.wcm.wcm.ui.clientlibs
8779
dir: bundles
88-
- url: mvn:io.wcm/io.wcm.wcm.ui.clientlibs//zip/content
89-
dir: packages
9080
- url: mvn:io.wcm/io.wcm.handler.commons
9181
dir: bundles
9282
- url: mvn:io.wcm/io.wcm.handler.url
9383
dir: bundles
94-
- url: mvn:io.wcm/io.wcm.handler.url//zip/content
95-
dir: packages
9684
- url: mvn:io.wcm/io.wcm.handler.media
9785
dir: bundles
98-
- url: mvn:io.wcm/io.wcm.handler.media//zip/content
99-
dir: packages
10086
- url: mvn:io.wcm/io.wcm.handler.link
10187
dir: bundles
102-
- url: mvn:io.wcm/io.wcm.handler.link//zip/content
103-
dir: packages
10488
- url: mvn:io.wcm/io.wcm.handler.richtext
10589
dir: bundles
106-
- url: mvn:io.wcm/io.wcm.handler.richtext//zip/content
107-
dir: packages
10890
- url: mvn:io.wcm/io.wcm.wcm.core.components
10991
dir: bundles
110-
- url: mvn:io.wcm/io.wcm.wcm.core.components//zip/content
111-
dir: packages
11292

11393
# Application bundles andpackages
11494
- url: mvn:io.wcm.devops.conga.plugins.aem.it/io.wcm.devops.conga.plugins.aem.it.aemcloud.core

0 commit comments

Comments
 (0)