Skip to content

Commit

Permalink
[issues-133] - (Unrelated) Fix the testsuite EAP XP 5 deployments, in…
Browse files Browse the repository at this point in the history 
… order to set the XP GA bits version
  • Loading branch information
@fabiobrz
fabiobrz committed Nov 22, 2024
1 parent b7a643d commit 864c71d
Show file tree
Hide file tree
Showing 2 changed files with 145 additions and 9 deletions.
77 changes: 76 additions & 1 deletion testsuite/deployments/openshift-jakarta-sample-standalone/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@
<version>${maven-war-plugin.version}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
<!-- <outputDirectory>target</outputDirectory>-->
<warName>ROOT</warName>
</configuration>
</plugin>
Expand Down Expand Up @@ -276,6 +275,82 @@
</plugins>
</build>
</profile>
<profile>
<!-- Configuration settings for testing EAP XP -->
<id>ts.wildfly.target-distribution.eapxp</id>
<properties>
<!-- WildFly/EAP 8 Maven Plugin coordinates -->
<wildfly-maven-plugin.groupId>org.jboss.eap.plugins</wildfly-maven-plugin.groupId>
<wildfly-maven-plugin.artifactId>eap-maven-plugin</wildfly-maven-plugin.artifactId>
<wildfly-maven-plugin.version>1.0.0.Final-redhat-00014</wildfly-maven-plugin.version>
<!-- Default EAP XP `microprofile` BOM version is set here and can be overridden for pulling the right BOM -->
<bom.wildfly-microprofile.groupId>org.jboss.bom</bom.wildfly-microprofile.groupId>
<bom.wildfly-microprofile.artifactId>jboss-eap-xp-microprofile</bom.wildfly-microprofile.artifactId>
<bom.wildfly-microprofile.version>5.0.0.GA-redhat-00009</bom.wildfly-microprofile.version>
<!-- EAP 8 Channel coordinates -->
<wildfly.ee-channel.groupId>org.jboss.eap.channels</wildfly.ee-channel.groupId>
<wildfly.ee-channel.artifactId>eap-8.0</wildfly.ee-channel.artifactId>
<wildfly.ee-channel.version>1.0.1.GA-redhat-00003</wildfly.ee-channel.version>
<!-- EAP XP Channel coordinates -->
<wildfly.xp-channel.groupId>org.jboss.eap.channels</wildfly.xp-channel.groupId>
<wildfly.xp-channel.artifactId>eap-xp-5.0</wildfly.xp-channel.artifactId>
<wildfly.xp-channel.version>1.0.0.GA-redhat-00006</wildfly.xp-channel.version>
<!-- WildFly FPL -->
<wildfly.feature-pack.location>org.jboss.eap.xp:wildfly-galleon-pack:5.0.0.GA-redhat-00005</wildfly.feature-pack.location>
<!-- <wildfly.ee-feature-pack.location>org.jboss.eap:wildfly-ee-galleon-pack:8.0.0.GA-redhat-00011</wildfly.ee-feature-pack.location>-->
<wildfly.cloud-feature-pack.location>org.jboss.eap.cloud:eap-cloud-galleon-pack:1.0.0.Final-redhat-00008</wildfly.cloud-feature-pack.location>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>${wildfly-maven-plugin.groupId}</groupId>
<artifactId>${wildfly-maven-plugin.artifactId}</artifactId>
<version>${wildfly-maven-plugin.version}</version>
<configuration>
<channels>
<channel>
<manifest>
<groupId>${wildfly.ee-channel.groupId}</groupId>
<artifactId>${wildfly.ee-channel.artifactId}</artifactId>
<version>${wildfly.ee-channel.version}</version>
</manifest>
</channel>
<channel>
<manifest>
<groupId>${wildfly.xp-channel.groupId}</groupId>
<artifactId>${wildfly.xp-channel.artifactId}</artifactId>
<version>${wildfly.xp-channel.version}</version>
</manifest>
</channel>
</channels>
<!-- When testing against EAP XP, the wildfly-galleon-pack is needed -->
<feature-packs>
<feature-pack>
<location>${wildfly.feature-pack.location}</location>
</feature-pack>
<feature-pack>
<location>${wildfly.cloud-feature-pack.location}</location>
</feature-pack>
</feature-packs>
<galleon-options>
<!-- this flag is super necessary: otherwise wildfly-maven-plugin and
wildfly-jar-maven-plugin would collide -->
<jboss-fork-embedded>true</jboss-fork-embedded>
</galleon-options>
</configuration>
<executions>
<execution>
<goals>
<goal>package</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles>

