Merge pull request #18 from bstansberry/Issue_17

[Issue_17] Set the stability level of the mvc-krazo extension at 'preview'
wildfly-extras · Mar 19, 2024 · a0141f9 · a0141f9
2 parents 6d56a5f + 827fccb
commit a0141f9
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 9 deletions.
diff --git a/...hared/src/main/resources/modules/system/add-ons/mvc-krazo/jakarta/mvc/api/main/module.xml b/...hared/src/main/resources/modules/system/add-ons/mvc-krazo/jakarta/mvc/api/main/module.xml
@@ -5,6 +5,10 @@
   -->
 <module xmlns="urn:jboss:module:1.9" name="jakarta.mvc.api">
 
+    <properties>
+        <property name="jboss.stability" value="preview"/>
+    </properties>
+
     <resources>
         <artifact name="${jakarta.mvc:jakarta.mvc-api}"/>
     </resources>

diff --git a/...rc/main/resources/modules/system/add-ons/mvc-krazo/org/eclipse/krazo/core/main/module.xml b/...rc/main/resources/modules/system/add-ons/mvc-krazo/org/eclipse/krazo/core/main/module.xml
@@ -5,6 +5,11 @@
   -->
 <module xmlns="urn:jboss:module:1.9" name="org.eclipse.krazo.core">
 
+    <properties>
+        <property name="jboss.api" value="private"/>
+        <property name="jboss.stability" value="preview"/>
+    </properties>
+
     <resources>
         <artifact name="${org.eclipse.krazo:krazo-core}"/>
     </resources>

diff --git a/...ain/resources/modules/system/add-ons/mvc-krazo/org/eclipse/krazo/resteasy/main/module.xml b/...ain/resources/modules/system/add-ons/mvc-krazo/org/eclipse/krazo/resteasy/main/module.xml
@@ -5,6 +5,11 @@
   -->
 <module xmlns="urn:jboss:module:1.9" name="org.eclipse.krazo.resteasy">
 
+    <properties>
+        <property name="jboss.api" value="private"/>
+        <property name="jboss.stability" value="preview"/>
+    </properties>
+
     <resources>
         <artifact name="${org.eclipse.krazo:krazo-resteasy}"/>
     </resources>

diff --git a/...esources/modules/system/add-ons/mvc-krazo/org/wildfly/extension/mvc-krazo/main/module.xml b/...esources/modules/system/add-ons/mvc-krazo/org/wildfly/extension/mvc-krazo/main/module.xml
@@ -5,6 +5,11 @@
   -->
 <module xmlns="urn:jboss:module:1.9" name="org.wildfly.extension.mvc-krazo">
 
+    <properties>
+        <property name="jboss.api" value="private"/>
+        <property name="jboss.stability" value="preview"/>
+    </properties>
+
     <resources>
         <artifact name="${org.wildfly:mvc-krazo-subsystem}"/>
     </resources>

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>39</version>
+        <version>43</version>
     </parent>
 
     <groupId>org.wildfly</groupId>
@@ -61,17 +61,16 @@
         <galleon.offline>false</galleon.offline>
 
         <!-- Plugin dependency versions -->
-        <version.org.wildfly.galleon-plugins>6.5.4.Final</version.org.wildfly.galleon-plugins>
-        <version.org.wildfly.licenses.plugin>2.4.0.Final</version.org.wildfly.licenses.plugin>
-        <version.org.wildfly.plugins.wildfly-jar-maven-plugin>8.1.0.Final</version.org.wildfly.plugins.wildfly-jar-maven-plugin>
-        <version.org.wildfly.plugins.wildfly-maven-plugin>4.2.2.Final</version.org.wildfly.plugins.wildfly-maven-plugin>
+        <version.org.wildfly.galleon-plugins>7.0.0.Beta4</version.org.wildfly.galleon-plugins>
+        <version.org.wildfly.licenses.plugin>2.4.1.Final</version.org.wildfly.licenses.plugin>
+        <version.org.wildfly.plugins.wildfly-maven-plugin>5.0.0.Beta3</version.org.wildfly.plugins.wildfly-maven-plugin>
 
         <!-- Production code dependency versions -->
         <version.jakarta.mvc>2.1.0</version.jakarta.mvc>
         <version.org.apache.maven.plugins.maven-assembly-plugin>3.2.0</version.org.apache.maven.plugins.maven-assembly-plugin>
         <version.org.eclipse.krazo>3.0.1</version.org.eclipse.krazo>
         <version.org.wildfly>31.0.0.Final</version.org.wildfly>
