Skip to content

Commit 0d1484b

Browse files
florianlacreuseflorianlacreuse
authored
Merge branch 'apache:master' into ft-form-process-hook
2 parents bba3544 + 96b755d commit 0d1484b

File tree

45 files changed

+12265
-495
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+12265
-495
lines changed

‎CHANGELOG-10.x

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,27 @@ This file contains all changes done in releases for Apache Wicket 10.x.
22

33
=======================================================================
44

5+
Release Notes - Wicket - Version 10.5.0
6+
7+
** Bug
8+
9+
* [WICKET-7147] - Paramter order of null checks incorrect
10+
* [WICKET-7148] - Removing Metadata from Application not possible
11+
* [WICKET-7150] - Cyclic dependency between wicket-native-websocket-core and wicket-native-websocket-javax modules
12+
13+
** New Feature
14+
15+
* [WICKET-7152] - Extend RedirectRequestHandler for statusCodes 307 and 308
16+
17+
** Improvement
18+
19+
* [WICKET-7134] - To refactor Form processing code
20+
* [WICKET-7149] - Add Integrity and CrossOrigin values to ResourceReference and related code
21+
* [WICKET-7151] - Misleading message when a Link component is added with wrong id
22+
* [WICKET-7153] - [Resources] modify RootMapper in order to allow to define a refferent ResourceReferenceMapper
23+
24+
=======================================================================
25+
526
Release Notes - Wicket - Version 10.4.0
627

728
** Bug

‎archetypes/quickstart/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.wicket</groupId>
2222
<artifactId>wicket-parent</artifactId>
23-
<version>10.5.0-SNAPSHOT</version>
23+
<version>10.6.0-SNAPSHOT</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626
<artifactId>wicket-archetype-quickstart</artifactId>
@@ -52,7 +52,7 @@
5252
<extension>
5353
<groupId>org.apache.maven.archetype</groupId>
5454
<artifactId>archetype-packaging</artifactId>
55-
<version>3.3.1</version>
55+
<version>3.4.0</version>
5656
</extension>
5757
</extensions>
5858
<pluginManagement>

‎pom.xml

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
<parent>
2121
<groupId>org.apache</groupId>
2222
<artifactId>apache</artifactId>
23-
<version>33</version>
23+
<version>34</version>
2424
</parent>
2525
<groupId>org.apache.wicket</groupId>
2626
<artifactId>wicket-parent</artifactId>
27-
<version>10.5.0-SNAPSHOT</version>
27+
<version>10.6.0-SNAPSHOT</version>
2828
<packaging>pom</packaging>
2929
<name>Wicket Parent</name>
3030
<description>Wicket is a Java-based open source component web application framework.</description>
@@ -130,7 +130,7 @@
130130
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
131131
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
132132

133-
<project.build.outputTimestamp>2025-01-24T20:44:18Z</project.build.outputTimestamp>
133+
<project.build.outputTimestamp>2025-04-25T11:19:01Z</project.build.outputTimestamp>
134134

135135
<javadoc.additionalJOption />
136136
<javadoc.jdk.apidocs.link>https://docs.oracle.com/en/java/javase/${java.specification.version}/docs/api/</javadoc.jdk.apidocs.link>
@@ -141,21 +141,21 @@
141141
<maven.compiler.target>17</maven.compiler.target>
142142

143143
<!-- Project Versions -->
144-
<asm.version>9.7.1</asm.version>
145-
<aspectj.version>1.9.22.1</aspectj.version>
144+
<asm.version>9.8</asm.version>
145+
<aspectj.version>1.9.24</aspectj.version>
146146
<assertj-core.version>3.27.3</assertj-core.version>
147147
<bouncycastle.version>1.80</bouncycastle.version>
148-
<byte-buddy.version>1.17.1</byte-buddy.version>
148+
<byte-buddy.version>1.17.5</byte-buddy.version>
149149
<cdi-unit.version>5.0.0-EA7</cdi-unit.version>
150-
<commons-collections4.version>4.4</commons-collections4.version>
150+
<commons-collections4.version>4.5.0</commons-collections4.version>
151151
<commons-fileupload.version>2.0.0-M2</commons-fileupload.version>
152-
<commons-io.version>2.18.0</commons-io.version>
152+
<commons-io.version>2.19.0</commons-io.version>
153153
<commons-lang3.version>3.17.0</commons-lang3.version>
154154
<guice.version>7.0.0</guice.version>
155155
<el-impl.version>2.2.1-b05</el-impl.version>
156-
<error_prone_annotations.version>2.36.0</error_prone_annotations.version>
157-
<forbiddenapis.version>3.8</forbiddenapis.version>
158-
<jacoco.version>0.8.12</jacoco.version>
156+
<error_prone_annotations.version>2.38.0</error_prone_annotations.version>
157+
<forbiddenapis.version>3.9</forbiddenapis.version>
158+
<jacoco.version>0.8.13</jacoco.version>
159159
<jackson.version>2.14.3</jackson.version>
160160
<jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
161161
<jakarta.el.version>4.0.2</jakarta.el.version>
@@ -168,41 +168,41 @@
168168
<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
169169
<jdk-serializable-functional.version>1.9.0</jdk-serializable-functional.version>
170170
<jetty.version>11.0.24</jetty.version>
171-
<junit.version>5.11.4</junit.version>
171+
<junit.version>5.12.2</junit.version>
172172
<jsr305.version>3.0.2</jsr305.version>
173173
<logback.version>1.2.7</logback.version>
174174
<hamcrest.version>3.0</hamcrest.version>
175175
<hibernate-validator.version>8.0.2.Final</hibernate-validator.version>
176176
<httpunit.version>1.7.3</httpunit.version>
177177
<metrics.version>4.2.30</metrics.version>
178-
<mockito.version>5.15.2</mockito.version>
178+
<mockito.version>5.17.0</mockito.version>
179179
<objenesis.version>3.4</objenesis.version>
180180
<openjson.version>1.0.13</openjson.version>
181-
<slf4j.version>2.0.16</slf4j.version>
182-
<spring.version>6.2.3</spring.version>
181+
<slf4j.version>2.0.17</slf4j.version>
182+
<spring.version>6.2.7</spring.version>
183183
<wagon-ssh-external.version>3.5.3</wagon-ssh-external.version>
184184
<weld.version>4.0.3.Final</weld.version>
185185
<velocity-engine-core.version>2.4.1</velocity-engine-core.version>
186186

