From 8b2f64da736a7341aba62328a07d0ea65cd6b727 Mon Sep 17 00:00:00 2001
From: Mark Struberg <struberg@apache.org>
Date: Mon, 13 Nov 2023 20:01:43 +0100
Subject: [PATCH] enable TomEE 10 profile

---
 deltaspike/cdictrl/impl-openejb/pom.xml       | 66 ++++++++++++++----
 .../cdise/owb/OpenWebBeansContextControl.java |  2 +-
 deltaspike/cdictrl/pom.xml                    |  6 +-
 deltaspike/dist/full/pom.xml                  |  3 -
 deltaspike/examples/jsf-examples/pom.xml      | 14 ++--
 deltaspike/examples/jsf-playground/pom.xml    |  2 +-
 .../pom.xml                                   |  2 +-
 deltaspike/modules/jsf/impl/pom.xml           | 12 +++-
 deltaspike/parent/code/pom.xml                |  5 +-
 deltaspike/parent/pom.xml                     | 68 ++-----------------
 10 files changed, 82 insertions(+), 98 deletions(-)

diff --git a/deltaspike/cdictrl/impl-openejb/pom.xml b/deltaspike/cdictrl/impl-openejb/pom.xml
index 33967a8f0..5ac270af8 100644
--- a/deltaspike/cdictrl/impl-openejb/pom.xml
+++ b/deltaspike/cdictrl/impl-openejb/pom.xml
@@ -90,42 +90,78 @@
 
     <profiles>
         <profile>
-            <id>OpenEJB-Legacy</id>
+            <id>default</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>org.apache.openejb</groupId>
+                    <groupId>org.apache.tomee</groupId>
                     <artifactId>openejb-core</artifactId>
                     <version>${openejb.version}</version>
                     <scope>provided</scope>
                 </dependency>
-            </dependencies>
-        </profile>
 
-        <profile>
-            <!-- from TomEE-7.0.0 on openejb resides under the tomee group and not openejb anymore -->
-            <id>tomee7-build-managed</id>
-            <dependencies>
                 <dependency>
-                    <groupId>org.apache.tomee</groupId>
-                    <artifactId>openejb-core</artifactId>
-                    <version>${openejb.version}</version>
-                    <scope>provided</scope>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                    <version>3.0.1</version>
+                    <exclusions>
+                        <exclusion> <!-- Is already included in java-ee-api -->
+                            <artifactId>jakarta.activation</artifactId>
+                            <groupId>jakarta.activation-api</groupId>
+                        </exclusion>
+                    </exclusions>
                 </dependency>
+                <dependency>
+                    <groupId>org.glassfish.jaxb</groupId>
+                    <artifactId>jaxb-runtime</artifactId>
+                    <version>3.0.2</version>
+                    <scope>runtime</scope>
+                    <exclusions>
+                        <exclusion> <!-- Is already included in java-ee-api -->
+                            <artifactId>jakarta.activation</artifactId>
+                            <groupId>jakarta.activation-api</groupId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+
             </dependencies>
         </profile>
+
         <profile>
-            <!-- from TomEE-7.0.0 on openejb resides under the tomee group and not openejb anymore -->
-            <id>tomee8-build-managed</id>
+            <id>tomee10-build-managed</id>
             <dependencies>
                 <dependency>
                     <groupId>org.apache.tomee</groupId>
                     <artifactId>openejb-core</artifactId>
-                    <version>${openejb.version}</version>
+                    <version>${tomee10.version}</version>
                     <scope>provided</scope>
                 </dependency>
+
+                <dependency>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                    <version>3.0.1</version>
+                    <exclusions>
+                        <exclusion> <!-- Is already included in java-ee-api -->
+                            <artifactId>jakarta.activation</artifactId>
+                            <groupId>jakarta.activation-api</groupId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>org.glassfish.jaxb</groupId>
+                    <artifactId>jaxb-runtime</artifactId>
+                    <version>3.0.2</version>
+                    <scope>runtime</scope>
+                    <exclusions>
+                        <exclusion> <!-- Is already included in java-ee-api -->
+                            <artifactId>jakarta.activation</artifactId>
+                            <groupId>jakarta.activation-api</groupId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
             </dependencies>
         </profile>
 
