This is an automated email from the ASF dual-hosted git repository. reiern70 pushed a commit to branch wicket-11-x in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 0321bc869342fc51d947921ee0f7ec0c1b48e08a Author: reiern70 <[email protected]> AuthorDate: Fri May 2 10:52:59 2025 -0500 [WICKET-7154] upgrade to use commons-fileupload2-jakarta-servlet6 --- archetypes/quickstart/pom.xml | 2 +- pom.xml | 46 +++++++++++----------- testing/wicket-common-tests/pom.xml | 2 +- testing/wicket-js-tests/pom.xml | 2 +- wicket-auth-roles/pom.xml | 2 +- wicket-bean-validation/pom.xml | 2 +- wicket-cdi-tests/pom.xml | 2 +- wicket-cdi/pom.xml | 2 +- wicket-core-tests/pom.xml | 2 +- wicket-core/pom.xml | 2 +- wicket-core/src/main/java/module-info.java | 2 +- .../servlet/MultipartServletWebRequestImpl.java | 15 +++---- wicket-devutils/pom.xml | 2 +- wicket-examples/pom.xml | 2 +- wicket-experimental/pom.xml | 2 +- wicket-experimental/wicket-metrics/pom.xml | 4 +- wicket-extensions-tester/pom.xml | 2 +- wicket-extensions/pom.xml | 2 +- wicket-guice/pom.xml | 2 +- wicket-ioc/pom.xml | 2 +- wicket-jmx/pom.xml | 2 +- wicket-migration/pom.xml | 2 +- wicket-native-websocket/pom.xml | 2 +- .../wicket-native-websocket-core/pom.xml | 2 +- .../wicket-native-websocket-javax/pom.xml | 2 +- .../wicket-native-websocket-tester/pom.xml | 2 +- wicket-objectsizeof-agent/pom.xml | 2 +- wicket-request/pom.xml | 2 +- wicket-spring/pom.xml | 2 +- wicket-tester/pom.xml | 2 +- wicket-user-guide/pom.xml | 2 +- wicket-util/pom.xml | 4 +- wicket-velocity/pom.xml | 2 +- wicket/pom.xml | 2 +- 34 files changed, 65 insertions(+), 64 deletions(-) diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml index 67af2a57ac..4dd45d5955 100644 --- a/archetypes/quickstart/pom.xml +++ b/archetypes/quickstart/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>wicket-archetype-quickstart</artifactId> diff --git a/pom.xml b/pom.xml index b348e25946..e7d1e78ec0 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ </parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Wicket Parent</name> <description>Wicket is a Java-based open source component web application framework.</description> @@ -324,7 +324,7 @@ </dependency> <dependency> <groupId>org.apache.commons</groupId> - <artifactId>commons-fileupload2-jakarta-servlet5</artifactId> + <artifactId>commons-fileupload2-jakarta-servlet6</artifactId> <version>${commons-fileupload.version}</version> <exclusions> <exclusion> @@ -346,25 +346,25 @@ <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <type>pom</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-auth-roles</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-bean-validation</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-cdi</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> @@ -376,19 +376,19 @@ <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-core</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-core-tests</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-devutils</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> @@ -399,79 +399,79 @@ <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-extensions</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-extensions-tester</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-guice</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-ioc</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-jmx</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-native-websocket-core</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-native-websocket-javax</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-native-websocket-tester</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-request</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-spring</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-util</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-velocity</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket.experimental.wicket10</groupId> <artifactId>wicket-metrics</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <type>jar</type> </dependency> @@ -582,7 +582,7 @@ <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-tester</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> diff --git a/testing/wicket-common-tests/pom.xml b/testing/wicket-common-tests/pom.xml index 632d6692f8..563d439015 100644 --- a/testing/wicket-common-tests/pom.xml +++ b/testing/wicket-common-tests/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>wicket-common-tests</artifactId> diff --git a/testing/wicket-js-tests/pom.xml b/testing/wicket-js-tests/pom.xml index 2b1c0e8919..d3f8b22447 100644 --- a/testing/wicket-js-tests/pom.xml +++ b/testing/wicket-js-tests/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>wicket-js-tests</artifactId> diff --git a/wicket-auth-roles/pom.xml b/wicket-auth-roles/pom.xml index 8db902ad0c..7a53ebc8f2 100644 --- a/wicket-auth-roles/pom.xml +++ b/wicket-auth-roles/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-auth-roles</artifactId> diff --git a/wicket-bean-validation/pom.xml b/wicket-bean-validation/pom.xml index fc275579da..816477641d 100644 --- a/wicket-bean-validation/pom.xml +++ b/wicket-bean-validation/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-bean-validation</artifactId> diff --git a/wicket-cdi-tests/pom.xml b/wicket-cdi-tests/pom.xml index 444e93e9c7..08fc4f2509 100644 --- a/wicket-cdi-tests/pom.xml +++ b/wicket-cdi-tests/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-cdi-tests</artifactId> diff --git a/wicket-cdi/pom.xml b/wicket-cdi/pom.xml index 6714d8e74c..f5e11f0956 100644 --- a/wicket-cdi/pom.xml +++ b/wicket-cdi/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-cdi</artifactId> diff --git a/wicket-core-tests/pom.xml b/wicket-core-tests/pom.xml index 0771549dc4..5987d618bd 100644 --- a/wicket-core-tests/pom.xml +++ b/wicket-core-tests/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-core-tests</artifactId> diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml index c961759296..51ffcad3a3 100644 --- a/wicket-core/pom.xml +++ b/wicket-core/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-core</artifactId> diff --git a/wicket-core/src/main/java/module-info.java b/wicket-core/src/main/java/module-info.java index e7bd7b3a4b..bf09eecfc0 100644 --- a/wicket-core/src/main/java/module-info.java +++ b/wicket-core/src/main/java/module-info.java @@ -24,7 +24,7 @@ module org.apache.wicket.core { requires org.apache.commons.io; requires org.apache.commons.collections4; requires org.apache.commons.fileupload2.core; - requires org.apache.commons.fileupload2.jakarta.servlet5; + requires org.apache.commons.fileupload2.jakarta.servlet6; requires org.slf4j; requires static jakarta.servlet; requires org.danekja.jdk.serializable.functional; diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java index 6ae48f25a6..c406bbc3ad 100644 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java @@ -34,8 +34,8 @@ import org.apache.commons.fileupload2.core.FileItemFactory; import org.apache.commons.fileupload2.core.FileUploadByteCountLimitException; import org.apache.commons.fileupload2.core.FileUploadException; import org.apache.commons.fileupload2.core.DiskFileItemFactory; -import org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload; -import org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletRequestContext; +import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload; +import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletRequestContext; import org.apache.wicket.Application; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.util.file.FileCleanerTrackerAdapter; @@ -187,11 +187,12 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest // try to parse the file uploads by using Apache Commons FileUpload APIs // because they are feature richer (e.g. progress updates, cleaner) items = fileUpload.parseRequest(new JakartaServletRequestContext(request)); - if (items.isEmpty()) - { - // fallback to Servlet 3.0 APIs - items = readServlet3Parts(request); - } + } + + if (items.isEmpty()) + { + // fallback to Servlet 3.0 APIs + items = readServlet3Parts(request); } // Loop through items diff --git a/wicket-devutils/pom.xml b/wicket-devutils/pom.xml index f0fe9c313b..c5db96f427 100644 --- a/wicket-devutils/pom.xml +++ b/wicket-devutils/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-devutils</artifactId> diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml index 4ea8a15700..994327c869 100644 --- a/wicket-examples/pom.xml +++ b/wicket-examples/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-examples</artifactId> diff --git a/wicket-experimental/pom.xml b/wicket-experimental/pom.xml index 88a55c394d..44ae713415 100644 --- a/wicket-experimental/pom.xml +++ b/wicket-experimental/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.wicket.experimental.wicket10</groupId> diff --git a/wicket-experimental/wicket-metrics/pom.xml b/wicket-experimental/wicket-metrics/pom.xml index 2d5c9f7730..e5ed6dd956 100644 --- a/wicket-experimental/wicket-metrics/pom.xml +++ b/wicket-experimental/wicket-metrics/pom.xml @@ -20,11 +20,11 @@ <parent> <groupId>org.apache.wicket.experimental.wicket10</groupId> <artifactId>wicket-experimental</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-metrics</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Wicket Metrics</name> <description> diff --git a/wicket-extensions-tester/pom.xml b/wicket-extensions-tester/pom.xml index e033a17346..adc321b67c 100644 --- a/wicket-extensions-tester/pom.xml +++ b/wicket-extensions-tester/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-extensions-tester</artifactId> diff --git a/wicket-extensions/pom.xml b/wicket-extensions/pom.xml index b241278015..40b2b332af 100644 --- a/wicket-extensions/pom.xml +++ b/wicket-extensions/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-extensions</artifactId> diff --git a/wicket-guice/pom.xml b/wicket-guice/pom.xml index f953feb38f..75805b9a71 100644 --- a/wicket-guice/pom.xml +++ b/wicket-guice/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-guice</artifactId> diff --git a/wicket-ioc/pom.xml b/wicket-ioc/pom.xml index fd8aede050..9483b5a3d9 100644 --- a/wicket-ioc/pom.xml +++ b/wicket-ioc/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-ioc</artifactId> diff --git a/wicket-jmx/pom.xml b/wicket-jmx/pom.xml index c80d3cfad9..54e01f0b5e 100644 --- a/wicket-jmx/pom.xml +++ b/wicket-jmx/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-jmx</artifactId> diff --git a/wicket-migration/pom.xml b/wicket-migration/pom.xml index 003a523a5f..fa97a538dd 100644 --- a/wicket-migration/pom.xml +++ b/wicket-migration/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> </parent> <artifactId>wicket-migration</artifactId> <name>Wicket Migration</name> diff --git a/wicket-native-websocket/pom.xml b/wicket-native-websocket/pom.xml index 30a8694521..b021c3ef23 100644 --- a/wicket-native-websocket/pom.xml +++ b/wicket-native-websocket/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-native-websocket</artifactId> diff --git a/wicket-native-websocket/wicket-native-websocket-core/pom.xml b/wicket-native-websocket/wicket-native-websocket-core/pom.xml index e0f0ed9735..8e06356fff 100644 --- a/wicket-native-websocket/wicket-native-websocket-core/pom.xml +++ b/wicket-native-websocket/wicket-native-websocket-core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-native-websocket</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml index 400147f3cb..0bde0e8665 100644 --- a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml +++ b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-native-websocket</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-native-websocket-javax</artifactId> diff --git a/wicket-native-websocket/wicket-native-websocket-tester/pom.xml b/wicket-native-websocket/wicket-native-websocket-tester/pom.xml index c130eff9e3..861df52414 100644 --- a/wicket-native-websocket/wicket-native-websocket-tester/pom.xml +++ b/wicket-native-websocket/wicket-native-websocket-tester/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-native-websocket</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/wicket-objectsizeof-agent/pom.xml b/wicket-objectsizeof-agent/pom.xml index 7c82a0db0c..45ef5ae703 100644 --- a/wicket-objectsizeof-agent/pom.xml +++ b/wicket-objectsizeof-agent/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-objectsizeof-agent</artifactId> diff --git a/wicket-request/pom.xml b/wicket-request/pom.xml index 4b2d0c8b40..f907e6e331 100755 --- a/wicket-request/pom.xml +++ b/wicket-request/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>wicket-parent</artifactId> <groupId>org.apache.wicket</groupId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> </parent> <artifactId>wicket-request</artifactId> <packaging>jar</packaging> diff --git a/wicket-spring/pom.xml b/wicket-spring/pom.xml index b64bf76410..f502881962 100644 --- a/wicket-spring/pom.xml +++ b/wicket-spring/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-spring</artifactId> diff --git a/wicket-tester/pom.xml b/wicket-tester/pom.xml index 86dd3b4977..04b1ced8fd 100644 --- a/wicket-tester/pom.xml +++ b/wicket-tester/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-tester</artifactId> diff --git a/wicket-user-guide/pom.xml b/wicket-user-guide/pom.xml index 16c1a8cfde..d2be804af0 100644 --- a/wicket-user-guide/pom.xml +++ b/wicket-user-guide/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-user-guide</artifactId> diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml index 9472127c3a..feea352ed2 100755 --- a/wicket-util/pom.xml +++ b/wicket-util/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-util</artifactId> @@ -42,7 +42,7 @@ </dependency> <dependency> <groupId>org.apache.commons</groupId> - <artifactId>commons-fileupload2-jakarta-servlet5</artifactId> + <artifactId>commons-fileupload2-jakarta-servlet6</artifactId> </dependency> </dependencies> </project> diff --git a/wicket-velocity/pom.xml b/wicket-velocity/pom.xml index a40dd0f67a..7cc5414c9f 100644 --- a/wicket-velocity/pom.xml +++ b/wicket-velocity/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket-velocity</artifactId> diff --git a/wicket/pom.xml b/wicket/pom.xml index d3a978e5d8..d070dd4c6f 100644 --- a/wicket/pom.xml +++ b/wicket/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> - <version>10.6.0-SNAPSHOT</version> + <version>11.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wicket</artifactId>
