You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/08/16 10:33:38 UTC
[isis] branch master updated: ISIS-2836: provide Jakarta EE via
artifact isis-jdk-supplemental
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new c3b6f9a ISIS-2836: provide Jakarta EE via artifact isis-jdk-supplemental
c3b6f9a is described below
commit c3b6f9a5490c6d121adf0ad52bf6a5b1f48f64b3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Aug 16 12:33:29 2021 +0200
ISIS-2836: provide Jakarta EE via artifact isis-jdk-supplemental
---
api/applib/pom.xml | 12 +++++++-----
commons/pom.xml | 8 +-------
core/jdk-supplemental/pom.xml | 12 +++++++-----
core/pom.xml | 8 ++++----
mappings/jaxrsclient/applib/pom.xml | 5 +++--
5 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/api/applib/pom.xml b/api/applib/pom.xml
index c94f3dd..aacf0bf 100644
--- a/api/applib/pom.xml
+++ b/api/applib/pom.xml
@@ -70,6 +70,13 @@
<dependencies>
+ <!-- JDK11+ SUPPORT AND JEE API -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-jdk-supplemental</artifactId>
+ <type>pom</type>
+ </dependency>
+
<dependency>
<groupId>org.apache.isis.commons</groupId>
<artifactId>isis-commons</artifactId>
@@ -82,11 +89,6 @@
</dependency>
<dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- </dependency>
-
- <dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
</dependency>
diff --git a/commons/pom.xml b/commons/pom.xml
index 8f5153e..55f434d 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -55,7 +55,7 @@
<dependencies>
- <!-- JDK11+ SUPPORT -->
+ <!-- JDK11+ SUPPORT AND JEE API -->
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -63,12 +63,6 @@
<type>pom</type>
</dependency>
- <!-- JEE API -->
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- </dependency>
-
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
diff --git a/core/jdk-supplemental/pom.xml b/core/jdk-supplemental/pom.xml
index 51053c5..00f065d 100644
--- a/core/jdk-supplemental/pom.xml
+++ b/core/jdk-supplemental/pom.xml
@@ -28,7 +28,7 @@
<name>Apache Isis - JDK Supplemental</name>
<description>
Defines a module to bring in dependencies that were part of JDK 8 but
- had been removed with later JDK versions.
+ had been removed with later JDK versions. Also brings in Jakarta EE API.
</description>
<build>
@@ -144,10 +144,6 @@
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
</dependency>
@@ -155,6 +151,12 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>jakarta.platform</groupId>
+ <artifactId>jakarta.jakartaee-api</artifactId>
+ </dependency>
+
</dependencies>
</project>
diff --git a/core/pom.xml b/core/pom.xml
index cc48e6c..30c4271 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>
@@ -1039,9 +1039,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 fbaa7a1..6d36d6d 100644
--- a/mappings/jaxrsclient/applib/pom.xml
+++ b/mappings/jaxrsclient/applib/pom.xml
@@ -36,8 +36,9 @@
</dependency>
<dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-jdk-supplemental</artifactId>
+ <type>pom</type>
</dependency>
</dependencies>