You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2020/01/13 19:11:34 UTC
[wicket] branch csp created (now 53549fb)
This is an automated email from the ASF dual-hosted git repository.
papegaaij pushed a change to branch csp
in repository https://gitbox.apache.org/repos/asf/wicket.git.
at 53549fb WICKET-6723: Keep servlet at 3.1.0 for now
This branch includes the following new commits:
new 53549fb WICKET-6723: Keep servlet at 3.1.0 for now
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[wicket] 01/01: WICKET-6723: Keep servlet at 3.1.0 for now
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
papegaaij pushed a commit to branch csp
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 53549fbab4db381d664991a45b75183774bf81ad
Author: Emond Papegaaij <em...@topicus.nl>
AuthorDate: Mon Jan 13 20:10:44 2020 +0100
WICKET-6723: Keep servlet at 3.1.0 for now
---
pom.xml | 18 +++++++++---------
wicket-examples/pom.xml | 8 ++++----
wicket-experimental/wicket-metrics/pom.xml | 4 ++--
.../wicket-native-websocket-javax/pom.xml | 8 ++++----
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index eb72509..9c010b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,10 +150,10 @@
<jakarta.el.version>3.0.3</jakarta.el.version>
<jakarta.el-api.version>3.0.3</jakarta.el-api.version>
<jakarta.enterprise.cdi-api.version>2.0.2</jakarta.enterprise.cdi-api.version>
- <jakarta.servlet-api.version>4.0.3</jakarta.servlet-api.version>
<jakarta.servlet.jsp-api.version>2.3.6</jakarta.servlet.jsp-api.version>
<jakarta.validation-api.version>2.0.2</jakarta.validation-api.version>
<jakarta.websocket-api.version>1.1.2</jakarta.websocket-api.version>
+ <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
<jdk-serializable-functional.version>1.9.0</jdk-serializable-functional.version>
<jetty.version>9.4.21.v20190926</jetty.version>
<junit.version>5.5.2</junit.version>
@@ -225,12 +225,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- <version>${jakarta.servlet-api.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<version>${jakarta.servlet.jsp-api.version}</version>
@@ -249,6 +243,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${javax.servlet-api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>${hamcrest.version}</version>
@@ -674,8 +674,8 @@
</dependencyManagement>
<dependencies>
<dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml
index 6e16e75..ac66c9a 100644
--- a/wicket-examples/pom.xml
+++ b/wicket-examples/pom.xml
@@ -60,14 +60,14 @@
<artifactId>jakarta.el-api</artifactId>
</dependency>
<dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- </dependency>
- <dependency>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.github.axet</groupId>
<artifactId>kaptcha</artifactId>
</dependency>
diff --git a/wicket-experimental/wicket-metrics/pom.xml b/wicket-experimental/wicket-metrics/pom.xml
index 7549841..0a155a4 100644
--- a/wicket-experimental/wicket-metrics/pom.xml
+++ b/wicket-experimental/wicket-metrics/pom.xml
@@ -38,8 +38,8 @@
<dependencies>
<dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
diff --git a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
index 5970d3c..babad18 100644
--- a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
@@ -34,14 +34,14 @@
<dependencies>
<dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- </dependency>
- <dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>