From 14884ec5596f790b43709e9330bb8da5153ec641 Mon Sep 17 00:00:00 2001
From: "Erdle, Tobias" <tobi.erdle@gmail.com>
Date: Mon, 5 Dec 2022 22:16:11 +0100
Subject: [PATCH] Re-activate Payara testsuite and add managed profile

closes: #304
---
 pom.xml                                     | 11 +++-
 testsuite/pom.xml                           | 69 ++++++++++++++++++++-
 testsuite/src/test/resources/arquillian.xml | 17 +----
 testsuite/src/test/resources/payara.pem     | 22 -------
 4 files changed, 79 insertions(+), 40 deletions(-)
 delete mode 100644 testsuite/src/test/resources/payara.pem

diff --git a/pom.xml b/pom.xml
index 75bd89fc..e4451da1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -532,8 +532,15 @@
 
             <dependency>
                 <groupId>fish.payara.arquillian</groupId>
-                <artifactId>arquillian-payara-server-4-remote</artifactId>
-                <version>1.1</version>
+                <artifactId>arquillian-payara-server-remote</artifactId>
+                <version>3.0.alpha7</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>fish.payara.arquillian</groupId>
+                <artifactId>arquillian-payara-server-managed</artifactId>
+                <version>3.0.alpha7</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 58560a05..ece0d552 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -286,6 +286,7 @@
                 </plugins>
             </build>
         </profile>
+
         <profile>
             <id>testsuite-payara</id>
 
@@ -296,7 +297,7 @@
             <dependencies>
                 <dependency>
                     <groupId>fish.payara.arquillian</groupId>
-                    <artifactId>arquillian-payara-server-4-remote</artifactId>
+                    <artifactId>arquillian-payara-server-remote</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>org.eclipse.krazo</groupId>
@@ -322,6 +323,72 @@
             </build>
         </profile>
 
+        <profile>
+            <id>testsuite-payara-managed</id>
+
+            <properties>
+                <skipITs>false</skipITs>
+                <payara.version>6.2022.1</payara.version>
+            </properties>
+
+            <dependencies>
+                <dependency>
+                    <groupId>fish.payara.arquillian</groupId>
+                    <artifactId>arquillian-payara-server-managed</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.eclipse.krazo</groupId>
+                    <artifactId>krazo-jersey</artifactId>
+                    <version>${project.version}</version>
+                    <scope>runtime</scope>
+                </dependency>
+            </dependencies>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <version>${maven-dependency-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>unpack</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>fish.payara.distributions</groupId>
+                                            <artifactId>payara</artifactId>
+                                            <version>${payara.version}</version>
+                                            <type>zip</type>
+                                            <overWrite>false</overWrite>
+                                            <outputDirectory>${project.build.directory}
+                                            </outputDirectory>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <skipITs>false</skipITs>
+                            <systemProperties>
+                                <arquillian.launch>payara-managed</arquillian.launch>
+                                <testsuite.profile>testsuite-payara-managed</testsuite.profile>
+                                <payara.home>${project.build.directory}/payara6/</payara.home>
+                            </systemProperties>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
         <profile>
             <id>testsuite-liberty</id>
 
diff --git a/testsuite/src/test/resources/arquillian.xml b/testsuite/src/test/resources/arquillian.xml
index 5f17dfca..f432f3ca 100644
--- a/testsuite/src/test/resources/arquillian.xml
+++ b/testsuite/src/test/resources/arquillian.xml
@@ -51,21 +51,8 @@
         </configuration>
     </container>
 
-    <container qualifier="payara">
-        <configuration>
-            <property name="adminHttps">true</property>
-            <property name="adminUser">admin</property>
-            <property name="adminPassword">admin</property>
-        </configuration>
-    </container>
-
-    <container qualifier="tomee">
-        <configuration>
-            <property name="deployerProperties">
-                openejb.deployer.binaries.use=true
-            </property>
-        </configuration>
-    </container>
+    <container qualifier="payara"/>
+    <container qualifier="payara-managed"/>
 
     <container qualifier="liberty">
         <configuration>
diff --git a/testsuite/src/test/resources/payara.pem b/testsuite/src/test/resources/payara.pem
deleted file mode 100644
index e516b162..00000000
--- a/testsuite/src/test/resources/payara.pem
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDnTCCAoWgAwIBAgIEMTD4sDANBgkqhkiG9w0BAQsFADB/MQswCQYDVQQGEwJV
-SzEXMBUGA1UECBMOV29yY2VzdGVyc2hpcmUxFjAUBgNVBAcTDUdyZWF0IE1hbHZl
-cm4xGjAYBgNVBAoTEVBheWFyYSBGb3VuZGF0aW9uMQ8wDQYDVQQLEwZQYXlhcmEx
-EjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0yMDA4MDcxNzU1MDJaFw0zMDA4MDUxNzU1
-MDJaMH8xCzAJBgNVBAYTAlVLMRcwFQYDVQQIEw5Xb3JjZXN0ZXJzaGlyZTEWMBQG
-A1UEBxMNR3JlYXQgTWFsdmVybjEaMBgGA1UEChMRUGF5YXJhIEZvdW5kYXRpb24x
-DzANBgNVBAsTBlBheWFyYTESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiTJ/oUWfEio32qb8cSowEIgsay0/nfxCfklr
-kSRCfYz8FZ4ICGY3QjhoOSmsmK62iHil8i1bLfs0dPS0cmzXmKl1ZFcybyypsErA
-f5nXJ461QEW88jpLijW3meBmpAa7Yg5QecwD5wpmYeQzPrWodpoMlBTb6TkUX37N
-Tb4wdmmHWyt6Y2vscSVCNIqFUgIvdSXXZU6xaUakMDxrM74knVHMMqe94+LnvGBd
-X6+1C43ngOT7hXXFeUWK+7SpCOhVXOeICXjnrdM0lfWKVF3o/WPKS4FpBSlG0UgW
-RK5H4jC3KqbBH2edxHStMS4T3mZeR21CeAhLOJyhIJR2bCKoqwIDAQABoyEwHzAd
-BgNVHQ4EFgQUswWIlePelzi4RFwcwESJajRSTnswDQYJKoZIhvcNAQELBQADggEB
-ABRMu0kS1E8FLmUSGwz8YUod4CuVvTD0U0xXPD9zloiCnMUbIiCPKlVx9obZqGvQ
-TgaAOdF1n+C1VNuDFGRpgF28ErL23M/zsR9R0fvgmnGN6NIN/LWdlbxxSeXVQ9XH
-yyXQrDrvaOeGPGWfag2oGT6q/LFQg2geKyNKOoPLTs0/53WVp5KqvzOyiP63RBog
-WxHPSSc9XsX9DNbvC3DdVVwAIKQKVEnEkQYF2cLKIUsigweLetW7Ap2yT6Ir49oP
-uca4ol77z6jMw9OqDAcAftfmwQZYqpj0J8WD0r+f2CxHAACVKjXuHPG7ylGOCHRR
-L7z7CgObcl/7WZH8LV0D/sA=
------END CERTIFICATE-----