From b203fd72fbf80a57101424adc9727cc3aed50358 Mon Sep 17 00:00:00 2001
From: Thomas Andraschko <tandraschko@apache.org>
Date: Mon, 26 Feb 2024 15:35:04 +0100
Subject: [PATCH] added payara-build-managed

---
 .github/workflows/integration.yml             |  2 +-
 deltaspike/modules/data/impl/pom.xml          | 17 +-----
 .../test-mapped-persistence.xml               |  0
 .../test-persistence.xml                      | 60 +++++++++----------
 deltaspike/parent/code/pom.xml                |  2 +-
 5 files changed, 34 insertions(+), 47 deletions(-)
 rename deltaspike/modules/data/impl/src/test/{resources-glassfish => resources-payara}/test-mapped-persistence.xml (100%)
 rename deltaspike/modules/data/impl/src/test/{resources-glassfish => resources-payara}/test-persistence.xml (98%)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 560adc404..754ba29c7 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -35,7 +35,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        profile: [ 'tomee-build-managed', 'wildfly-build-managed' ]
+        profile: [ 'tomee-build-managed', 'wildfly-build-managed', 'payara-build-managed' ]
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/deltaspike/modules/data/impl/pom.xml b/deltaspike/modules/data/impl/pom.xml
index f0e788649..671c88937 100755
--- a/deltaspike/modules/data/impl/pom.xml
+++ b/deltaspike/modules/data/impl/pom.xml
@@ -226,20 +226,7 @@
                         <directory>src/test/resources</directory>
                     </testResource>
                     <testResource>
-                        <directory>src/test/resources-glassfish</directory>
-                    </testResource>
-                </testResources>
-            </build>
-        </profile>
-        <profile>
-            <id>glassfish-build-managed</id>
-            <build>
-                <testResources>
-                    <testResource>
-                        <directory>src/test/resources</directory>
-                    </testResource>
-                    <testResource>
-                        <directory>src/test/resources-glassfish</directory>
+                        <directory>src/test/resources-payara</directory>
                     </testResource>
                 </testResources>
             </build>
@@ -252,7 +239,7 @@
                         <directory>src/test/resources</directory>
                     </testResource>
                     <testResource>
-                        <directory>src/test/resources-glassfish</directory>
+                        <directory>src/test/resources-payara</directory>
                     </testResource>
                 </testResources>
             </build>
diff --git a/deltaspike/modules/data/impl/src/test/resources-glassfish/test-mapped-persistence.xml b/deltaspike/modules/data/impl/src/test/resources-payara/test-mapped-persistence.xml
similarity index 100%
rename from deltaspike/modules/data/impl/src/test/resources-glassfish/test-mapped-persistence.xml
rename to deltaspike/modules/data/impl/src/test/resources-payara/test-mapped-persistence.xml
diff --git a/deltaspike/modules/data/impl/src/test/resources-glassfish/test-persistence.xml b/deltaspike/modules/data/impl/src/test/resources-payara/test-persistence.xml
similarity index 98%
rename from deltaspike/modules/data/impl/src/test/resources-glassfish/test-persistence.xml
rename to deltaspike/modules/data/impl/src/test/resources-payara/test-persistence.xml
index fc90eb509..64744d4b8 100644
--- a/deltaspike/modules/data/impl/src/test/resources-glassfish/test-persistence.xml
+++ b/deltaspike/modules/data/impl/src/test/resources-payara/test-persistence.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements. See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership. The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License. You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
-    <persistence-unit name="test"> 
-        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-        <jta-data-source>jdbc/__default</jta-data-source>
-        <properties>
-            <property name="eclipselink.ddl-generation" value="drop-and-create-tables"/>
-            <property name="eclipselink.logging.level" value="FINE"/>
-            <property name="eclipselink.logging.parameters" value="true" />
-        </properties>
-    </persistence-unit>
-</persistence>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements. See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership. The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License. You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+    <persistence-unit name="test"> 
+        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+        <jta-data-source>jdbc/__default</jta-data-source>
+        <properties>
+            <property name="eclipselink.ddl-generation" value="drop-and-create-tables"/>
+            <property name="eclipselink.logging.level" value="FINE"/>
+            <property name="eclipselink.logging.parameters" value="true" />
+        </properties>
+    </persistence-unit>
+</persistence>
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index e59305276..725c7f325 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -841,7 +841,7 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
                             <systemPropertyVariables>
-                                <arquillian.launch>glassfish-build-managed</arquillian.launch>
+                                <arquillian.launch>payara-build-managed</arquillian.launch>
                                 <org.apache.deltaspike.ProjectStage>UnitTest</org.apache.deltaspike.ProjectStage>
                                 <cdicontainer.version>${cdicontainer.version}</cdicontainer.version>
                             </systemPropertyVariables>