187187
<!-- Maven plugins -->
188188
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
189189
<japicmp-maven-plugin.version>0.23.1</japicmp-maven-plugin.version>
190-
<maven-archetype-plugin.version>3.3.1</maven-archetype-plugin.version>
190+
<maven-archetype-plugin.version>3.4.0</maven-archetype-plugin.version>
191191
<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
192-
<maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
193-
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
194-
<maven-deploy-plugin.version>3.1.3</maven-deploy-plugin.version>
192+
<maven-clean-plugin.version>3.4.1</maven-clean-plugin.version>
193+
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
194+
<maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
195195
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
196196
<maven-enforcer-plugin.version>3.1.0</maven-enforcer-plugin.version>
197197
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
198-
<maven-install-plugin.version>3.1.3</maven-install-plugin.version>
198+
<maven-install-plugin.version>3.1.4</maven-install-plugin.version>
199199
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
200200
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
201-
<maven-project-info-reports-plugin.version>3.8.0</maven-project-info-reports-plugin.version>
201+
<maven-project-info-reports-plugin.version>3.9.0</maven-project-info-reports-plugin.version>
202202
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
203203
<maven-remote-resources-plugin.version>3.3.0</maven-remote-resources-plugin.version>
204204
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
205-
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
205+
<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
206206
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
207207
<maven-toolchains-plugin.version>3.2.0</maven-toolchains-plugin.version>
208208
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
@@ -346,25 +346,25 @@
346346
<dependency>
347347
<groupId>org.apache.wicket</groupId>
348348
<artifactId>wicket</artifactId>
349-
<version>10.5.0-SNAPSHOT</version>
349+
<version>10.6.0-SNAPSHOT</version>
350350
<type>pom</type>
351351
</dependency>
352352
<dependency>
353353
<groupId>org.apache.wicket</groupId>
354354
<artifactId>wicket-auth-roles</artifactId>
355-
<version>10.5.0-SNAPSHOT</version>
355+
<version>10.6.0-SNAPSHOT</version>
356356
<type>jar</type>
357357
</dependency>
358358
<dependency>
359359
<groupId>org.apache.wicket</groupId>
360360
<artifactId>wicket-bean-validation</artifactId>
361-
<version>10.5.0-SNAPSHOT</version>
361+
<version>10.6.0-SNAPSHOT</version>
362362
<type>jar</type>
363363
</dependency>
364364
<dependency>
365365
<groupId>org.apache.wicket</groupId>
366366
<artifactId>wicket-cdi</artifactId>
367-
<version>10.5.0-SNAPSHOT</version>
367+
<version>10.6.0-SNAPSHOT</version>
368368
<type>jar</type>
369369
</dependency>
370370
<dependency>
@@ -376,19 +376,19 @@
376376
<dependency>
377377
<groupId>org.apache.wicket</groupId>
378378
<artifactId>wicket-core</artifactId>
379-
<version>10.5.0-SNAPSHOT</version>
379+
<version>10.6.0-SNAPSHOT</version>
380380
<type>jar</type>
381381
</dependency>
382382
<dependency>
383383
<groupId>org.apache.wicket</groupId>
384384
<artifactId>wicket-core-tests</artifactId>
385-
<version>10.5.0-SNAPSHOT</version>
385+
<version>10.6.0-SNAPSHOT</version>
386386
<type>jar</type>
387387
</dependency>
388388
<dependency>
389389
<groupId>org.apache.wicket</groupId>
390390
<artifactId>wicket-devutils</artifactId>
391-
<version>10.5.0-SNAPSHOT</version>
391+
<version>10.6.0-SNAPSHOT</version>
392392
<type>jar</type>
393393
</dependency>
394394
<dependency>
@@ -399,79 +399,79 @@
399399
<dependency>
400400
<groupId>org.apache.wicket</groupId>
401401
<artifactId>wicket-extensions</artifactId>
402-
<version>10.5.0-SNAPSHOT</version>
402+
<version>10.6.0-SNAPSHOT</version>
403403
<type>jar</type>
404404
</dependency>
405405
<dependency>
406406
<groupId>org.apache.wicket</groupId>
407407
<artifactId>wicket-extensions-tester</artifactId>
408-
<version>10.5.0-SNAPSHOT</version>
408+
<version>10.6.0-SNAPSHOT</version>
409409
<type>jar</type>
410410
</dependency>
411411
<dependency>
412412
<groupId>org.apache.wicket</groupId>
413413
<artifactId>wicket-guice</artifactId>
414-
<version>10.5.0-SNAPSHOT</version>
414+
<version>10.6.0-SNAPSHOT</version>
415415
<type>jar</type>
416416
</dependency>
417417
<dependency>
418418
<groupId>org.apache.wicket</groupId>
419419
<artifactId>wicket-ioc</artifactId>
420-
<version>10.5.0-SNAPSHOT</version>
420+
<version>10.6.0-SNAPSHOT</version>
421421
<type>jar</type>
422422
</dependency>
423423
<dependency>
424424
<groupId>org.apache.wicket</groupId>
425425
<artifactId>wicket-jmx</artifactId>
426-
<version>10.5.0-SNAPSHOT</version>
426+
<version>10.6.0-SNAPSHOT</version>
427427
<type>jar</type>
428428
</dependency>
429429
<dependency>
430430
<groupId>org.apache.wicket</groupId>
431431
<artifactId>wicket-native-websocket-core</artifactId>
432-
<version>10.5.0-SNAPSHOT</version>
432+
<version>10.6.0-SNAPSHOT</version>
433433
<type>jar</type>
434434
</dependency>
435435
<dependency>
436436
<groupId>org.apache.wicket</groupId>
437437
<artifactId>wicket-native-websocket-javax</artifactId>
438-
<version>10.5.0-SNAPSHOT</version>
438+
<version>10.6.0-SNAPSHOT</version>
439439
<type>jar</type>
440440
</dependency>
441441
<dependency>
442442
<groupId>org.apache.wicket</groupId>
443443
<artifactId>wicket-native-websocket-tester</artifactId>
444-
<version>10.5.0-SNAPSHOT</version>
444+
<version>10.6.0-SNAPSHOT</version>
445445
<type>jar</type>
446446
</dependency>
447447
<dependency>
448448
<groupId>org.apache.wicket</groupId>
449449
<artifactId>wicket-request</artifactId>
450-
<version>10.5.0-SNAPSHOT</version>
450+
<version>10.6.0-SNAPSHOT</version>
451451
<type>jar</type>
452452
</dependency>
453453
<dependency>
454454
<groupId>org.apache.wicket</groupId>
455455
<artifactId>wicket-spring</artifactId>
456-
<version>10.5.0-SNAPSHOT</version>
456+
<version>10.6.0-SNAPSHOT</version>
457457
<type>jar</type>
458458
</dependency>
459459
<dependency>
460460
<groupId>org.apache.wicket</groupId>
461461
<artifactId>wicket-util</artifactId>
462-
<version>10.5.0-SNAPSHOT</version>
462+
<version>10.6.0-SNAPSHOT</version>
463463
<type>jar</type>
464464
</dependency>
465465
<dependency>
466466
<groupId>org.apache.wicket</groupId>
467467
<artifactId>wicket-velocity</artifactId>
468-
<version>10.5.0-SNAPSHOT</version>
468+
<version>10.6.0-SNAPSHOT</version>
469469
<type>jar</type>
470470
</dependency>
471471
<dependency>
472472
<groupId>org.apache.wicket.experimental.wicket10</groupId>
473473
<artifactId>wicket-metrics</artifactId>
474-
<version>10.5.0-SNAPSHOT</version>
474+
<version>10.6.0-SNAPSHOT</version>
475475
<type>jar</type>
476476
</dependency>
477477

@@ -582,7 +582,7 @@
582582
<dependency>
583583
<groupId>org.apache.wicket</groupId>
584584
<artifactId>wicket-tester</artifactId>
585-
<version>10.5.0-SNAPSHOT</version>
585+
<version>10.6.0-SNAPSHOT</version>
586586
<scope>test</scope>
587587
</dependency>
588588
<dependency>

0 commit comments

Comments
 (0)