[RESTEASY-2406] rename property controlling microprofile test exclusi…

…on to avoid clashes with container version based exclusions
resteasy · Jun 1, 2020 · 54f8cb3 · 54f8cb3
1 parent 8948343
commit 54f8cb3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/testsuite/integration-tests-spring/deployment/pom.xml b/testsuite/integration-tests-spring/deployment/pom.xml
@@ -166,7 +166,7 @@
                     which are in standalone-full.xml but not in 
                     standalone-microprofile.xml
                 -->
-                <additional.surefire.excluded.groups>org.jboss.resteasy.category.ExpectedFailingWithStandaloneMicroprofileConfiguration</additional.surefire.excluded.groups>
+                <microprofile.excluded.groups>org.jboss.resteasy.category.ExpectedFailingWithStandaloneMicroprofileConfiguration</microprofile.excluded.groups>
             </properties>
         </profile>
     </profiles>

diff --git a/testsuite/integration-tests-spring/inmodule/pom.xml b/testsuite/integration-tests-spring/inmodule/pom.xml
@@ -172,7 +172,7 @@
                     which are in standalone-full.xml but not in 
                     standalone-microprofile.xml
                 -->
-                <additional.surefire.excluded.groups>org.jboss.resteasy.category.ExpectedFailingWithStandaloneMicroprofileConfiguration</additional.surefire.excluded.groups>
+                <microprofile.excluded.groups>org.jboss.resteasy.category.ExpectedFailingWithStandaloneMicroprofileConfiguration</microprofile.excluded.groups>
             </properties>
         </profile>
     </profiles>

diff --git a/testsuite/integration-tests/pom.xml b/testsuite/integration-tests/pom.xml
@@ -200,7 +200,7 @@
                     which are in standalone-full.xml but not in 
                     standalone-microprofile.xml
                 -->
-                <additional.surefire.excluded.groups>org.jboss.resteasy.category.ExpectedFailingWithStandaloneMicroprofileConfiguration,org.jboss.resteasy.category.ExpectedFailingBecauseOfSmallRyeMicroprofileOpenApi11</additional.surefire.excluded.groups>
+                <microprofile.excluded.groups>org.jboss.resteasy.category.ExpectedFailingWithStandaloneMicroprofileConfiguration,org.jboss.resteasy.category.ExpectedFailingBecauseOfSmallRyeMicroprofileOpenApi11</microprofile.excluded.groups>
             </properties>
         </profile>
     </profiles>

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -16,6 +16,7 @@
     <properties>
         <version.resteasy.testsuite>${project.version}</version.resteasy.testsuite>
         <additional.surefire.excluded.groups></additional.surefire.excluded.groups>
+        <microprofile.excluded.groups></microprofile.excluded.groups>
         <!-- default value required for cmd-line -->
         <securityManagerArg>-DSECMGR="false"</securityManagerArg>
         <!-- Optional property for jacoco report generation -->
@@ -46,7 +47,7 @@
                         <jboss.server.config.file.name>${jboss.server.config.file.name}</jboss.server.config.file.name>
                         <security.provider>${security.provider}</security.provider>
                     </systemPropertyVariables>
-                    <excludedGroups>org.jboss.resteasy.category.ExpectedFailing,${additional.surefire.excluded.groups}</excludedGroups>
+                    <excludedGroups>org.jboss.resteasy.category.ExpectedFailing,${additional.surefire.excluded.groups},${microprofile.excluded.groups}</excludedGroups>
                 </configuration>
             </plugin>
             <plugin>
@@ -108,7 +109,7 @@
                 </property>
             </activation>
             <properties>
-                <additional.surefire.excluded.groups>org.jboss.resteasy.category.MicroProfileDependent</additional.surefire.excluded.groups>
+                <microprofile.excluded.groups>org.jboss.resteasy.category.MicroProfileDependent</microprofile.excluded.groups>
             </properties>
         </profile>
         <profile>