From 6280cef4f2fe0241c80992c4c8ea5e95e2129547 Mon Sep 17 00:00:00 2001
From: Yeray Borges <yborgess@redhat.com>
Date: Wed, 16 Oct 2024 12:09:36 +0100
Subject: [PATCH] [WFCORE-7031] Do not provision unstable annotation module for
 stability levels higher than preview

---
 .../_internal/unstable-api-annotation-index/main/module.xml   | 1 +
 .../org/wildfly/extension/core-management/main/module.xml     | 4 ++--
 .../wildfly/unstable/annotation/api/indexer/main/module.xml   | 1 +
 .../src/main/resources/configs/domain/model.xml               | 3 +++
 .../src/main/resources/configs/standalone/model.xml           | 3 +++
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/_internal/unstable-api-annotation-index/main/module.xml b/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/_internal/unstable-api-annotation-index/main/module.xml
index 299b9fcde68..90f868dfcc3 100644
--- a/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/_internal/unstable-api-annotation-index/main/module.xml
+++ b/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/_internal/unstable-api-annotation-index/main/module.xml
@@ -9,6 +9,7 @@
 
     <properties>
         <property name="jboss.api" value="private"/>
+        <property name="jboss.stability" value="preview"/>
     </properties>
 
     <resources>
diff --git a/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/extension/core-management/main/module.xml b/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/extension/core-management/main/module.xml
index e98404f4a0b..05bf8cd19ae 100644
--- a/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/extension/core-management/main/module.xml
+++ b/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/extension/core-management/main/module.xml
@@ -30,7 +30,7 @@
         <module name="org.wildfly.extension.core-management-client"/>
         <module name="org.wildfly.security.elytron-private"/>
         <module name="org.wildfly.service"/>
-        <module name="org.wildfly.unstable.annotation.api.indexer"/>
-        <module name="org.wildfly._internal.unstable-api-annotation-index"/>
+        <module name="org.wildfly.unstable.annotation.api.indexer" optional="true"/>
+        <module name="org.wildfly._internal.unstable-api-annotation-index" optional="true"/>
     </dependencies>
 </module>
diff --git a/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/unstable/annotation/api/indexer/main/module.xml b/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/unstable/annotation/api/indexer/main/module.xml
index 6b5dcff1cf6..8633842991e 100644
--- a/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/unstable/annotation/api/indexer/main/module.xml
+++ b/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/unstable/annotation/api/indexer/main/module.xml
@@ -8,6 +8,7 @@
 <module xmlns="urn:jboss:module:1.9" name="org.wildfly.unstable.annotation.api.indexer">
     <properties>
         <property name="jboss.api" value="private"/>
+        <property name="jboss.stability" value="preview"/>
     </properties>
 
     <resources>
diff --git a/core-feature-pack/galleon-common/src/main/resources/configs/domain/model.xml b/core-feature-pack/galleon-common/src/main/resources/configs/domain/model.xml
index 489201c3076..c0307cc154b 100644
--- a/core-feature-pack/galleon-common/src/main/resources/configs/domain/model.xml
+++ b/core-feature-pack/galleon-common/src/main/resources/configs/domain/model.xml
@@ -25,5 +25,8 @@
         <package name="cleanup.domain.servers.dir" optional="true"/>
         <package name="cleanup.domain.log.dir" optional="true"/>
         <package name="cleanup.domain.data.dir" optional="true"/>
+        <!-- Unstable API Annotation Index -->
+        <package name="org.wildfly._internal.unstable-api-annotation-index" optional="true" valid-for-stability="preview" />
+        <package name="org.wildfly.unstable.annotation.api.indexer" optional="true" valid-for-stability="preview" />
     </packages>
 </config>
diff --git a/core-feature-pack/galleon-common/src/main/resources/configs/standalone/model.xml b/core-feature-pack/galleon-common/src/main/resources/configs/standalone/model.xml
index 974b956f3c4..090fec8170e 100644
--- a/core-feature-pack/galleon-common/src/main/resources/configs/standalone/model.xml
+++ b/core-feature-pack/galleon-common/src/main/resources/configs/standalone/model.xml
@@ -27,5 +27,8 @@
 
         <package name="org.wildfly.bootable-jar" optional="true"/>
         <package name="org.wildfly.embedded"/>
+        <!-- Unstable API Annotation Index -->
+        <package name="org.wildfly._internal.unstable-api-annotation-index" optional="true" valid-for-stability="preview" />
+        <package name="org.wildfly.unstable.annotation.api.indexer" optional="true" valid-for-stability="preview" />
     </packages>
 </config>