[WFLY-14151] Move microprofile-health extension to the microprofile f…

…eature pack This extension is no longer provided by the ee feature pack. JIRA: https://issues.redhat.com/browse/WFLY-14151 Signed-off-by: Jeff Mesnil <jmesnil@redhat.com>
jimma · Dec 10, 2020 · 5d07fbb · 5d07fbb
1 parent 70e1d01
commit 5d07fbb
Show file tree

Hide file tree

Showing 52 changed files with 134 additions and 116 deletions.
diff --git a/ee-9/feature-pack/src/main/resources/feature_groups/standalone-ha.xml b/ee-9/feature-pack/src/main/resources/feature_groups/standalone-ha.xml
@@ -21,7 +21,8 @@
     <feature-group name="management-audit"/>
     <feature-group name="management-interfaces"/>
     <feature-group name="access-control"/>
-    <feature-group name="health"/>
+    <!-- WFLY-14151  do not forget to put it back -->
+    <!--<feature-group name="health"/>-->
     <feature-group name="metrics" />
 
     <feature-group name="servlet-unsecured-standalone-profile"/>

diff --git a/ee-9/feature-pack/src/main/resources/feature_groups/standalone-profile.xml b/ee-9/feature-pack/src/main/resources/feature_groups/standalone-profile.xml
@@ -4,7 +4,8 @@
     <feature-group name="servlet-unsecured-standalone-profile"/>
 
     <feature-group name="basic-profile"/>
-    <feature-group name="health"/>
+    <!-- WFLY-14151  do not forget to put it back -->
+    <!--<feature-group name="health"/>-->
     <feature-group name="metrics" />
     <feature spec="subsystem.microprofile-jwt-smallrye"/>
 

diff --git a/ee-feature-pack/common/pom.xml b/ee-feature-pack/common/pom.xml
@@ -2785,39 +2785,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>io.smallrye</groupId>
-            <artifactId>smallrye-health</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>wildfly-microprofile-health-smallrye</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.microprofile.health</groupId>
-            <artifactId>microprofile-health-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>wildfly-mod_cluster-extension</artifactId>

diff --git a/ee-feature-pack/common/src/license/feature-pack-licenses.xml b/ee-feature-pack/common/src/license/feature-pack-licenses.xml
@@ -586,17 +586,6 @@
         </license>
       </licenses>
     </dependency>
-    <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-health</artifactId>
-      <licenses>
-        <license>
-          <name>Apache License 2.0</name>
-          <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-          <distribution>repo</distribution>
-        </license>
-      </licenses>
-    </dependency>
     <dependency>
       <groupId>io.smallrye</groupId>
       <artifactId>smallrye-opentracing</artifactId>
@@ -1750,17 +1739,6 @@
         </license>
       </licenses>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.microprofile.health</groupId>
-      <artifactId>microprofile-health-api</artifactId>
-      <licenses>
-        <license>
-          <name>Apache License 2.0</name>
-          <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-          <distribution>repo</distribution>
-        </license>
-      </licenses>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.microprofile.opentracing</groupId>
       <artifactId>microprofile-opentracing-api</artifactId>
@@ -2760,17 +2738,6 @@
         </license>
       </licenses>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>wildfly-microprofile-health-smallrye</artifactId>
-      <licenses>
-        <license>
-          <name>GNU Lesser General Public License v2.1 or later</name>
-          <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html</url>
-          <distribution>repo</distribution>
-        </license>
-      </licenses>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>wildfly-microprofile-opentracing-extension</artifactId>

diff --git a/ee-feature-pack/galleon-common/src/main/resources/feature_groups/health.xml b/ee-feature-pack/galleon-common/src/main/resources/feature_groups/health.xml
diff --git a/...ure-pack/galleon-common/src/main/resources/layers/standalone/observability/layer-spec.xml b/...ure-pack/galleon-common/src/main/resources/layers/standalone/observability/layer-spec.xml
@@ -4,6 +4,5 @@
         <layer name="metrics" optional="true"/>
         <layer name="microprofile-config" optional="true"/>
         <layer name="open-tracing" optional="true"/>