-        <version.org.wildfly.common>1.6.0.Final</version.org.wildfly.common>
+        <version.org.wildfly.common>1.7.0.Final</version.org.wildfly.common>
         <version.org.wildfly.core>23.0.1.Final</version.org.wildfly.core>
 
         <!-- Test dependency versions -->

diff --git a/subsystem/src/main/java/org/wildfly/extension/mvc/krazo/MVCKrazoExtension.java b/subsystem/src/main/java/org/wildfly/extension/mvc/krazo/MVCKrazoExtension.java
@@ -67,6 +67,11 @@ public ModelVersion getVersion() {
         }
     }
 
+    @Override
+    public Stability getStability() {
+        return Stability.PREVIEW;
+    }
+
     /**
      * Schema for the 'mvc-krazo' subsystem.
      */

diff --git a/testsuite/tck/pom.xml b/testsuite/tck/pom.xml
@@ -34,7 +34,7 @@
         <as.debug.port>8787</as.debug.port>
         <surefire.system.args>${surefire.memory.args}</surefire.system.args>
         <server.jvm.args>${surefire.memory.args}</server.jvm.args>
-
+        <server.jboss.args>--stability=preview</server.jboss.args>
         <!-- Feature pack to use to provision mvc-krazo -->
         <krazo.feature.pack.groupId>${project.groupId}</krazo.feature.pack.groupId>
         <krazo.feature.pack.artifactId>wildfly-mvc-krazo-feature-pack</krazo.feature.pack.artifactId>
@@ -167,7 +167,7 @@
                             <jboss-home>${project.build.directory}/wildfly-complete</jboss-home>
                             <offline>true</offline>
                             <commands>
-                                <command>embed-server</command>
+                                <command>embed-server --stability=preview</command>
                                 <command>/extension=org.wildfly.extension.mvc-krazo:add</command>
                                 <command>/subsystem=mvc-krazo:add</command>
                                 <command>stop-embedded-server</command>
@@ -187,7 +187,7 @@
                             org.wildfly.extension.mvc.krazo.tck.WildFlyArchiveProvider
                         </ee.jakarta.tck.mvc.api.BaseArchiveProvider>
                         <server.jvm.args>${server.jvm.args}</server.jvm.args>
-                        <server.jboss.args>--stability=preview</server.jboss.args>
+                        <server.jboss.args>${server.jboss.args}</server.jboss.args>
                     </systemProperties>
                     <argLine>${surefire.system.args}</argLine>
                 </configuration>

diff --git a/testsuite/tck/src/test/resources/arquillian.xml b/testsuite/tck/src/test/resources/arquillian.xml
@@ -11,6 +11,7 @@
         <configuration>
             <property name="jbossHome">${jboss.home}</property>
             <property name="javaVmArguments">${server.jvm.args}</property>
+            <property name="jbossArguments">${server.jboss.args}</property>
             <property name="serverConfig">${jboss.server.config.file.name:standalone.xml}</property>
             <property name="jbossArguments">${server.jboss.args}</property>
             <property name="managementAddress">127.0.0.1</property>

diff --git a/wildfly-feature-pack/pom.xml b/wildfly-feature-pack/pom.xml
@@ -158,6 +158,7 @@
                         <configuration>
                             <fork-embedded>${galleon.fork.embedded}</fork-embedded>
                             <generate-channel-manifest>true</generate-channel-manifest>
+                            <minimum-stability>preview</minimum-stability>
                         </configuration>
                     </execution>
                 </executions>