Skip to content

Commit

Permalink
Cherry pick pom.xml from 4.0
Browse files Browse the repository at this point in the history 
Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
  • Loading branch information
@arjantijms
arjantijms committed Dec 12, 2023
1 parent eb9e26c commit f24d195
Showing 1 changed file with 25 additions and 22 deletions.
47 changes: 25 additions & 22 deletions tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,19 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>1.7.0.Alpha10</version>
<version>1.7.1.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-api</artifactId>
<version>1.7.0.Alpha10</version>
<version>1.7.1.Final</version>
</dependency>
<dependency>
<groupId>fish.payara.arquillian</groupId>
<artifactId>payara-client-ee8</artifactId>
<version>2.3.1</version>
<groupId>org.omnifaces.arquillian</groupId>
<artifactId>glassfish-client-ee10</artifactId>
<version>1.4</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -193,13 +193,13 @@
<dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
<version>1.5.0</version>
<version>1.5.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>2.58.0</version>
<version>2.70.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -237,30 +237,30 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<version>3.11.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.2.0</version>
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.1.2</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version>
<version>3.4.0</version>
<configuration>
<rules>
<requireMavenVersion>
Expand All @@ -280,7 +280,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.2</version>
<version>3.4.0</version>
<configuration>
<attachClasses>true</attachClasses>
<failOnMissingWebXml>false</failOnMissingWebXml>
Expand Down Expand Up @@ -308,7 +308,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>3.0.0-M6</version>
<version>3.1.2</version>
<executions>
<execution>
<phase>post-integration-test</phase>
Expand All @@ -329,7 +329,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>3.0.0-M6</version>
<version>3.1.2</version>
<configuration>
<skipSurefireReport>${skipSurefireReport}</skipSurefireReport>
<aggregate>true</aggregate>
Expand Down Expand Up @@ -371,10 +371,12 @@

<properties>
<!-- Explicit version of Mojarra to test -->

<mojarra.version>4.1.0-SNAPSHOT</mojarra.version>
<mojarra.noupdate>false</mojarra.noupdate>

<!-- Verhicle used for testing the Mojarra version -->
<glassfish.version>7.0.6</glassfish.version>
<glassfish.version>7.0.8</glassfish.version>
<glassfish.root>${maven.multiModuleProjectDirectory}/target</glassfish.root>
<glassfish.home>${glassfish.root}/glassfish7</glassfish.home>
</properties>
Expand All @@ -384,7 +386,7 @@
<dependency>
<groupId>org.omnifaces.arquillian</groupId>
<artifactId>arquillian-glassfish-server-managed</artifactId>
<version>1.2</version>
<version>1.4</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -423,6 +425,7 @@
<goal>copy</goal>
</goals>
<configuration>
<skip>${mojarra.noupdate}</skip>
<artifactItems>
<artifactItem>
<groupId>org.glassfish</groupId>
Expand All @@ -449,7 +452,7 @@
</plugins>
</build>
</profile>



<!-- ### PIRANHA ### -->
Expand All @@ -458,10 +461,10 @@
<id>piranha-embedded-micro</id>

<dependencies>
<!-- Java EE based client dependencies to contact a server via WebSocket or REST -->
<!-- Jakarta EE based client dependencies to contact a server via WebSocket or REST -->
<dependency>
<groupId>fish.payara.arquillian</groupId>
<artifactId>payara-client-ee8</artifactId>
<groupId>org.omnifaces.arquillian</groupId>
<artifactId>glassfish-client-ee10</artifactId>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -678,7 +681,7 @@

<properties>
<!-- Arquillian Dependencies -->
<payara.arquillian.container.version>3.0.alpha6</payara.arquillian.container.version>
<payara.arquillian.container.version>3.0.alpha8</payara.arquillian.container.version>
</properties>

<dependencies>
Expand Down

0 comments on commit f24d195

Please sign in to comment.