-        <layer name="microprofile-health" optional="true"/>
     </dependencies>
 </layer-spec>
diff --git a/...ature-pack/galleon-feature-pack/src/main/resources/feature_groups/standalone-azure-ha.xml b/...ature-pack/galleon-feature-pack/src/main/resources/feature_groups/standalone-azure-ha.xml
@@ -118,6 +118,7 @@
             </feature>
         </feature>
     </feature-group>
-    <feature-group name="health"/>
+    <!-- WFLY-14151  do not forget to put it back -->
+    <!--<feature-group name="health"/>-->
     <feature-group name="metrics" />
 </feature-group-spec>
diff --git a/ee-feature-pack/galleon-feature-pack/src/main/resources/feature_groups/standalone-ec2-ha.xml b/ee-feature-pack/galleon-feature-pack/src/main/resources/feature_groups/standalone-ec2-ha.xml
@@ -118,7 +118,8 @@
             </feature>
         </feature>
     </feature-group>
-    <feature-group name="health"/>
+    <!-- WFLY-14151  do not forget to put it back -->
+    <!--<feature-group name="health"/>-->
    <feature-group name="metrics" />
 
     <!-- <feature-group name="elytron-permissions-workaround"/> -->

diff --git a/ee-feature-pack/galleon-feature-pack/src/main/resources/feature_groups/standalone-ha.xml b/ee-feature-pack/galleon-feature-pack/src/main/resources/feature_groups/standalone-ha.xml
@@ -21,7 +21,8 @@
     <feature-group name="management-audit"/>
     <feature-group name="management-interfaces"/>
     <feature-group name="access-control"/>
-    <feature-group name="health"/>
+    <!-- WFLY-14151  do not forget to put it back -->
+    <!--<feature-group name="health"/>-->
     <feature-group name="metrics" />
 
     <feature-group name="servlet-standalone-profile"/>

diff --git a/...eature-pack/galleon-feature-pack/src/main/resources/feature_groups/standalone-profile.xml b/...eature-pack/galleon-feature-pack/src/main/resources/feature_groups/standalone-profile.xml
@@ -4,7 +4,8 @@
     <feature-group name="servlet-standalone-profile"/>
 
     <feature-group name="basic-profile"/>
-    <feature-group name="health"/>
+    <!-- WFLY-14151  do not forget to put it back -->
+    <!--<feature-group name="health"/>-->
     <feature-group name="metrics" />
 
 </feature-group-spec>
diff --git a/ee-feature-pack/galleon-feature-pack/wildfly-feature-pack-build.xml b/ee-feature-pack/galleon-feature-pack/wildfly-feature-pack-build.xml
@@ -93,7 +93,6 @@
                 <extension>org.wildfly.extension.messaging-activemq</extension>
                 <extension>org.wildfly.extension.metrics</extension>
                 <extension>org.wildfly.extension.microprofile.config-smallrye</extension>
-                <extension>org.wildfly.extension.microprofile.health-smallrye</extension>
                 <extension>org.wildfly.extension.microprofile.opentracing-smallrye</extension>
                 <extension>org.wildfly.extension.picketlink</extension>
                 <extension>org.wildfly.extension.rts</extension>
@@ -124,7 +123,6 @@
                 <extension>org.wildfly.extension.ee-security</extension>
                 <extension>org.wildfly.extension.messaging-activemq</extension>
                 <extension>org.wildfly.extension.microprofile.config-smallrye</extension>
-                <extension>org.wildfly.extension.microprofile.health-smallrye</extension>
                 <extension>org.wildfly.extension.microprofile.opentracing-smallrye</extension>
                 <extension>org.wildfly.extension.picketlink</extension>
                 <extension>org.wildfly.extension.rts</extension>

