You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/08/15 17:16:30 UTC
[isis] branch release-2.0.0-M6-RC1 updated: ISIS-2483:
experimenting on moving to jakarta ee 8
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M6-RC1
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/release-2.0.0-M6-RC1 by this push:
new 5be630a ISIS-2483: experimenting on moving to jakarta ee 8
5be630a is described below
commit 5be630aeb2cf82d34abb0eb380b8bf49674edb8f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Aug 15 18:16:19 2021 +0100
ISIS-2483: experimenting on moving to jakarta ee 8
---
api/applib/pom.xml | 4 ++--
commons/pom.xml | 4 ++--
core/jdk-supplemental/pom.xml | 4 ----
core/pom.xml | 8 ++++----
mappings/jaxrsclient/applib/pom.xml | 4 ++--
5 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/api/applib/pom.xml b/api/applib/pom.xml
index f57cfcb..785a19f 100644
--- a/api/applib/pom.xml
+++ b/api/applib/pom.xml
@@ -82,8 +82,8 @@
</dependency>
<dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
+ <groupId>jakarta.platform</groupId>
+ <artifactId>jakarta.jakartaee-api</artifactId>
</dependency>
<dependency>
diff --git a/commons/pom.xml b/commons/pom.xml
index 23a0cfb..f4aa6a8 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -74,8 +74,8 @@
<!-- JEE API -->
<dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
+ <groupId>jakarta.platform</groupId>
+ <artifactId>jakarta.jakartaee-api</artifactId>
</dependency>
<dependency>
diff --git a/core/jdk-supplemental/pom.xml b/core/jdk-supplemental/pom.xml
index 536bf94..457dfa5 100644
--- a/core/jdk-supplemental/pom.xml
+++ b/core/jdk-supplemental/pom.xml
@@ -147,10 +147,6 @@
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
</dependency>
diff --git a/core/pom.xml b/core/pom.xml
index ebf2c6b..64e2354 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -122,7 +122,7 @@
<htmlparser.version>2.1</htmlparser.version>
<jakarta.annotation-api.version>2.0.0</jakarta.annotation-api.version>
- <javaee.version>8.0.1</javaee.version>
+ <jakartaee.version>8.0.0</jakartaee.version>
<javafaker.version>1.0.2</javafaker.version>
<javassist.version>3.28.0-GA</javassist.version>
<javax-servlet.version>4.0.1</javax-servlet.version>
@@ -1073,9 +1073,9 @@
</dependency>
<dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- <version>${javaee.version}</version>
+ <groupId>jakarta.platform</groupId>
+ <artifactId>jakarta.jakartaee-api</artifactId>
+ <version>${jakartaee.version}</version>
</dependency>
<dependency>
diff --git a/mappings/jaxrsclient/applib/pom.xml b/mappings/jaxrsclient/applib/pom.xml
index 3cfde83..31fa4c4 100644
--- a/mappings/jaxrsclient/applib/pom.xml
+++ b/mappings/jaxrsclient/applib/pom.xml
@@ -36,8 +36,8 @@
</dependency>
<dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
+ <groupId>jakarta.platform</groupId>
+ <artifactId>jakarta.jakartaee-api</artifactId>
</dependency>
</dependencies>