Skip to content

Commit 9e6f8d3

Browse files
arjantijmsarjantijms
committed
Update Payara Arquillian Container
1 parent 8ac88b0 commit 9e6f8d3

2 files changed

Lines changed: 97 additions & 47 deletions

File tree

‎pom.xml‎

Lines changed: 91 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
<skipJACC>${skipTests}</skipJACC>
2424

2525
<!--
26-
Application Server versions
27-
(these are downloaded and installed in these versions by Maven for the CI profiles)
26+
Application Server versions
27+
(these are downloaded and installed in these versions by Maven for the CI profiles)
2828
-->
29-
<payara.version>4.1.1.171.1</payara.version>
29+
<payara.version>4.1.2.173-SNAPSHOT</payara.version>
3030
<glassfish.version>4.1.1</glassfish.version>
3131
<liberty.version>16.0.0.3</liberty.version>
3232
<wildfly.version>10.1.0.Final</wildfly.version>
@@ -38,6 +38,37 @@
3838
<prerequisites>
3939
<maven>${maven.min.version}</maven>
4040
</prerequisites>
41+
42+
<repositories>
43+
<repository>
44+
<id>central</id>
45+
<name>Central Repository</name>
46+
47+
<url>https://repo.maven.apache.org/maven2</url>
48+
49+
<releases>
50+
<enabled>true</enabled>
51+
</releases>
52+
<snapshots>
53+
<enabled>false</enabled>
54+
</snapshots>
55+
</repository>
56+
57+
<repository>
58+
<id>ossrh</id>
59+
<name>Sonatype-snapshot</name>
60+
61+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
62+
63+
<releases>
64+
<enabled>false</enabled>
65+
</releases>
66+
<snapshots>
67+
<enabled>true</enabled>
68+
<updatePolicy>always</updatePolicy>
69+
</snapshots>
70+
</repository>
71+
</repositories>
4172

4273

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

308339
<dependencies>
340+
341+
<!-- WebSocket client dependencies -->
309342
<dependency>
310-
<groupId>org.jboss.arquillian.container</groupId>
311-
<artifactId>arquillian-glassfish-managed-3.1</artifactId>
312-
<version>1.0.0.Final</version>
343+
<groupId>org.glassfish.tyrus</groupId>
344+
<artifactId>tyrus-client</artifactId>
345+
<version>1.13</version>
346+
<scope>test</scope>
347+
</dependency>
348+
<dependency>
349+
<groupId>org.glassfish.tyrus</groupId>
350+
<artifactId>tyrus-container-grizzly-client</artifactId>
351+
<version>1.13</version>
352+
<scope>test</scope>
353+
</dependency>
354+
355+
356+
<!-- JAX-RS client API dependencies -->
357+
<dependency>
358+
<groupId>org.glassfish.jersey.media</groupId>
359+
<artifactId>jersey-media-json-jackson</artifactId>
360+
<version>2.25.1</version>
361+
<scope>test</scope>
362+
</dependency>
363+
<dependency>
364+
<groupId>org.glassfish.jersey.media</groupId>
365+
<artifactId>jersey-media-json-processing</artifactId>
366+
<version>2.25.1</version>
367+
<scope>test</scope>
368+
</dependency>
369+
370+
<!-- The actual Arquillian connector -->
371+
<dependency>
372+
<groupId>org.omnifaces</groupId>
373+
<artifactId>arquillian-payara-server-4-managed</artifactId>
374+
<version>1.0-beta-SNAPSHOT</version>
313375
<scope>test</scope>
314376
</dependency>
315377
</dependencies>
@@ -339,28 +401,6 @@
339401
</artifactItems>
340402
</configuration>
341403
</execution>
342-
343-
<execution>
344-
<id>copy</id>
345-
<phase>process-test-classes</phase>
346-
<goals>
347-
<goal>copy</goal>
348-
</goals>
349-
<configuration>
350-
<artifactItems>
351-
<artifactItem>
352-
<groupId>org.jboss.classfilewriter</groupId>
353-
<artifactId>jboss-classfilewriter</artifactId>
354-
<version>1.2.1.Final</version>
355-
<overWrite>true</overWrite>
356-
<outputDirectory>${session.executionRootDirectory}/target/payara41/glassfish/modules</outputDirectory>
357-
</artifactItem>
358-
</artifactItems>
359-
<stripClassifier>true</stripClassifier>
360-
<stripVersion>true</stripVersion>
361-
</configuration>
362-
</execution>
363-
364404
</executions>
365405
</plugin>
366406
<plugin>
@@ -370,6 +410,12 @@
370410
<environmentVariables>
371411
<GLASSFISH_HOME>${session.executionRootDirectory}/target/payara41</GLASSFISH_HOME>
372412
</environmentVariables>
413+
<!-- This needs tuning -->
414+
<systemPropertyVariables>
415+
<glassfishRemote_gfHome>${session.executionRootDirectory}/target/payara41</glassfishRemote_gfHome>
416+
<javaEEServer>payara-remote</javaEEServer>
417+
<arquillian.launch>payara</arquillian.launch>
418+
</systemPropertyVariables>
373419
</configuration>
374420
</plugin>
375421
</plugins>
@@ -409,6 +455,7 @@
409455
<version>2.25</version>
410456
<scope>test</scope>
411457
</dependency>
458+
412459
<dependency>
413460
<groupId>org.jboss.arquillian.container</groupId>
414461
<artifactId>arquillian-glassfish-embedded-3.1</artifactId>
@@ -432,13 +479,16 @@
432479