diff --git a/...-feature-pack/src/main/resources/configuration/examples/subsystems-activemq-colocated.xml b/...-feature-pack/src/main/resources/configuration/examples/subsystems-activemq-colocated.xml
@@ -29,7 +29,8 @@
         <subsystem>messaging-activemq-colocated.xml</subsystem>
         <subsystem>metrics.xml</subsystem>
         <subsystem>microprofile-config-smallrye.xml</subsystem>
-        <subsystem>microprofile-health-smallrye.xml</subsystem>
+        <!-- WFLY-14151  replace by a health.xml... -->
+        <!-- <subsystem>microprofile-health-smallrye.xml</subsystem> -->
         <subsystem>microprofile-opentracing-smallrye.xml</subsystem>
         <subsystem>naming.xml</subsystem>
         <subsystem>pojo.xml</subsystem>

diff --git a/...k/legacy-feature-pack/src/main/resources/configuration/examples/subsystems-genericjms.xml b/...k/legacy-feature-pack/src/main/resources/configuration/examples/subsystems-genericjms.xml
@@ -27,7 +27,8 @@
         <subsystem>mail.xml</subsystem>
         <subsystem>metrics.xml</subsystem>
         <subsystem>microprofile-config-smallrye.xml</subsystem>
-        <subsystem>microprofile-health-smallrye.xml</subsystem>
+        <!-- WFLY-14151  replace by a health.xml... -->
+        <!-- <subsystem>microprofile-health-smallrye.xml</subsystem> -->
         <subsystem>microprofile-opentracing-smallrye.xml</subsystem>
         <subsystem>naming.xml</subsystem>
         <subsystem>pojo.xml</subsystem>

diff --git a/...ure-pack/legacy-feature-pack/src/main/resources/configuration/examples/subsystems-jts.xml b/...ure-pack/legacy-feature-pack/src/main/resources/configuration/examples/subsystems-jts.xml
@@ -26,7 +26,8 @@
         <subsystem>mail.xml</subsystem>
         <subsystem>metrics.xml</subsystem>
         <subsystem>microprofile-config-smallrye.xml</subsystem>
-        <subsystem>microprofile-health-smallrye.xml</subsystem>
+        <!-- WFLY-14151  replace by a health.xml... -->
+        <!-- <subsystem>microprofile-health-smallrye.xml</subsystem> -->
         <subsystem>microprofile-opentracing-smallrye.xml</subsystem>
         <subsystem>naming.xml</subsystem>
         <subsystem>pojo.xml</subsystem>

diff --git a/...k/legacy-feature-pack/src/main/resources/configuration/examples/subsystems-picketlink.xml b/...k/legacy-feature-pack/src/main/resources/configuration/examples/subsystems-picketlink.xml
@@ -27,7 +27,8 @@
         <subsystem>messaging-activemq.xml</subsystem>
         <subsystem>metrics.xml</subsystem>
         <subsystem>microprofile-config-smallrye.xml</subsystem>
-        <subsystem>microprofile-health-smallrye.xml</subsystem>
+        <!-- WFLY-14151  replace by a health.xml... -->
+        <!-- <subsystem>microprofile-health-smallrye.xml</subsystem> -->
         <subsystem>microprofile-opentracing-smallrye.xml</subsystem>
         <subsystem>naming.xml</subsystem>
         <subsystem>picketlink-federation.xml</subsystem>

diff --git a/...ure-pack/legacy-feature-pack/src/main/resources/configuration/examples/subsystems-rts.xml b/...ure-pack/legacy-feature-pack/src/main/resources/configuration/examples/subsystems-rts.xml
@@ -28,7 +28,8 @@
         <subsystem>messaging-activemq.xml</subsystem>
         <subsystem>metrics.xml</subsystem>
         <subsystem>microprofile-config-smallrye.xml</subsystem>
-        <subsystem>microprofile-health-smallrye.xml</subsystem>
+        <!-- WFLY-14151  replace by a health.xml... -->
+        <!-- <subsystem>microprofile-health-smallrye.xml</subsystem> -->
         <subsystem>microprofile-opentracing-smallrye.xml</subsystem>
         <subsystem>naming.xml</subsystem>
         <subsystem>pojo.xml</subsystem>

