This is an automated email from the ASF dual-hosted git repository. papegaaij pushed a commit to branch jakarta-api in repository https://gitbox.apache.org/repos/asf/wicket.git
commit dfe89ab26fc01d625547b68918d9e9dbfac9e264 Author: Emond Papegaaij <[email protected]> AuthorDate: Fri Jan 10 14:21:30 2020 +0100 WICKET-6723: move to Jakarta APIs --- pom.xml | 64 +++++++++++++--------- wicket-bean-validation/pom.xml | 8 +-- wicket-cdi/pom.xml | 38 +++---------- wicket-examples/pom.xml | 29 ++++------ wicket-experimental/wicket-metrics/pom.xml | 4 +- .../wicket-native-websocket-javax/pom.xml | 8 +-- 6 files changed, 68 insertions(+), 83 deletions(-) diff --git a/pom.xml b/pom.xml index c7cfa63..5352cee 100644 --- a/pom.xml +++ b/pom.xml @@ -146,10 +146,14 @@ <forbiddenapis.version>2.6</forbiddenapis.version> <jacoco.version>0.8.2</jacoco.version> <jackson.version>2.9.10.1</jackson.version> - <javax.el.version>3.0.1-b11</javax.el.version> - <javax.el-api.version>3.0.1-b06</javax.el-api.version> - <javax.servlet.jsp-api.version>2.3.3</javax.servlet.jsp-api.version> - <javax.websocket-api.version>1.1</javax.websocket-api.version> + <jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version> + <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.3</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> <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> @@ -162,12 +166,10 @@ <mockito.version>3.1.0</mockito.version> <objenesis.version>3.0.1</objenesis.version> <openjson.version>1.0.11</openjson.version> - <servlet-api.version>3.1.0</servlet-api.version> <slf4j.version>1.7.25</slf4j.version> <spring.version>5.2.0.RELEASE</spring.version> <wagon-ssh-external.version>3.3.2</wagon-ssh-external.version> <weld.version>3.1.1.Final</weld.version> - <validation-api.version>2.0.1.Final</validation-api.version> <velocity.version>2.1</velocity.version> <!-- Maven plugins --> @@ -205,33 +207,45 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>javax.el</groupId> - <artifactId>javax.el-api</artifactId> - <version>${javax.el-api.version}</version> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + <version>${jakarta.annotation-api.version}</version> <scope>provided</scope> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>${servlet-api.version}</version> + <groupId>jakarta.el</groupId> + <artifactId>jakarta.el-api</artifactId> + <version>${jakarta.el-api.version}</version> <scope>provided</scope> </dependency> <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>javax.servlet.jsp-api</artifactId> - <version>${javax.servlet.jsp-api.version}</version> + <groupId>jakarta.enterprise</groupId> + <artifactId>jakarta.enterprise.cdi-api</artifactId> + <version>${jakarta.enterprise.cdi-api.version}</version> <scope>provided</scope> </dependency> <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <version>${validation-api.version}</version> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>${jakarta.servlet-api.version}</version> <scope>provided</scope> </dependency> <dependency> - <groupId>javax.websocket</groupId> - <artifactId>javax.websocket-api</artifactId> - <version>${javax.websocket-api.version}</version> + <groupId>jakarta.servlet.jsp</groupId> + <artifactId>jakarta.servlet.jsp-api</artifactId> + <version>${jakarta.servlet.jsp-api.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jakarta.validation</groupId> + <artifactId>jakarta.validation-api</artifactId> + <version>${jakarta.validation-api.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jakarta.websocket</groupId> + <artifactId>jakarta.websocket-api</artifactId> + <version>${jakarta.websocket-api.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -590,8 +604,8 @@ </dependency> <dependency> <groupId>org.glassfish</groupId> - <artifactId>javax.el</artifactId> - <version>${javax.el.version}</version> + <artifactId>jakarta.el</artifactId> + <version>${jakarta.el.version}</version> <scope>test</scope> </dependency> <dependency> @@ -660,8 +674,8 @@ </dependencyManagement> <dependencies> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> </dependency> <dependency> <groupId>org.slf4j</groupId> diff --git a/wicket-bean-validation/pom.xml b/wicket-bean-validation/pom.xml index 0e1d64b..35d490a 100644 --- a/wicket-bean-validation/pom.xml +++ b/wicket-bean-validation/pom.xml @@ -17,12 +17,12 @@ <dependencies> <dependency> - <groupId>javax.el</groupId> - <artifactId>javax.el-api</artifactId> + <groupId>jakarta.el</groupId> + <artifactId>jakarta.el-api</artifactId> </dependency> <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> + <groupId>jakarta.validation</groupId> + <artifactId>jakarta.validation-api</artifactId> </dependency> <dependency> <groupId>org.apache.wicket</groupId> diff --git a/wicket-cdi/pom.xml b/wicket-cdi/pom.xml index 959fd65..f05a762 100644 --- a/wicket-cdi/pom.xml +++ b/wicket-cdi/pom.xml @@ -37,21 +37,14 @@ <automatic-module-name>org.apache.wicket.cdi</automatic-module-name> </properties> - <dependencyManagement> - <dependencies> - <!-- local management because we can only define one GAV in the parent --> - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <version>2.0.SP1</version> - <scope>provided</scope> - </dependency> - </dependencies> - </dependencyManagement> <dependencies> <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + </dependency> + <dependency> + <groupId>jakarta.enterprise</groupId> + <artifactId>jakarta.enterprise.cdi-api</artifactId> </dependency> <dependency> <groupId>org.apache.wicket</groupId> @@ -60,25 +53,8 @@ <dependency> <groupId>org.jboss.weld.module</groupId> <artifactId>weld-web</artifactId> + <scope>test</scope> </dependency> - <!-- SUPPORT FOR JAVA 12 BUILD START --> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-impl</artifactId> - <version>${weld.version}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.classfilewriter</groupId> - <artifactId>jboss-classfilewriter</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.classfilewriter</groupId> - <artifactId>jboss-classfilewriter</artifactId> - <version>1.2.4.Final</version> - </dependency> - <!-- SUPPORT FOR JAVA 12 BUILD END --> <dependency> <groupId>org.jboss.weld.se</groupId> <artifactId>weld-se-core</artifactId> diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml index f8fc208..6e16e75 100644 --- a/wicket-examples/pom.xml +++ b/wicket-examples/pom.xml @@ -48,11 +48,6 @@ <version>1.0</version> </dependency> <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <version>2.0.0.Final</version> - </dependency> - <dependency> <groupId>org.codelibs</groupId> <artifactId>jhighlight</artifactId> <version>1.0.3</version> @@ -61,16 +56,16 @@ </dependencyManagement> <dependencies> <dependency> - <groupId>javax.el</groupId> - <artifactId>javax.el-api</artifactId> + <groupId>jakarta.el</groupId> + <artifactId>jakarta.el-api</artifactId> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> </dependency> <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>javax.servlet.jsp-api</artifactId> + <groupId>jakarta.servlet.jsp</groupId> + <artifactId>jakarta.servlet.jsp-api</artifactId> </dependency> <dependency> <groupId>com.github.axet</groupId> @@ -81,8 +76,8 @@ <artifactId>cage</artifactId> </dependency> <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> + <groupId>jakarta.validation</groupId> + <artifactId>jakarta.validation-api</artifactId> <scope>compile</scope> </dependency> <dependency> @@ -178,7 +173,7 @@ </dependency> <dependency> <groupId>org.glassfish</groupId> - <artifactId>javax.el</artifactId> + <artifactId>jakarta.el</artifactId> </dependency> <dependency> <groupId>org.httpunit</groupId> @@ -272,9 +267,9 @@ <version>${jetty.version}</version> <dependencies> <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <version>1.1.0.Final</version> + <groupId>jakarta.validation</groupId> + <artifactId>jakarta.validation-api</artifactId> + <version>${jakarta.validation-api.version}</version> </dependency> </dependencies> </plugin> diff --git a/wicket-experimental/wicket-metrics/pom.xml b/wicket-experimental/wicket-metrics/pom.xml index 0a155a4..7549841 100644 --- a/wicket-experimental/wicket-metrics/pom.xml +++ b/wicket-experimental/wicket-metrics/pom.xml @@ -38,8 +38,8 @@ <dependencies> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.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 c2be9a8..5970d3c 100644 --- a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml +++ b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml @@ -34,12 +34,12 @@ <dependencies> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> </dependency> <dependency> - <groupId>javax.websocket</groupId> - <artifactId>javax.websocket-api</artifactId> + <groupId>jakarta.websocket</groupId> + <artifactId>jakarta.websocket-api</artifactId> </dependency> <dependency> <groupId>org.apache.wicket</groupId>
