Skip to content

Commit

Permalink
Fix parent versions in new test module
Browse files Browse the repository at this point in the history
  • Loading branch information
BalusC committed Sep 7, 2024
1 parent 63ee9d2 commit a3f5921
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 8 deletions.
2 changes: 1 addition & 1 deletion test/base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.eclipse.mojarra.test</groupId>
<artifactId>pom</artifactId>
<version>4.0.9-SNAPSHOT</version>
<version>4.1.2-SNAPSHOT</version>
</parent>

<artifactId>base</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/issue5460/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.eclipse.mojarra.test</groupId>
<artifactId>pom</artifactId>
<version>4.0.9-SNAPSHOT</version>
<version>4.1.2-SNAPSHOT</version>
</parent>

<artifactId>issue5460</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/issue5464/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.eclipse.mojarra.test</groupId>
<artifactId>pom</artifactId>
<version>4.0.9-SNAPSHOT</version>
<version>4.1.2-SNAPSHOT</version>
</parent>

<artifactId>issue5464</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/issue5488/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.eclipse.mojarra.test</groupId>
<artifactId>pom</artifactId>
<version>4.0.9-SNAPSHOT</version>
<version>4.1.2-SNAPSHOT</version>
</parent>

<artifactId>issue5488</artifactId>
Expand Down
17 changes: 13 additions & 4 deletions test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish</groupId>
<artifactId>mojarra-parent</artifactId>
<version>4.0.9-SNAPSHOT</version>
<version>4.1.2-SNAPSHOT</version>
</parent>

<groupId>org.eclipse.mojarra.test</groupId>
Expand All @@ -39,10 +39,19 @@
</modules>

<properties>
<glassfish.version>7.0.16</glassfish.version>
<glassfish.version>8.0.0-JDK17-M7</glassfish.version>
<glassfish.home>glassfish8</glassfish.home>
<arquillian.browser>chrome</arquillian.browser>
</properties>

<repositories>
<repository>
<id>jakarta-staging</id>
<snapshots />
<url>https://jakarta.oss.sonatype.org/content/repositories/staging</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>jakarta.platform</groupId>
Expand Down Expand Up @@ -173,7 +182,7 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/glassfish7/glassfish/modules</outputDirectory>
<outputDirectory>${project.build.directory}/${glassfish.home}/glassfish/modules</outputDirectory>
<destFileName>jakarta.faces.jar</destFileName>
</artifactItem>
</artifactItems>
Expand All @@ -186,7 +195,7 @@
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<glassfish.home>${project.build.directory}/glassfish7</glassfish.home>
<glassfish.home>${project.build.directory}/${glassfish.home}</glassfish.home>
</systemPropertyVariables>
</configuration>
</plugin>
Expand Down

0 comments on commit a3f5921

Please sign in to comment.