[issue-222] - Fix profiles that set deployments-provider properties

Intersmash · Jan 22, 2025 · c7765e1 · c7765e1
1 parent 5b9c999
commit c7765e1
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 33 deletions.
diff --git a/testsuite/deployments/deployments-provider/pom.xml b/testsuite/deployments/deployments-provider/pom.xml
@@ -16,6 +16,11 @@
     <properties>
         <project.version>${project.version}</project.version>
         <formatting-style-base-directory>${project.parent.parent.parent.basedir}/ide-config/</formatting-style-base-directory>
+
+        <!-- By default, the following prop is empty, stating that the build profile for WildFly deployments is the community one -->
+        <intersmash.deployments.wildfly.build.profile></intersmash.deployments.wildfly.build.profile>
+        <!-- By default, the following prop is set to community, stating that the build stream for WildFly deployments is the community one -->
+        <intersmash.deployments.wildfly.build.stream>community</intersmash.deployments.wildfly.build.stream>
     </properties>
     <build>
         <resources>
@@ -92,6 +97,50 @@
                 <intersmash.deployments.wildfly.build.profile>eapxp</intersmash.deployments.wildfly.build.profile>
             </properties>
         </profile>
+        <profile>
+            <!-- Configuration settings for testing EAP 8.0 -->
+            <id>ts.eap-stream.80</id>
+            <properties>
+                <!--
+                    When this profile is active, the following property is set to have it available at runtime,
+                    see TestDeploymentProperties
+                -->
+                <intersmash.deployments.wildfly.build.stream>eap80</intersmash.deployments.wildfly.build.stream>
+            </properties>
+        </profile>
+        <profile>
+            <!-- Configuration settings for testing EAP 8.1 -->
+            <id>ts.eap-stream.81</id>
+            <properties>
+                <!--
+                    When this profile is active, the following property is set to have it available at runtime,
+                    see TestDeploymentProperties
+                -->
+                <intersmash.deployments.wildfly.build.stream>eap81</intersmash.deployments.wildfly.build.stream>
+            </properties>
+        </profile>
+        <profile>
+            <!-- Configuration settings for testing EAP XP 5 -->
+            <id>ts.eapxp-stream.xp5</id>
+            <properties>
+                <!--
+                    When this profile is active, the following property is set to have it available at runtime,
+                    see TestDeploymentProperties
+                -->
+                <intersmash.deployments.wildfly.build.stream>eapxp5</intersmash.deployments.wildfly.build.stream>
+            </properties>
+        </profile>
+        <profile>
+            <!-- Configuration settings for testing EAP XP 6 -->
+            <id>ts.eapxp-stream.xp6</id>
+            <properties>
+                <!--
+                    When this profile is active, the following property is set to have it available at runtime,
+                    see TestDeploymentProperties
+                -->
+                <intersmash.deployments.wildfly.build.stream>eapxp6</intersmash.deployments.wildfly.build.stream>
+            </properties>
+        </profile>
         <profile>
             <id>doc</id>
             <build>

diff --git a/testsuite/deployments/pom.xml b/testsuite/deployments/pom.xml
@@ -26,11 +26,6 @@
 
         <version.maven-install-plugin>3.0.0-M1</version.maven-install-plugin>
         <version.maven-war-plugin>3.3.2</version.maven-war-plugin>
-
-        <!-- By default, the following prop is empty, stating that the build profile for WildFly deployments is the community one -->
-        <intersmash.deployments.wildfly.build.profile></intersmash.deployments.wildfly.build.profile>
-        <!-- By default, the following prop is set to community, stating that the build stream for WildFly deployments is the community one -->
-        <intersmash.deployments.wildfly.build.stream>community</intersmash.deployments.wildfly.build.stream>
     </properties>
 
     <build>

diff --git a/testsuite/integration-tests/pom.xml b/testsuite/integration-tests/pom.xml
@@ -154,13 +154,6 @@
         <profile>
             <!-- Configuration settings for testing EAP 8.0 -->
             <id>ts.eap-stream.80</id>
-                <properties>
-                <!--
-                    When this profile is active, the following property is set to have it available at runtime,
-                    see TestDeploymentProperties
-                -->
-                <intersmash.deployments.wildfly.build.stream>eap80</intersmash.deployments.wildfly.build.stream>
-            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -179,13 +172,6 @@
         <profile>
             <!-- Configuration settings for testing EAP 8.1 -->
             <id>ts.eap-stream.81</id>
-            <properties>
-                <!--
-                    When this profile is active, the following property is set to have it available at runtime,
-                    see TestDeploymentProperties
-                -->
-                <intersmash.deployments.wildfly.build.stream>eap81</intersmash.deployments.wildfly.build.stream>
-            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -204,13 +190,6 @@
         <profile>
             <!-- Configuration settings for testing EAP XP 5 -->
             <id>ts.eapxp-stream.xp5</id>
-            <properties>
-                <!--
-                    When this profile is active, the following property is set to have it available at runtime,
-                    see TestDeploymentProperties
-                -->
-                <intersmash.deployments.wildfly.build.stream>eapxp5</intersmash.deployments.wildfly.build.stream>
-            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -229,13 +208,6 @@
         <profile>
             <!-- Configuration settings for testing EAP XP 6 -->
             <id>ts.eapxp-stream.xp6</id>
-            <properties>
-                <!--
-                    When this profile is active, the following property is set to have it available at runtime,
-                    see TestDeploymentProperties
-                -->
-                <intersmash.deployments.wildfly.build.stream>eapxp6</intersmash.deployments.wildfly.build.stream>
-            </properties>
             <build>
                 <plugins>
                     <plugin>