diff --git a/...ure-pack/legacy-feature-pack/src/main/resources/configuration/examples/subsystems-xts.xml b/...ure-pack/legacy-feature-pack/src/main/resources/configuration/examples/subsystems-xts.xml
@@ -27,7 +27,8 @@
         <subsystem>messaging-activemq.xml</subsystem>
         <subsystem>metrics.xml</subsystem>
         <subsystem>microprofile-config-smallrye.xml</subsystem>
-        <subsystem>microprofile-health-smallrye.xml</subsystem>
+        <!-- WFLY-14151  replace by a health.xml... -->
+        <!-- <subsystem>microprofile-health-smallrye.xml</subsystem> -->
         <subsystem>microprofile-opentracing-smallrye.xml</subsystem>
         <subsystem>naming.xml</subsystem>
         <subsystem>pojo.xml</subsystem>

diff --git a/...ck/legacy-feature-pack/src/main/resources/configuration/standalone/subsystems-full-ha.xml b/...ck/legacy-feature-pack/src/main/resources/configuration/standalone/subsystems-full-ha.xml
@@ -29,7 +29,8 @@
         <subsystem supplement="ha">messaging-activemq.xml</subsystem>
         <subsystem>metrics.xml</subsystem>
         <subsystem>microprofile-config-smallrye.xml</subsystem>
-        <subsystem>microprofile-health-smallrye.xml</subsystem>
+        <!-- WFLY-14151  replace by a health.xml... -->
+        <!-- <subsystem>microprofile-health-smallrye.xml</subsystem> -->
         <subsystem>microprofile-opentracing-smallrye.xml</subsystem>
         <subsystem supplement="${mod_cluster.supplement}">mod_cluster.xml</subsystem>
         <subsystem>naming.xml</subsystem>

diff --git a/...-pack/legacy-feature-pack/src/main/resources/configuration/standalone/subsystems-full.xml b/...-pack/legacy-feature-pack/src/main/resources/configuration/standalone/subsystems-full.xml
@@ -28,7 +28,8 @@
         <subsystem>messaging-activemq.xml</subsystem>
         <subsystem>metrics.xml</subsystem>
         <subsystem>microprofile-config-smallrye.xml</subsystem>
-        <subsystem>microprofile-health-smallrye.xml</subsystem>
+        <!-- WFLY-14151  replace by a health.xml... -->
+        <!-- <subsystem>microprofile-health-smallrye.xml</subsystem> -->
         <subsystem>microprofile-opentracing-smallrye.xml</subsystem>
         <subsystem>naming.xml</subsystem>
         <subsystem>pojo.xml</subsystem>

diff --git a/...re-pack/legacy-feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml b/...re-pack/legacy-feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml
@@ -26,7 +26,8 @@
         <subsystem>mail.xml</subsystem>
         <subsystem>metrics.xml</subsystem>
         <subsystem>microprofile-config-smallrye.xml</subsystem>
-        <subsystem>microprofile-health-smallrye.xml</subsystem>
+        <!-- WFLY-14151  replace by a health.xml... -->
+        <!-- <subsystem>microprofile-health-smallrye.xml</subsystem> -->
         <subsystem>microprofile-opentracing-smallrye.xml</subsystem>
         <subsystem supplement="${mod_cluster.supplement}">mod_cluster.xml</subsystem>
         <subsystem>naming.xml</subsystem>

diff --git a/...ature-pack/legacy-feature-pack/src/main/resources/configuration/standalone/subsystems.xml b/...ature-pack/legacy-feature-pack/src/main/resources/configuration/standalone/subsystems.xml
@@ -25,7 +25,8 @@
         <subsystem>mail.xml</subsystem>
         <subsystem>metrics.xml</subsystem>
         <subsystem>microprofile-config-smallrye.xml</subsystem>
