Skip to content

Commit 6ac3703

Browse files
arjantijmsarjantijms
committed
Updated Arquillian connector for Payara, fixing classpath bugs
1 parent ff23226 commit 6ac3703

File tree

1 file changed

+64
-61
lines changed

1 file changed

+64
-61
lines changed

‎pom.xml

+64-61
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525

2626
<!-- Application Server versions (these are downloaded and installed
2727
in these versions by Maven for the CI profiles) -->
28-
<payara.version>5.Beta1</payara.version>
28+
<payara.version>5.Beta2</payara.version>
2929
<glassfish.version>4.1.1</glassfish.version>
30-
<tomcat.version>8.5.6</tomcat.version>
30+
<tomcat.version>9.0.4</tomcat.version>
3131
</properties>
3232

3333
<repositories>
@@ -43,14 +43,24 @@
4343
<snapshots>
4444
<enabled>false</enabled>
4545
</snapshots>
46-
</repository>
46+
</repository>
47+
48+
<repository>
49+
<id>payara-milestones</id>
50+
<name>Payara Milestones</name>
51+
<url>https://raw.github.com/payara/Payara_PatchedProjects/master</url>
52+
<releases>
53+
<enabled>true</enabled>
54+
</releases>
55+
<snapshots>
56+
<enabled>false</enabled>
57+
</snapshots>
58+
</repository>
4759

4860
<repository>
4961
<id>ossrh</id>
5062
<name>Sonatype-snapshot</name>
51-
5263
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
53-
5464
<releases>
5565
<enabled>false</enabled>
5666
</releases>
@@ -101,27 +111,33 @@
101111
<module>json-p</module>
102112
</modules>
103113

104-
<dependencyManagement>
105-
<dependencies>
106-
<dependency>
107-
<groupId>org.jboss.arquillian</groupId>
108-
<artifactId>arquillian-bom</artifactId>
109-
<version>1.2.0.Final</version>
110-
<scope>import</scope>
111-
<type>pom</type>
112-
</dependency>
113-
<dependency>
114-
<groupId>org.jboss.arquillian.container</groupId>
115-
<artifactId>arquillian-container-test-api</artifactId>
116-
<version>1.2.0.Final</version>
117-
</dependency>
118-
<dependency>
119-
<groupId>com.h2database</groupId>
120-
<artifactId>h2</artifactId>
121-
<version>1.4.196</version>
122-
</dependency>
123-
</dependencies>
124-
</dependencyManagement>
114+
<dependencyManagement>
115+
<dependencies>
116+
<dependency>
117+
<groupId>org.jboss.arquillian</groupId>
118+
<artifactId>arquillian-bom</artifactId>
119+
<version>1.2.1.Final</version>
120+
<scope>import</scope>
121+
<type>pom</type>
122+
</dependency>
123+
<dependency>
124+
<groupId>org.jboss.arquillian.container</groupId>
125+
<artifactId>arquillian-container-test-api</artifactId>
126+
<version>1.2.1.Final</version>
127+
</dependency>
128+
<dependency>
129+
<groupId>com.h2database</groupId>
130+
<artifactId>h2</artifactId>
131+
<version>1.4.196</version>
132+
</dependency>
133+
<dependency>
134+
<groupId>fish.payara.arquillian</groupId>
135+
<artifactId>payara-client-ee8</artifactId>
136+
<version>1.0.Beta3-m1</version>
137+
<scope>test</scope>
138+
</dependency>
139+
</dependencies>
140+
</dependencyManagement>
125141

126142

127143
<dependencies>
@@ -270,7 +286,9 @@
270286
</configuration>
271287
</plugin>
272288
<plugin>
289+
<groupId>org.apache.maven.plugins</groupId>
273290
<artifactId>maven-enforcer-plugin</artifactId>
291+
<version>3.0.0-M1</version>
274292
<configuration>
275293
<rules>
276294
<requireMavenVersion>
@@ -315,8 +333,7 @@
315333

316334

317335

318-
<!-- Profiles for the application servers against which the samples are
319-
run -->
336+
<!-- Profiles for the application servers against which the samples are run -->
320337

321338

322339
<profiles>
@@ -331,38 +348,20 @@
331348
<activeByDefault>true</activeByDefault>
332349
</activation>
333350

334-
<dependencies>
335-
336-
<!-- Yasson (JSON-B RI) -->
337-
<dependency>
338-
<groupId>org.eclipse</groupId>
339-
<artifactId>yasson</artifactId>
340-
<version>1.0</version>
341-
<scope>runtime</scope>
342-
</dependency>
343-
344-
<!-- WebSocket client dependencies -->
345-
<dependency>
346-
<groupId>org.glassfish.tyrus</groupId>
347-
<artifactId>tyrus-client</artifactId>
348-
<version>1.13.1</version>
349-
<scope>test</scope>
350-
</dependency>
351-
<dependency>
352-
<groupId>org.glassfish.tyrus</groupId>
353-
<artifactId>tyrus-container-grizzly-client</artifactId>
354-
<version>1.13.1</version>
355-
<scope>test</scope>
356-
</dependency>
357-
358-
<!-- The actual Arquillian connector -->
359-
<dependency>
360-
<groupId>org.omnifaces</groupId>
361-
<artifactId>arquillian-payara-server-4-managed</artifactId>
362-
<version>1.0-beta2-SNAPSHOT</version>
363-
<scope>test</scope>
364-
</dependency>
365-
</dependencies>
351+
<dependencies>
352+
<dependency>
353+
<groupId>fish.payara.arquillian</groupId>
354+
<artifactId>payara-client-ee8</artifactId>
355+
</dependency>
356+
357+
<!-- The actual Arquillian connector -->
358+
<dependency>
359+
<groupId>fish.payara.arquillian</groupId>
360+
<artifactId>arquillian-payara-server-4-managed</artifactId>
361+
<version>1.0.Beta3-m1</version>
362+
<scope>test</scope>
363+
</dependency>
364+
</dependencies>
366365

367366
<build>
368367
<plugins>
@@ -478,12 +477,16 @@
478477
<id>payara-remote</id>
479478

480479
<dependencies>
480+
<dependency>
481+
<groupId>fish.payara.arquillian</groupId>
482+
<artifactId>payara-client-ee8</artifactId>
483+
</dependency>
481484

482485
<!-- The actual Arquillian connector -->
483486
<dependency>
484487
<groupId>fish.payara.arquillian</groupId>
485488
<artifactId>arquillian-payara-server-4-remote</artifactId>
486-
<version>1.0.Beta2</version>
489+
<version>1.0.Beta3-m1</version>
487490
<scope>test</scope>
488491
</dependency>
489492
</dependencies>

0 commit comments

Comments
 (0)