From be8bb9870c0f09dd098f01a4380ae24ddaaa2ea1 Mon Sep 17 00:00:00 2001
From: Yeray Borges <yborgess@redhat.com>
Date: Tue, 8 Oct 2024 16:02:14 +0100
Subject: [PATCH 1/2] [WFLY-19831] unstable-api-annotation-index package should
 be provisioned only when preview stability level is enabled Jira issue:
 https://issues.redhat.com/browse/WFLY-19831

---
 .../galleon-local/src/main/resources/configs/domain/model.xml   | 2 +-
 .../src/main/resources/configs/standalone/model.xml             | 2 +-
 .../package.xml                                                 | 2 +-
 .../galleon-local/src/main/resources/configs/domain/model.xml   | 2 +-
 .../src/main/resources/configs/standalone/model.xml             | 2 +-
 .../package.xml                                                 | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ee-feature-pack/galleon-local/src/main/resources/configs/domain/model.xml b/ee-feature-pack/galleon-local/src/main/resources/configs/domain/model.xml
index ac8f48bdd558..c638780fecaa 100644
--- a/ee-feature-pack/galleon-local/src/main/resources/configs/domain/model.xml
+++ b/ee-feature-pack/galleon-local/src/main/resources/configs/domain/model.xml
@@ -26,6 +26,6 @@
         <package name="cleanup.domain.log.dir" optional="true"/>
         <package name="cleanup.domain.data.dir" optional="true"/>
         <!-- Unstable API Annotation Index -->
-        <package name="unstable-api-annotation-index.wildfly-ee-feature-pack"/>
+        <package name="unstable-api-annotation-index.wildfly-ee-feature-pack" optional="true" valid-for-stability="preview"/>
     </packages>
 </config>
diff --git a/ee-feature-pack/galleon-local/src/main/resources/configs/standalone/model.xml b/ee-feature-pack/galleon-local/src/main/resources/configs/standalone/model.xml
index 9d540538408d..52a966dbe559 100644
--- a/ee-feature-pack/galleon-local/src/main/resources/configs/standalone/model.xml
+++ b/ee-feature-pack/galleon-local/src/main/resources/configs/standalone/model.xml
@@ -39,6 +39,6 @@
         <package name="docs.licenses" optional="true"/>
         <package name="docs.licenses.merge" optional="true"/>
         <!-- Unstable API Annotation Index -->
-        <package name="unstable-api-annotation-index.wildfly-ee-feature-pack"/>
+        <package name="unstable-api-annotation-index.wildfly-ee-feature-pack" optional="true" valid-for-stability="preview"/>
     </packages>
 </config>
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/packages/unstable-api-annotation-index.wildfly-ee-feature-pack/package.xml b/ee-feature-pack/galleon-shared/src/main/resources/packages/unstable-api-annotation-index.wildfly-ee-feature-pack/package.xml
index 60a3c6937e2c..24c6cc68eef8 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/packages/unstable-api-annotation-index.wildfly-ee-feature-pack/package.xml
+++ b/ee-feature-pack/galleon-shared/src/main/resources/packages/unstable-api-annotation-index.wildfly-ee-feature-pack/package.xml
@@ -5,5 +5,5 @@
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
-<package-spec xmlns="urn:jboss:galleon:package:2.0" name="unstable-api-annotation-index.wildfly-ee-feature-pack">
+<package-spec xmlns="urn:jboss:galleon:package:3.0" name="unstable-api-annotation-index.wildfly-ee-feature-pack" stability-level="preview">
 </package-spec>
diff --git a/galleon-pack/galleon-local/src/main/resources/configs/domain/model.xml b/galleon-pack/galleon-local/src/main/resources/configs/domain/model.xml
index e57d7d01d621..189de6a92184 100644
--- a/galleon-pack/galleon-local/src/main/resources/configs/domain/model.xml
+++ b/galleon-pack/galleon-local/src/main/resources/configs/domain/model.xml
@@ -10,6 +10,6 @@
         <package name="product.conf" optional="true"/>
         <package name="misc.domain"/>
         <!-- Unstable API Annotation Index -->
-        <package name="unstable-api-annotation-index.wildfly-galleon-pack"/>
+        <package name="unstable-api-annotation-index.wildfly-galleon-pack" optional="true" valid-for-stability="preview"/>
     </packages>
 </config>
diff --git a/galleon-pack/galleon-local/src/main/resources/configs/standalone/model.xml b/galleon-pack/galleon-local/src/main/resources/configs/standalone/model.xml
index 4582b6dc015b..2a0a214d61f4 100644
--- a/galleon-pack/galleon-local/src/main/resources/configs/standalone/model.xml
+++ b/galleon-pack/galleon-local/src/main/resources/configs/standalone/model.xml
@@ -13,6 +13,6 @@
         <package name="docs.licenses" optional="true"/>
         <package name="docs.licenses.merge" optional="true"/>
         <!-- Unstable API Annotation Index -->
-        <package name="unstable-api-annotation-index.wildfly-galleon-pack"/>
+        <package name="unstable-api-annotation-index.wildfly-galleon-pack" optional="true" valid-for-stability="preview"/>
     </packages>
 </config>