433480
<profile>
434481
<id>payara-remote</id>
482+
435483
<dependencies>
436484
<dependency>
437485
<groupId>org.glassfish</groupId>
438486
<artifactId>javax.json</artifactId>
439487
<version>1.0.4</version>
440488
<scope>test</scope>
441489
</dependency>
490+
491+
<!-- WebSocket client dependencies -->
442492
<dependency>
443493
<groupId>org.glassfish.tyrus</groupId>
444494
<artifactId>tyrus-client</artifactId>
@@ -451,33 +501,31 @@
451501
<version>1.13</version>
452502
<scope>test</scope>
453503
</dependency>
454-
<dependency>
455-
<groupId>org.glassfish.jersey.core</groupId>
456-
<artifactId>jersey-client</artifactId>
457-
<version>2.25</version>
458-
<scope>test</scope>
459-
</dependency>
504+
505+
<!-- JAX-RS client API dependencies -->
460506
<dependency>
461507
<groupId>org.glassfish.jersey.media</groupId>
462508
<artifactId>jersey-media-json-jackson</artifactId>
463-
<version>2.25</version>
509+
<version>2.25.1</version>
464510
<scope>test</scope>
465511
</dependency>
466512
<dependency>
467513
<groupId>org.glassfish.jersey.media</groupId>
468514
<artifactId>jersey-media-json-processing</artifactId>
469-
<version>2.25</version>
515+
<version>2.25.1</version>
470516
<scope>test</scope>
471517
</dependency>
518+
519+
<!-- The actual Arquillian connector -->
472520
<dependency>
473-
<groupId>org.jboss.arquillian.container</groupId>
474-
<artifactId>arquillian-glassfish-remote-3.1</artifactId>
475-
<version>1.0.0.Final</version>
521+
<groupId>org.omnifaces</groupId>
522+
<artifactId>arquillian-payara-server-4-remote</artifactId>
523+
<version>1.0-beta-SNAPSHOT</version>
476524
<scope>test</scope>
477525
</dependency>
478526
</dependencies>
479527
<build>
480-
<plugins>
528+
<plugins>
481529
<plugin>
482530
<artifactId>maven-surefire-plugin</artifactId>
483531
<configuration>
@@ -1179,19 +1227,19 @@
11791227
<groupId>org.jboss.arquillian.container</groupId>
11801228
<artifactId>arquillian-wlp-managed-8.5</artifactId>
11811229
<version>1.0.0.Beta2</version>
1182-
</dependency>
1230+
</dependency>
11831231
<dependency>
11841232
<groupId>org.glassfish.tyrus</groupId>
11851233
<artifactId>tyrus-client</artifactId>
11861234
<version>1.3</version>
11871235
<scope>test</scope>
1188-
</dependency>
1236+
</dependency>
11891237
<dependency>
11901238
<groupId>org.glassfish</groupId>
11911239
<artifactId>javax.json</artifactId>
11921240
<version>1.0.4</version>
11931241
<scope>test</scope>
1194-
</dependency>
1242+
</dependency>
11951243
<dependency>
11961244
<groupId>org.glassfish.tyrus</groupId>
11971245
<artifactId>tyrus-container-grizzly-client</artifactId>

‎test-utils/src/main/resources/arquillian.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
55

66
<defaultProtocol type="Servlet 3.0"/>
7-
8-
<!--<engine>-->
9-
<!--<property name="deploymentExportPath">target/deployment</property>-->
10-
<!--</engine>-->
7+
8+
<container qualifier="payara">
9+
<configuration>
10+
<property name="domain">payaradomain</property>
11+
</configuration>
12+
</container>
1113

1214
<container qualifier="wildfly">
1315
<configuration>

0 commit comments

Comments
 (0)