Merge pull request wildfly#18287 from yersan/WFLY-19831

[WFLY-19831] unstable-api-annotation-index package should be provisio…
rsearls · Nov 14, 2024 · dd6b30d · dd6b30d
2 parents ddc6a03 + d1aa0ab
commit dd6b30d
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 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
@@ -26,6 +26,8 @@
         <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"/>
+        <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
@@ -39,6 +39,8 @@
         <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"/>
+        <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/...main/resources/packages/unstable-api-annotation-index.wildfly-ee-feature-pack/package.xml b/...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
@@ -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
@@ -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/...rc/main/resources/packages/unstable-api-annotation-index.wildfly-galleon-pack/package.xml b/...rc/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>
diff --git 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
@@ -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>