Merge pull request #432 from jamezp/issue430

[430] Allow the server.home system property to also work with the Mic…
resteasy · Jan 17, 2025 · 544fa76 · 544fa76
2 parents 6e9b7df + ad8da89
commit 544fa76
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 60 deletions.
diff --git a/testsuite/integration-tests/pom.xml b/testsuite/integration-tests/pom.xml
@@ -238,42 +238,6 @@
     </build>
 
     <profiles>
-        <profile>
-            <id>provided.server</id>
-            <activation>
-                <property>
-                    <name>server.home</name>
-                </property>
-            </activation>
-            <properties>
-                <jboss.home>${server.home}</jboss.home>
-            </properties>
-        </profile>
-        <profile>
-            <id>provision.server</id>
-            <activation>
-                <property>
-                    <name>!server.home</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.wildfly.plugins</groupId>
-                        <artifactId>wildfly-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>server-provisioning</id>
-                                <phase>process-test-resources</phase>
-                                <goals>
-                                    <goal>provision</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>security.manager</id>
             <activation>
@@ -285,20 +249,6 @@
                 <jboss.arguments>-secmgr</jboss.arguments>
             </properties>
         </profile>
-        <profile>
-            <id>provision.preview.server</id>
-            <activation>
-                <property>
-                    <name>provision.preview</name>
-                </property>
-            </activation>
-
-            <properties>
-                <!-- Galleon -->
-                <wildfly.feature.pack.artifactId>wildfly-preview-feature-pack</wildfly.feature.pack.artifactId>
-                <wildfly.channel.manifest.artifactId>wildfly-preview</wildfly.channel.manifest.artifactId>
-            </properties>
-        </profile>
     </profiles>
 
 </project>
diff --git a/testsuite/microprofile-rest-client-tck/config/wildfly/wiremock.cli b/testsuite/microprofile-rest-client-tck/config/wildfly/wiremock.cli
@@ -1,6 +1,8 @@
 embed-server --admin-only=true
 
 /subsystem=ee:list-add(name=global-modules,value={name=org.wiremock})
-deployment-overlay add --name=tckWarOverlay --content=/WEB-INF/beans.xml=${beansxml.path} --deployments=*.war --redeploy-affected
+if (outcome != success) of /deployment-overlay=tckWarOverlay:read-resource
+    deployment-overlay add --name=tckWarOverlay --content=/WEB-INF/beans.xml=${beansxml.path} --deployments=*.war --redeploy-affected
+end-if
 
 stop-embedded-server
diff --git a/testsuite/microprofile-rest-client-tck/pom.xml b/testsuite/microprofile-rest-client-tck/pom.xml
@@ -231,13 +231,6 @@
                             </scripts>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>mp-server-provisioning</id>
-                        <goals>
-                            <goal>provision</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                    </execution>
                 </executions>
             </plugin>
             <plugin>

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -18,8 +18,8 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>resteasy-microprofile-parent</artifactId>
@@ -182,6 +182,57 @@
                 <server.version>34.0.1.Final</server.version>
             </properties>
         </profile>
+
+        <profile>
+            <id>provided.server</id>
+            <activation>
+                <property>
+                    <name>server.home</name>
+                </property>
+            </activation>
+            <properties>
+                <jboss.home>${server.home}</jboss.home>
+            </properties>
+        </profile>
+        <profile>
+            <id>provision.server</id>
+            <activation>
+                <property>
+                    <name>!server.home</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.wildfly.plugins</groupId>
+                        <artifactId>wildfly-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>mp-server-provisioning</id>
+                                <goals>
+                                    <goal>provision</goal>
+                                </goals>
+                                <phase>generate-resources</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>provision.preview.server</id>
+            <activation>
+                <property>
+                    <name>provision.preview</name>
+                </property>
+            </activation>
+
+            <properties>
+                <!-- Galleon -->
+                <wildfly.feature.pack.artifactId>wildfly-preview-feature-pack</wildfly.feature.pack.artifactId>
+                <wildfly.channel.manifest.artifactId>wildfly-preview</wildfly.channel.manifest.artifactId>
+            </properties>
+        </profile>
     </profiles>
 
 </project>