-        <subsystem>microprofile-health-smallrye.xml</subsystem>
+        <!-- WFLY-14151  replace by a health.xml... -->
+        <!-- <subsystem>microprofile-health-smallrye.xml</subsystem> -->
         <subsystem>microprofile-opentracing-smallrye.xml</subsystem>
         <subsystem>naming.xml</subsystem>
         <subsystem>pojo.xml</subsystem>

diff --git a/galleon-pack/src/main/resources/configs/standalone/standalone-microprofile-ha.xml/config.xml b/galleon-pack/src/main/resources/configs/standalone/standalone-microprofile-ha.xml/config.xml
@@ -5,6 +5,7 @@
         <include name="cloud-server"/>
         <include name="h2-default-datasource"/>
         <include name="microprofile-fault-tolerance"/>
+        <include name="microprofile-health"/>
         <include name="microprofile-jwt"/>
         <include name="microprofile-metrics"/>
         <include name="microprofile-openapi"/>

diff --git a/galleon-pack/src/main/resources/configs/standalone/standalone-microprofile.xml/config.xml b/galleon-pack/src/main/resources/configs/standalone/standalone-microprofile.xml/config.xml
@@ -5,6 +5,7 @@
         <include name="cloud-server"/>
         <include name="h2-default-datasource"/>
         <include name="microprofile-fault-tolerance"/>
+        <include name="microprofile-health"/>
         <include name="microprofile-jwt"/>
         <include name="microprofile-metrics"/>
         <include name="microprofile-openapi"/>

diff --git a/galleon-pack/wildfly-feature-pack-build.xml b/galleon-pack/wildfly-feature-pack-build.xml
@@ -85,6 +85,7 @@
         <extensions>
             <standalone>
                 <extension>org.wildfly.extension.microprofile.fault-tolerance-smallrye</extension>
+                <extension>org.wildfly.extension.microprofile.health-smallrye</extension>
                 <extension>org.wildfly.extension.microprofile.jwt-smallrye</extension>
                 <extension>org.wildfly.extension.microprofile.metrics-smallrye</extension>
                 <extension>org.wildfly.extension.microprofile.openapi-smallrye</extension>

diff --git a/microprofile/galleon-common/pom.xml b/microprofile/galleon-common/pom.xml
@@ -137,6 +137,17 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>io.smallrye</groupId>
+            <artifactId>smallrye-health</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>io.smallrye</groupId>
             <artifactId>smallrye-jwt</artifactId>
@@ -212,6 +223,16 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.eclipse.microprofile.health</groupId>
+            <artifactId>microprofile-health-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.microprofile.jwt</groupId>
             <artifactId>microprofile-jwt-auth-api</artifactId>
@@ -267,6 +288,17 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>${full.maven.groupId}</groupId>
+            <artifactId>wildfly-microprofile-health-smallrye</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>${full.maven.groupId}</groupId>
             <artifactId>wildfly-microprofile-jwt-smallrye</artifactId>

diff --git a/microprofile/galleon-common/src/license/microprofile-feature-pack-licenses.xml b/microprofile/galleon-common/src/license/microprofile-feature-pack-licenses.xml
@@ -45,6 +45,17 @@
         </license>
       </licenses>
     </dependency>
+    <dependency>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-health</artifactId>
+      <licenses>
+        <license>
+          <name>Apache License 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+          <distribution>repo</distribution>
+        </license>
+      </licenses>
+    </dependency>
     <dependency>
       <groupId>io.smallrye</groupId>
       <artifactId>smallrye-jwt</artifactId>
@@ -122,6 +133,17 @@
         </license>
       </licenses>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.microprofile.health</groupId>
+      <artifactId>microprofile-health-api</artifactId>
+      <licenses>
+        <license>
+          <name>Apache License 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+          <distribution>repo</distribution>
+        </license>
+      </licenses>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.microprofile.jwt</groupId>
       <artifactId>microprofile-jwt-auth-api</artifactId>