Merge pull request wildfly#17349 from bstansberry/WFLY-18702

[WFLY-18702] Ensure the wildfly-preview feature pack's jaxrs-server layer can provision MicroProfile REST Client
iweiss · Oct 30, 2023 · e9f83db · e9f83db
2 parents 68cbe43 + b75bc5f
commit e9f83db
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/...rs/standalone/jaxrs-server/layer-spec.xml → ...rs/standalone/jaxrs-server/layer-spec.xml b/...rs/standalone/jaxrs-server/layer-spec.xml → ...rs/standalone/jaxrs-server/layer-spec.xml
diff --git a/...rs/standalone/jaxrs-server/layer-spec.xml → ...rs/standalone/jaxrs-server/layer-spec.xml b/...rs/standalone/jaxrs-server/layer-spec.xml → ...rs/standalone/jaxrs-server/layer-spec.xml
diff --git a/preview/galleon-local/src/main/resources/layers/standalone/jaxrs-server/layer-spec.xml b/preview/galleon-local/src/main/resources/layers/standalone/jaxrs-server/layer-spec.xml
@@ -4,7 +4,10 @@
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
-<layer-spec xmlns="urn:jboss:galleon:layer-spec:1.0" name="jaxrs-server">
+<layer-spec xmlns="urn:jboss:galleon:layer-spec:2.0" name="jaxrs-server">
+    <props>
+        <prop name="org.wildfly.rule.kind" value="base-layer"/>
+    </props>
     <dependencies>
         <layer name="datasources-web-server"/>
         <!-- cloud-server depends on jaxrs-server, jaxrs could be excluded from cloud-server,
@@ -13,5 +16,12 @@
         <layer name="bean-validation" optional="true"/>
         <layer name="cdi" optional="true"/>
         <layer name="jpa" optional="true"/>
+        <!-- The above content is copied from the wildfly-ee feature pack variant of this file.
+             In standard WildFly the wildfly feature pack also declares this layer, but since that FP
+             depends on wildfly-ee, its minimal content gets applied 'on top' of what wildfly-ee
+             does. But the wildfly-preview feature pack does not depend on wildfly-ee, so we need
+             to declare here both the 'wildfly-ee' content and the 'wildfly' content. This next
+             bit is the 'wildfly' content. -->
+        <layer name="microprofile-rest-client" optional="true"/>
     </dependencies>
 </layer-spec>
diff --git a/testsuite/integration/microprofile-tck/rest-client/pom.xml b/testsuite/integration/microprofile-tck/rest-client/pom.xml
@@ -595,17 +595,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <!--Disable the default surefire execution until WFLY-14136 is sorted. -->
-                            <execution>
-                                <id>default-test</id>
-                                <phase>none</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>

diff --git a/testsuite/integration/microprofile/pom.xml b/testsuite/integration/microprofile/pom.xml
@@ -575,14 +575,14 @@
             </build>
         </profile>
 
-        <!-- Test against the ee 9 feature pack -->
+        <!-- Test against WildFly Preview dist -->
         <!-- TODO convert this to a bootable jar setup once a release
              of the wildfly jar plugin with transformation support is available -->
         <profile>
             <id>preview.test.profile</id>
             <activation>
                 <property>
-                    <name>DISABLED.ts.preview</name>
+                    <name>ts.preview</name>
                 </property>
             </activation>
             <properties>
@@ -661,6 +661,7 @@
                                                 <layer>cloud-server</layer>
                                                 <layer>microprofile-platform</layer>
                                                 <layer>ejb</layer>
+                                                <layer>micrometer</layer>
                                                 <!-- Dependencies for reactive specs -->
                                                 <layer>microprofile-reactive-messaging-kafka</layer>
                                                 <layer>h2-default-datasource</layer>
@@ -888,7 +889,7 @@
             <id>bootablejar.preview.profile</id>
             <activation>
                 <property>
-                    <name>DISABLED.ts.bootable.preview</name>
+                    <name>ts.bootable.preview</name>
                 </property>
             </activation>
             <dependencies>

diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml
@@ -320,7 +320,7 @@
             <modules>
                 <!--<module>basic</module>-->
                 <!--<module>clustering</module>-->
-                <!--<module>microprofile</module>-->
+                <module>microprofile</module>
                 <module>microprofile-tck</module>
                 <module>elytron-oidc-client</module>
             </modules>
@@ -339,7 +339,7 @@
                 <module>legacy</module>
                 <module>ws</module>
                 <!--<module>clustering</module>-->
-                <!--<module>microprofile</module>-->
+                <module>microprofile</module>
                 <module>microprofile-tck</module>
                 <module>secman</module>
                 <module>elytron</module>