<repositories>
Expand Down
77 changes: 69 additions & 8 deletions testsuite/deployments/wildfly-shared/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
</manifest>
</channel>
</channels>
<!-- When testing against EAP (-Peap), wildfly-ee-galeon-pack is needed -->
<!-- When testing against EAP 8, the wildfly-ee-galleon-pack is needed -->
<feature-packs>
<feature-pack>
<location>${wildfly.ee-feature-pack.location}</location>
Expand Down Expand Up @@ -264,19 +264,73 @@
<!-- Configuration settings for testing EAP XP -->
<id>ts.wildfly.target-distribution.eapxp</id>
<properties>
<!-- WildFly/EAP 8 Maven Plugin coordinates -->
<wildfly-maven-plugin.groupId>org.jboss.eap.plugins</wildfly-maven-plugin.groupId>
<wildfly-maven-plugin.artifactId>eap-maven-plugin</wildfly-maven-plugin.artifactId>
<wildfly-maven-plugin.version>1.0.0.Final-redhat-00014</wildfly-maven-plugin.version>
<!-- Default EAP XP `microprofile` BOM version is set here and can be overridden for pulling the right BOM -->
<bom.wildfly-microprofile.groupId>org.jboss.eap.xp</bom.wildfly-microprofile.groupId>
<bom.wildfly-microprofile.artifactId>wildfly-microprofile</bom.wildfly-microprofile.artifactId>
<bom.wildfly-microprofile.version>5.0.0.GA-redhat-20240221</bom.wildfly-microprofile.version>
<!-- EAP XP Channel coordinates -->
<bom.wildfly-microprofile.groupId>org.jboss.bom</bom.wildfly-microprofile.groupId>
<bom.wildfly-microprofile.artifactId>jboss-eap-xp-microprofile</bom.wildfly-microprofile.artifactId>
<bom.wildfly-microprofile.version>5.0.0.GA-redhat-00009</bom.wildfly-microprofile.version>
<!-- EAP 8 Channel coordinates -->
<wildfly.ee-channel.groupId>org.jboss.eap.channels</wildfly.ee-channel.groupId>
<wildfly.ee-channel.artifactId>eap-8.0-plus-eap-xp-5.0</wildfly.ee-channel.artifactId>
<wildfly.ee-channel.version>1.0.0.Final-redhat-00001</wildfly.ee-channel.version>
<wildfly.feature-pack.location>org.jboss.eap.xp:wildfly-galleon-pack:5.0.0.GA-redhat-20240221</wildfly.feature-pack.location>
<wildfly.ee-channel.artifactId>eap-8.0</wildfly.ee-channel.artifactId>
<wildfly.ee-channel.version>1.0.1.GA-redhat-00003</wildfly.ee-channel.version>
<!-- EAP XP Channel coordinates -->
<wildfly.xp-channel.groupId>org.jboss.eap.channels</wildfly.xp-channel.groupId>
<wildfly.xp-channel.artifactId>eap-xp-5.0</wildfly.xp-channel.artifactId>
<wildfly.xp-channel.version>1.0.0.GA-redhat-00006</wildfly.xp-channel.version>
<!-- WildFly FPL -->
<wildfly.feature-pack.location>org.jboss.eap.xp:wildfly-galleon-pack:5.0.0.GA-redhat-00005</wildfly.feature-pack.location>
<wildfly.cloud-feature-pack.location>org.jboss.eap.cloud:eap-cloud-galleon-pack:1.0.0.Final-redhat-00008</wildfly.cloud-feature-pack.location>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>${wildfly-maven-plugin.groupId}</groupId>
<artifactId>${wildfly-maven-plugin.artifactId}</artifactId>
<version>${wildfly-maven-plugin.version}</version>
<configuration>
<channels>
<channel>
<manifest>
<groupId>${wildfly.ee-channel.groupId}</groupId>
<artifactId>${wildfly.ee-channel.artifactId}</artifactId>
<version>${wildfly.ee-channel.version}</version>
</manifest>
</channel>
<channel>
<manifest>
<groupId>${wildfly.xp-channel.groupId}</groupId>
<artifactId>${wildfly.xp-channel.artifactId}</artifactId>
<version>${wildfly.xp-channel.version}</version>
</manifest>
</channel>
</channels>
<!-- When testing against EAP XP, the wildfly-galleon-pack is needed -->
<feature-packs>
<feature-pack>
<location>${wildfly.feature-pack.location}</location>
</feature-pack>
<feature-pack>
<location>${wildfly.cloud-feature-pack.location}</location>
</feature-pack>
</feature-packs>
<galleon-options>
<!-- this flag is super necessary: otherwise wildfly-maven-plugin and
wildfly-jar-maven-plugin would collide -->
<jboss-fork-embedded>true</jboss-fork-embedded>
</galleon-options>
</configuration>
<executions>
<execution>
<goals>
<goal>package</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-jar-maven-plugin</artifactId>
Expand All @@ -295,6 +349,13 @@
<version>${wildfly.ee-channel.version}</version>
</manifest>
</channel>
<channel>
<manifest>
<groupId>${wildfly.xp-channel.groupId}</groupId>
<artifactId>${wildfly.xp-channel.artifactId}</artifactId>
<version>${wildfly.xp-channel.version}</version>
</manifest>
</channel>
</channels>
</configuration>
</plugin>
Expand Down

0 comments on commit 864c71d

Please sign in to comment.