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/06/20 15:56:39 UTC

[isis] branch ISIS-2758 updated: ISIS-2758: reverted changes in attempting to exclude java faces from java ee api;

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-2758
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/ISIS-2758 by this push:
     new 902597b  ISIS-2758: reverted changes in attempting to exclude java faces from java ee api;
902597b is described below

commit 902597ba7523acfd16d922d8f6589beb31281654
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Jun 20 16:56:24 2021 +0100

    ISIS-2758: reverted changes in attempting to exclude java faces from java ee api;
    
    ... new impl of ImpersonatedUserHolderWithSession does the trick, it would seem.
---
 api/applib/pom.xml | 27 ---------------------------
 commons/pom.xml    |  6 ------
 core/pom.xml       | 35 -----------------------------------
 3 files changed, 68 deletions(-)

diff --git a/api/applib/pom.xml b/api/applib/pom.xml
index 047dc04..c94f3dd 100644
--- a/api/applib/pom.xml
+++ b/api/applib/pom.xml
@@ -85,33 +85,6 @@
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
         </dependency>
-<!--
-        <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.transaction</groupId>
-            <artifactId>jta</artifactId>
-        </dependency>
--->
-
 
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
diff --git a/commons/pom.xml b/commons/pom.xml
index 7bfd744..acb7eef 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -77,12 +77,6 @@
 			<groupId>javax</groupId>
 			<artifactId>javaee-api</artifactId>
 		</dependency>
-<!--
-		<dependency>
-			<groupId>javax.enterprise</groupId>
-			<artifactId>cdi-api</artifactId>
-		</dependency>
--->
 
 		<dependency>
 			<groupId>com.google.code.findbugs</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index e11d29b..8393c2a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -126,11 +126,6 @@
 
 		<jakarta.annotation-api.version>2.0.0</jakarta.annotation-api.version>
 		<javaee.version>8.0.1</javaee.version>
-		<javaee-javax.annotation-api.version>1.3</javaee-javax.annotation-api.version>
-		<javaee-javax-validation-api.version>2.0.1.Final</javaee-javax-validation-api.version>
-		<javaee-javax-servlet.version>4.0.1</javaee-javax-servlet.version>
-		<javaee-javax.ws.rs-api.version>2.1.1</javaee-javax.ws.rs-api.version>
-		<javaee-jta.version>1.1</javaee-jta.version>
 
 		<javafaker.version>1.0.2</javafaker.version>
 		<javassist.version>3.28.0-GA</javassist.version>
@@ -1081,36 +1076,6 @@
 			</dependency>
 
 			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>javax.servlet-api</artifactId>
-				<version>${javaee-javax-servlet.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>javax.validation</groupId>
-				<artifactId>validation-api</artifactId>
-				<version>${javaee-javax-validation-api.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>javax.annotation</groupId>
-				<artifactId>javax.annotation-api</artifactId>
-				<version>${javaee-javax.annotation-api.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>javax.ws.rs</groupId>
-				<artifactId>javax.ws.rs-api</artifactId>
-				<version>${javaee-javax.ws.rs-api.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>javax.transaction</groupId>
-				<artifactId>jta</artifactId>
-				<version>${javaee-jta.version}</version>
-			</dependency>
-
-			<dependency>
 				<groupId>javax.jdo</groupId>
 				<artifactId>jdo-api</artifactId>
 				<version>${jdo-api.version}</version>