Skip to content

Commit

Permalink
Update Payara Arquillian Container
Browse files Browse the repository at this point in the history
  • Loading branch information
@arjantijms
arjantijms committed Jun 12, 2017
1 parent 8ac88b0 commit 9e6f8d3
Show file tree
Hide file tree
Showing 2 changed files with 97 additions and 47 deletions.
134 changes: 91 additions & 43 deletions pom.xml
View file
Expand Up @@ -23,10 +23,10 @@
<skipJACC>${skipTests}</skipJACC>

<!--
Application Server versions
(these are downloaded and installed in these versions by Maven for the CI profiles)
Application Server versions
(these are downloaded and installed in these versions by Maven for the CI profiles)
-->
<payara.version>4.1.1.171.1</payara.version>
<payara.version>4.1.2.173-SNAPSHOT</payara.version>
<glassfish.version>4.1.1</glassfish.version>
<liberty.version>16.0.0.3</liberty.version>
<wildfly.version>10.1.0.Final</wildfly.version>
Expand All @@ -38,6 +38,37 @@
<prerequisites>
<maven>${maven.min.version}</maven>
</prerequisites>

<repositories>
<repository>
<id>central</id>
<name>Central Repository</name>

<url>https://repo.maven.apache.org/maven2</url>

<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>

<repository>
<id>ossrh</id>
<name>Sonatype-snapshot</name>

<url>https://oss.sonatype.org/content/repositories/snapshots</url>

<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>


<!-- The Java EE 7 specs that this project is providing samples for.
Expand Down Expand Up @@ -306,10 +337,41 @@
</activation>

<dependencies>

<!-- WebSocket client dependencies -->
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-glassfish-managed-3.1</artifactId>
<version>1.0.0.Final</version>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-client</artifactId>
<version>1.13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-container-grizzly-client</artifactId>
<version>1.13</version>
<scope>test</scope>
</dependency>


<!-- JAX-RS client API dependencies -->
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>2.25.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-processing</artifactId>
<version>2.25.1</version>
<scope>test</scope>
</dependency>

<!-- The actual Arquillian connector -->
<dependency>
<groupId>org.omnifaces</groupId>
<artifactId>arquillian-payara-server-4-managed</artifactId>
<version>1.0-beta-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -339,28 +401,6 @@
</artifactItems>
</configuration>
</execution>

<execution>
<id>copy</id>
<phase>process-test-classes</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.jboss.classfilewriter</groupId>
<artifactId>jboss-classfilewriter</artifactId>
<version>1.2.1.Final</version>
<overWrite>true</overWrite>
<outputDirectory>${session.executionRootDirectory}/target/payara41/glassfish/modules</outputDirectory>
</artifactItem>
</artifactItems>
<stripClassifier>true</stripClassifier>
<stripVersion>true</stripVersion>
</configuration>
</execution>

</executions>
</plugin>
<plugin>
Expand All @@ -370,6 +410,12 @@
<environmentVariables>
<GLASSFISH_HOME>${session.executionRootDirectory}/target/payara41</GLASSFISH_HOME>
</environmentVariables>
<!-- This needs tuning -->
<systemPropertyVariables>
<glassfishRemote_gfHome>${session.executionRootDirectory}/target/payara41</glassfishRemote_gfHome>
<javaEEServer>payara-remote</javaEEServer>
<arquillian.launch>payara</arquillian.launch>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
Expand Down Expand Up @@ -409,6 +455,7 @@
<version>2.25</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-glassfish-embedded-3.1</artifactId>
Expand All @@ -432,13 +479,16 @@

<profile>
<id>payara-remote</id>

<dependencies>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<version>1.0.4</version>
<scope>test</scope>
</dependency>

<!-- WebSocket client dependencies -->
<dependency>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-client</artifactId>
Expand All @@ -451,33 +501,31 @@
<version>1.13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>2.25</version>
<scope>test</scope>
</dependency>

<!-- JAX-RS client API dependencies -->
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>2.25</version>
<version>2.25.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-processing</artifactId>
<version>2.25</version>
<version>2.25.1</version>
<scope>test</scope>
</dependency>

<!-- The actual Arquillian connector -->
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-glassfish-remote-3.1</artifactId>
<version>1.0.0.Final</version>
<groupId>org.omnifaces</groupId>
<artifactId>arquillian-payara-server-4-remote</artifactId>
<version>1.0-beta-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Expand Down Expand Up @@ -1179,19 +1227,19 @@
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-wlp-managed-8.5</artifactId>
<version>1.0.0.Beta2</version>
</dependency>
</dependency>
<dependency>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-client</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<version>1.0.4</version>
<scope>test</scope>
</dependency>
</dependency>
<dependency>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-container-grizzly-client</artifactId>
Expand Down
10 changes: 6 additions & 4 deletions test-utils/src/main/resources/arquillian.xml
View file
Expand Up @@ -4,10 +4,12 @@
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">

<defaultProtocol type="Servlet 3.0"/>

<!--<engine>-->
<!--<property name="deploymentExportPath">target/deployment</property>-->
<!--</engine>-->

<container qualifier="payara">
<configuration>
<property name="domain">payaradomain</property>
</configuration>
</container>

<container qualifier="wildfly">
<configuration>
Expand Down

0 comments on commit 9e6f8d3

Please sign in to comment.