Skip to content

Commit

Permalink
Re-activate Payara testsuite and add managed profile
Browse files Browse the repository at this point in the history 
closes: #304
  • Loading branch information
@erdlet
erdlet committed Dec 5, 2022
1 parent cd097c2 commit 14884ec
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 40 deletions.
11 changes: 9 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
69 changes: 68 additions & 1 deletion testsuite/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@
</plugins>
</build>
</profile>

<profile>
<id>testsuite-payara</id>

Expand All @@ -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>
Expand All @@ -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>

Expand Down
17 changes: 2 additions & 15 deletions testsuite/src/test/resources/arquillian.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
22 changes: 0 additions & 22 deletions testsuite/src/test/resources/payara.pem
View file

This file was deleted.

0 comments on commit 14884ec

Please sign in to comment.