diff --git a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContextControl.java b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContextControl.java
index bb6e6a30a..7ee7ae174 100644
--- a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContextControl.java
+++ b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContextControl.java
@@ -113,7 +113,7 @@ static boolean isServletApiAvailable()
     {
         try
         {
-            Class servletClass = Class.forName("javax.servlet.http.HttpSession");
+            Class servletClass = Class.forName("jakarta.servlet.http.HttpSession");
             return servletClass != null;
         }
         catch (ClassNotFoundException e)
diff --git a/deltaspike/cdictrl/pom.xml b/deltaspike/cdictrl/pom.xml
index 999179d2f..41484a233 100644
--- a/deltaspike/cdictrl/pom.xml
+++ b/deltaspike/cdictrl/pom.xml
@@ -22,9 +22,9 @@
 
     <parent>
         <groupId>org.apache.deltaspike</groupId>
-        <artifactId>parent-code</artifactId>
+        <artifactId>parent</artifactId>
         <version>2.0.0-SNAPSHOT</version>
-        <relativePath>../parent/code/pom.xml</relativePath>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.deltaspike.cdictrl</groupId>
@@ -44,9 +44,7 @@
                 <module>api</module>
                 <module>impl-owb</module>
                 <module>impl-weld</module>
-<!--
                 <module>impl-openejb</module>
--->
                 <module>tck</module>
             </modules>
         </profile>
diff --git a/deltaspike/dist/full/pom.xml b/deltaspike/dist/full/pom.xml
index 7f8ae6ace..6295f6c3c 100644
--- a/deltaspike/dist/full/pom.xml
+++ b/deltaspike/dist/full/pom.xml
@@ -120,8 +120,6 @@
             <version>${project.version}</version>
             <scope>runtime</scope>
         </dependency>
-<!--
-
         <dependency>
             <groupId>org.apache.deltaspike.cdictrl</groupId>
             <artifactId>deltaspike-cdictrl-weld</artifactId>
@@ -135,7 +133,6 @@
             <version>${project.version}</version>
             <scope>runtime</scope>
         </dependency>
--->
 
         <dependency>
             <groupId>org.apache.deltaspike.modules</groupId>
diff --git a/deltaspike/examples/jsf-examples/pom.xml b/deltaspike/examples/jsf-examples/pom.xml
index 0e6c2b46c..666f860c1 100644
--- a/deltaspike/examples/jsf-examples/pom.xml
+++ b/deltaspike/examples/jsf-examples/pom.xml
@@ -70,7 +70,7 @@
                 <plugins>
 
                     <plugin>
-                        <groupId>org.apache.openejb.maven</groupId>
+                        <groupId>org.apache.tomee.maven</groupId>
                         <artifactId>tomee-maven-plugin</artifactId>
                         <version>1.0.1</version>
                         <configuration>
@@ -86,12 +86,12 @@
 
     <dependencies>
 
-		<dependency>
-			<groupId>org.apache.openejb</groupId>
-			<artifactId>javaee-api</artifactId>
-			<version>6.0-5</version>
-			<scope>provided</scope>
-		</dependency>
+        <dependency>
+            <groupId>org.apache.tomee</groupId>
+            <artifactId>javaee-api</artifactId>
+            <version>6.0-5</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-api</artifactId>
diff --git a/deltaspike/examples/jsf-playground/pom.xml b/deltaspike/examples/jsf-playground/pom.xml
index e37406f02..5d7121b88 100644
--- a/deltaspike/examples/jsf-playground/pom.xml
+++ b/deltaspike/examples/jsf-playground/pom.xml
@@ -92,7 +92,7 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.apache.openejb.maven</groupId>
+                        <groupId>org.apache.tomee.maven</groupId>
                         <artifactId>tomee-maven-plugin</artifactId>
                         <version>1.0.1</version>
                         <configuration>
diff --git a/deltaspike/examples/security-requested-page-after-login-picketlink/pom.xml b/deltaspike/examples/security-requested-page-after-login-picketlink/pom.xml
index 0607aa143..758b03481 100644
--- a/deltaspike/examples/security-requested-page-after-login-picketlink/pom.xml
+++ b/deltaspike/examples/security-requested-page-after-login-picketlink/pom.xml
@@ -115,7 +115,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>org.apache.tomee</groupId>
             <artifactId>javaee-api</artifactId>
             <version>6.0-6</version>
         </dependency>
diff --git a/deltaspike/modules/jsf/impl/pom.xml b/deltaspike/modules/jsf/impl/pom.xml
index 1f27535c7..37988c907 100644
--- a/deltaspike/modules/jsf/impl/pom.xml
+++ b/deltaspike/modules/jsf/impl/pom.xml
@@ -176,7 +176,7 @@
 
     <profiles>
         <profile>
-            <id>tomee8-build-managed</id>
+            <id>tomee10-build-managed</id>
             <build>
                 <plugins>
                     <!--
@@ -198,6 +198,16 @@
                 </plugins>
             </build>
 
+            <dependencies>
+                <!-- for debugging -->
+                <dependency>
+                    <groupId>org.apache.myfaces.core</groupId>
+                    <artifactId>myfaces-impl</artifactId>
+                    <version>${myfaces.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+
         </profile>
     </profiles>
 
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 68bfe3d19..a34ec5f93 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -526,8 +526,8 @@
             <id>tomee10-build-managed</id>
 
             <properties>
-                <tomee.version>10.0.0-M1-SNAPSHOT</tomee.version>
-                <openejb.version>${tomee.version}</openejb.version>
+                <tomee.version>${tomee10.version}</tomee.version>
+                <openejb.version>${tomee10.version}</openejb.version>
                 <jakartaeeapi.version>10.0-SNAPSHOT</jakartaeeapi.version>
                 <owb.version>4.0.1-SNAPSHOT</owb.version>
                 <cdicontainer.version>tomee-${tomee.version}</cdicontainer.version>
@@ -594,6 +594,7 @@
                 </plugins>
             </build>
         </profile>
+
         <profile>
             <!--
              * WildFly has to be locally installed
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index c6d4ac8a3..d3b69d993 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -54,13 +54,15 @@
         <weld.version>4.0.3.Final</weld.version>
 
         <!-- for cdictrl-openejb -->
-        <openejb.version>4.7.5</openejb.version>
-        <tomee.version>9.0.0.RC1</tomee.version>
+        <openejb.version>9.1.1</openejb.version>
+        <tomee10.version>10.0.0-M1-SNAPSHOT</tomee10.version>
+        <tomee.version>${tomee10.version}</tomee.version>
+
         <openejb.owb.version>${owb.version}</openejb.owb.version>
 
         <!-- testing stuff -->
         <junit.version>4.13.2</junit.version>
-        <arquillian.version>1.7.0.Alpha13</arquillian.version>
+        <arquillian.version>1.7.1.Final</arquillian.version>
 
         <!-- JSF-2.0 implementations-->
         <myfaces.version>4.0.1</myfaces.version>
@@ -481,66 +483,6 @@
                 <version>1.2.2</version>
             </dependency>
 
-<!--
-            &lt;!&ndash; TomEE dependencies &ndash;&gt;
-            <dependency>
-                <groupId>org.apache.openejb</groupId>
-                <artifactId>arquillian-tomee-remote</artifactId>
-                <version>${tomee.version}</version>
-                <scope>test</scope>
-            </dependency>
-
-            &lt;!&ndash; TomEE 7.x dependencies &ndash;&gt;
-            <dependency>
-                <groupId>org.apache.tomee</groupId>
-                <artifactId>arquillian-tomee-remote</artifactId>
-                <version>${tomee.version}</version>
-                <scope>test</scope>
-            </dependency>
-
-            &lt;!&ndash; dependency for DELTASPIKE-113 &ndash;&gt;
-            <dependency>
-                <groupId>javassist</groupId>
-                <artifactId>javassist</artifactId>
-                <version>3.12.1.GA</version>
-                <scope>provided</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.myfaces.core</groupId>
-                <artifactId>myfaces-api</artifactId>
-                <version>${myfaces.version}</version>
-                <scope>provided</scope>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-jcdi_1.0_spec</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.myfaces.core</groupId>
-                <artifactId>myfaces-impl</artifactId>
-                <version>${myfaces.version}</version>
-                <scope>provided</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.myfaces.core</groupId>
-                <artifactId>myfaces-impl-test</artifactId>
-                <version>${myfaces.version}</version>
-                <scope>provided</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.myfaces.test</groupId>
-                <artifactId>myfaces-test20</artifactId>
-                <version>1.0.6</version>
-                <scope>provided</scope>
-            </dependency>
-
--->
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-all</artifactId>