diff --git a/galleon-pack/galleon-shared/src/main/resources/packages/unstable-api-annotation-index.wildfly-galleon-pack/package.xml b/galleon-pack/galleon-shared/src/main/resources/packages/unstable-api-annotation-index.wildfly-galleon-pack/package.xml
index 03d60bf4ccfe..302417df7cd1 100644
--- a/galleon-pack/galleon-shared/src/main/resources/packages/unstable-api-annotation-index.wildfly-galleon-pack/package.xml
+++ b/galleon-pack/galleon-shared/src/main/resources/packages/unstable-api-annotation-index.wildfly-galleon-pack/package.xml
@@ -5,5 +5,5 @@
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
-<package-spec xmlns="urn:jboss:galleon:package:2.0" name="unstable-api-annotation-index.wildfly-galleon-pack">
+<package-spec xmlns="urn:jboss:galleon:package:3.0" name="unstable-api-annotation-index.wildfly-galleon-pack" stability-level="preview">
 </package-spec>
\ No newline at end of file

From d1aa0abde358b5f43a10d530c3e16259ead02311 Mon Sep 17 00:00:00 2001
From: Yeray Borges <yborgess@redhat.com>
Date: Thu, 17 Oct 2024 15:11:26 +0100
Subject: [PATCH 2/2] [WFLY-19831] Ensure annotation index modules comming from
 WildFly Core are also provisioned when expected Jira issue:
 https://issues.redhat.com/browse/WFLY-19831

---
 .../galleon-local/src/main/resources/configs/domain/model.xml | 2 ++
 .../src/main/resources/configs/standalone/model.xml           | 2 ++
 .../galleon-local/src/main/resources/configs/domain/model.xml | 4 ++++
 .../src/main/resources/configs/standalone/model.xml           | 4 ++++
 4 files changed, 12 insertions(+)

diff --git a/ee-feature-pack/galleon-local/src/main/resources/configs/domain/model.xml b/ee-feature-pack/galleon-local/src/main/resources/configs/domain/model.xml
index c638780fecaa..eacd0a2fd0ba 100644
--- a/ee-feature-pack/galleon-local/src/main/resources/configs/domain/model.xml
+++ b/ee-feature-pack/galleon-local/src/main/resources/configs/domain/model.xml
@@ -27,5 +27,7 @@
         <package name="cleanup.domain.data.dir" optional="true"/>
         <!-- Unstable API Annotation Index -->
         <package name="unstable-api-annotation-index.wildfly-ee-feature-pack" optional="true" valid-for-stability="preview"/>
+        <package name="org.wildfly.unstable.annotation.api.indexer" optional="true" valid-for-stability="preview" />
+        <package name="org.wildfly._internal.unstable-api-annotation-index" optional="true" valid-for-stability="preview" />
     </packages>
 </config>
diff --git a/ee-feature-pack/galleon-local/src/main/resources/configs/standalone/model.xml b/ee-feature-pack/galleon-local/src/main/resources/configs/standalone/model.xml
index 52a966dbe559..3490cc22560d 100644
--- a/ee-feature-pack/galleon-local/src/main/resources/configs/standalone/model.xml
+++ b/ee-feature-pack/galleon-local/src/main/resources/configs/standalone/model.xml
@@ -40,5 +40,7 @@
         <package name="docs.licenses.merge" optional="true"/>
         <!-- Unstable API Annotation Index -->
         <package name="unstable-api-annotation-index.wildfly-ee-feature-pack" optional="true" valid-for-stability="preview"/>
+        <package name="org.wildfly.unstable.annotation.api.indexer" optional="true" valid-for-stability="preview" />
+        <package name="org.wildfly._internal.unstable-api-annotation-index" optional="true" valid-for-stability="preview" />
     </packages>
 </config>
diff --git a/preview/galleon-local/src/main/resources/configs/domain/model.xml b/preview/galleon-local/src/main/resources/configs/domain/model.xml
index 21d1e23c6cf3..0ec52b989538 100644
--- a/preview/galleon-local/src/main/resources/configs/domain/model.xml
+++ b/preview/galleon-local/src/main/resources/configs/domain/model.xml
@@ -27,5 +27,9 @@
         <package name="cleanup.domain.data.dir" optional="true"/>
 
         <package name="org.wildfly.deployment.transformation"/>
+
+        <!-- Unstable API Annotation Index -->
+        <package name="org.wildfly.unstable.annotation.api.indexer" optional="true" valid-for-stability="preview" />
+        <package name="org.wildfly._internal.unstable-api-annotation-index" optional="true" valid-for-stability="preview" />
     </packages>
 </config>
diff --git a/preview/galleon-local/src/main/resources/configs/standalone/model.xml b/preview/galleon-local/src/main/resources/configs/standalone/model.xml
index dfe35f722164..7ac4ec32a072 100644
--- a/preview/galleon-local/src/main/resources/configs/standalone/model.xml
+++ b/preview/galleon-local/src/main/resources/configs/standalone/model.xml
@@ -37,5 +37,9 @@
         <package name="org.wildfly.deployment.transformation"/>
         <package name="docs.licenses" optional="true"/>
         <package name="docs.licenses.merge" optional="true"/>
+
+        <!-- Unstable API Annotation Index -->
+        <package name="org.wildfly.unstable.annotation.api.indexer" optional="true" valid-for-stability="preview" />
+        <package name="org.wildfly._internal.unstable-api-annotation-index" optional="true" valid-for-stability="preview" />
     </packages>
 </config>