From 37b546e7ff48ab18878f8c091dffcb76aaa4b4a1 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sat, 3 Jul 2021 18:27:24 -0400
Subject: [PATCH 1/7] [pom] Bump weld to 3.1.9.Final

---
 deltaspike/parent/code/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 25f1c01c0..3a7040475 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -747,7 +747,7 @@
 
             <properties>
                 <!-- Actual Weld version used with this profile -->
-                <weld.version>3.1.3.Final</weld.version>
+                <weld.version>3.1.9.Final</weld.version>
                 <cdicontainer.version>weld-${weld.version}</cdicontainer.version>
             </properties>
             

From c5e33ec6bd346d6f8c2b403f848c640995b233f2 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Wed, 20 Apr 2022 21:36:16 -0400
Subject: [PATCH 2/7] [pom] Bump arquillian-weld to 2.1.0.Final for weld3
 profile

---
 deltaspike/parent/code/pom.xml | 4 ++--
 deltaspike/parent/pom.xml      | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 3a7040475..646dd9a4e 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -841,8 +841,8 @@
                 </dependency>
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
-                    <artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
-                    <version>${arquillian-weld.version}</version>
+                    <artifactId>arquillian-weld-embedded</artifactId>
+                    <version>${arquillian-weld3.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index 53d9a2e87..f8c34a0de 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -108,6 +108,7 @@
         <jacoco.version>0.7.4.201502262128</jacoco.version>
 
         <arquillian-weld.version>1.0.0.Final</arquillian-weld.version>
+        <arquillian-weld3.version>2.1.0.Final</arquillian-weld3.version>
 
         <!-- OSGi bundles properties -->
         <deltaspike.osgi.import.deltaspike.version>version="[$(version;==;${deltaspike.osgi.version.clean}),$(version;=+;${deltaspike.osgi.version.clean}))"</deltaspike.osgi.import.deltaspike.version>

From 33231b6022b678f7b740ed77b267c496192d5067 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 3 Jul 2022 19:50:46 -0400
Subject: [PATCH 3/7] [pom] Add relativePath to force look into .m2 for apache
 parent instead of project first

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 3f10aa27c..687132823 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,7 @@
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
         <version>25</version>
+        <relativePath />
     </parent>
 
     <!-- 

From a9bbcf94ed759dc1d6ae4ae7a139f25d9eb45f13 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 3 Jul 2022 23:07:07 -0400
Subject: [PATCH 4/7] [pom] Use correct geronimo 2.0 spec with hibernate
 validator 6 series

---
 deltaspike/parent/code/pom.xml | 2 +-
 deltaspike/parent/pom.xml      | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 646dd9a4e..6411257e0 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -237,7 +237,7 @@
             <properties>
                 <!-- Need newer implementations to be able to run on Java9+ -->
                 <bval.artifactId>bval-jsr</bval.artifactId>
-                <validation.artifactId>geronimo-validation_1.1_spec</validation.artifactId>
+                <validation.artifactId>geronimo-validation_2.0_spec</validation.artifactId>
                 <hibernate.validator.version>6.0.17.Final</hibernate.validator.version>
             </properties>
         </profile>
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index f8c34a0de..edcab45d4 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -90,6 +90,7 @@
         <geronimo-el-2.2-spec.version>1.0.3</geronimo-el-2.2-spec.version>
         <geronimo-validation-1.0-spec.version>1.1</geronimo-validation-1.0-spec.version>
         <geronimo-validation-1.1-spec.version>1.0</geronimo-validation-1.1-spec.version>
+        <geronimo-validation-2.0-spec.version>1.1</geronimo-validation-2.0-spec.version>
         <geronimo-jpa-2.0-spec.version>1.1</geronimo-jpa-2.0-spec.version>
         <geronimo-jta-1.1-spec.version>1.1.1</geronimo-jta-1.1-spec.version>
 
@@ -531,6 +532,13 @@
                 <scope>provided</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-validation_2.0_spec</artifactId>
+                <version>${geronimo-validation-2.0-spec.version}</version>
+                <scope>provided</scope>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jpa_2.0_spec</artifactId>

From 9134be6eba0fc591cfbc17c7d3949d34ae6378a9 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 3 Jul 2022 23:08:31 -0400
Subject: [PATCH 5/7] [pom] Add java 17 support with add opens to tests

- Use surefire 2.22.2
- Add opens for java.lang, java.util, and sun.rmi.transport
---
 deltaspike/parent/pom.xml | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index edcab45d4..480c8184f 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -95,7 +95,7 @@
         <geronimo-jta-1.1-spec.version>1.1.1</geronimo-jta-1.1-spec.version>
 
         <maven.jetty.plugin.version>7.1.5.v20100705</maven.jetty.plugin.version>
-        <maven.surefire.plugin.version>2.19.1</maven.surefire.plugin.version>
+        <maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
         <maven.bundle.plugin.version>3.5.0</maven.bundle.plugin.version>
         <maven.jar.plugin.version>3.1.2</maven.jar.plugin.version>
         <maven.dependency.plugin.version>2.4</maven.dependency.plugin.version>
@@ -241,6 +241,29 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>jdk17on</id>
+            <activation>
+                <jdk>[17,)</jdk>
+            </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-surefire-plugin</artifactId>
+                            <configuration>
+                                <argLine>
+                                    --add-opens java.base/java.lang=ALL-UNNAMED
+                                    --add-opens java.base/java.util=ALL-UNNAMED
+                                    --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED
+                                </argLine>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
     </profiles>
 
 

From 8d607c35364feaba57775d444c6b49b70d72b539 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 3 Jul 2022 23:16:38 -0400
Subject: [PATCH 6/7] [pom] Add jakarta.el at 3.0.4 for jdk9+

---
 deltaspike/parent/code/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 6411257e0..7c9c02c94 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -240,6 +240,13 @@
                 <validation.artifactId>geronimo-validation_2.0_spec</validation.artifactId>
                 <hibernate.validator.version>6.0.17.Final</hibernate.validator.version>
             </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.glassfish</groupId>
+                    <artifactId>jakarta.el</artifactId>
+                    <version>3.0.4</version>
+                </dependency>
+            </dependencies>
         </profile>
         
         <profile>

From e47f70b09d4c880f676ff0bb818a0c46b80f07c8 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 3 Jul 2022 23:47:48 -0400
Subject: [PATCH 7/7] [pom] Fix memory usage in data module

- maxpermsize removed with java 8
- project is set to use java 8
- min memory is too low
- removed comment referring to being set to java 5 which project is not
---
 deltaspike/modules/data/impl/pom.xml     | 2 +-
 deltaspike/modules/data/test-ee7/pom.xml | 2 +-
 deltaspike/parent/pom.xml                | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/deltaspike/modules/data/impl/pom.xml b/deltaspike/modules/data/impl/pom.xml
index 642262cb2..aba4420b0 100755
--- a/deltaspike/modules/data/impl/pom.xml
+++ b/deltaspike/modules/data/impl/pom.xml
@@ -56,7 +56,7 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <configuration>
-                        <argLine>-Xms128m -Xmx1024m -XX:MaxPermSize=256m</argLine>
+                        <argLine>-Xms512m -Xmx1024m</argLine>
                     </configuration>
                 </plugin>
             </plugins>
diff --git a/deltaspike/modules/data/test-ee7/pom.xml b/deltaspike/modules/data/test-ee7/pom.xml
index 2e825f1bc..b40c7fffe 100644
--- a/deltaspike/modules/data/test-ee7/pom.xml
+++ b/deltaspike/modules/data/test-ee7/pom.xml
@@ -43,7 +43,7 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <configuration>
-                        <argLine>-Xms128m -Xmx1024m -XX:MaxPermSize=256m</argLine>
+                        <argLine>-Xms512m -Xmx1024m</argLine>
                     </configuration>
                 </plugin>
             </plugins>
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index 480c8184f..a1e0e9ad1 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -1045,7 +1045,6 @@
             </plugin>
 
             <plugin>
-                <!-- Set compile source at 1.5, since the target JSF impl is 1.2 -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven.compiler.plugin.version}</version>