[CMTOOL-378] Update domain host excludes + fix subsystem namespaces

wildfly · Jan 10, 2025 · aba7c1d · aba7c1d
1 parent 221e41b
commit aba7c1d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/core/src/main/java/org/jboss/migration/core/jboss/JBossExtensions.java b/core/src/main/java/org/jboss/migration/core/jboss/JBossExtensions.java
@@ -38,12 +38,12 @@ public interface JBossExtensions {
 
     Extension CLUSTERING_EJB = Extension.builder()
             .module(JBossExtensionNames.CLUSTERING_EJB)
-            .subsystem(JBossSubsystemNames.DISTRIBUTABLE_EJB)
+            .subsystem(Subsystem.builder().name(JBossSubsystemNames.DISTRIBUTABLE_EJB).namespaceWithoutVersion("urn:wildfly:"+JBossSubsystemNames.DISTRIBUTABLE_EJB))
             .build();
 
     Extension CLUSTERING_WEB = Extension.builder()
             .module(JBossExtensionNames.CLUSTERING_WEB)
-            .subsystem(JBossSubsystemNames.DISTRIBUTABLE_WEB)
+            .subsystem(Subsystem.builder().name(JBossSubsystemNames.DISTRIBUTABLE_WEB).namespaceWithoutVersion("urn:wildfly:"+JBossSubsystemNames.DISTRIBUTABLE_WEB))
             .build();
 
     Extension CMP = Extension.builder()
@@ -284,7 +284,7 @@ public interface JBossExtensions {
 
     Extension MVC_KRAZO = Extension.builder()
             .module(JBossExtensionNames.MVC_KRAZO)
-            .subsystem(JBossSubsystemNames.MVC_KRAZO)
+            .subsystem(Subsystem.builder().name(JBossSubsystemNames.MVC_KRAZO).namespaceWithoutVersion("urn:wildfly:"+JBossSubsystemNames.MVC_KRAZO))
             .build();
 
     Extension NAMING = Extension.builder()

diff --git a/...0/src/main/java/org/jboss/migration/wfly/task/hostexclude/WildFly35_0AddHostExcludes.java b/...0/src/main/java/org/jboss/migration/wfly/task/hostexclude/WildFly35_0AddHostExcludes.java
@@ -31,6 +31,7 @@ public class WildFly35_0AddHostExcludes<S> extends AddHostExcludes<S> {
                     .release("WildFly23.0")
                     .excludedExtension(JBossExtensionNames.CLUSTERING_EJB)
                     .excludedExtension(JBossExtensionNames.ELYTRON_OIDC_CLIENT)
+                    .excludedExtension(JBossExtensionNames.JAKARTA_DATA)
                     .excludedExtension(JBossExtensionNames.OPENTELEMETRY)
                     .excludedExtension(JBossExtensionNames.MICROMETER)
                     .excludedExtension(JBossExtensionNames.MICROPROFILE_LRA_PARTICIPANT)
@@ -43,6 +44,7 @@ public class WildFly35_0AddHostExcludes<S> extends AddHostExcludes<S> {
                     .release("WildFly24.0")
                     .excludedExtension(JBossExtensionNames.CLUSTERING_EJB)
                     .excludedExtension(JBossExtensionNames.ELYTRON_OIDC_CLIENT)
+                    .excludedExtension(JBossExtensionNames.JAKARTA_DATA)
                     .excludedExtension(JBossExtensionNames.OPENTELEMETRY)
                     .excludedExtension(JBossExtensionNames.MICROMETER)
                     .excludedExtension(JBossExtensionNames.MICROPROFILE_LRA_PARTICIPANT)
@@ -54,6 +56,7 @@ public class WildFly35_0AddHostExcludes<S> extends AddHostExcludes<S> {
                     .name("WildFly25.0")
                     .release("WildFly25.0")
                     .excludedExtension(JBossExtensionNames.CLUSTERING_EJB)
+                    .excludedExtension(JBossExtensionNames.JAKARTA_DATA)
                     .excludedExtension(JBossExtensionNames.MICROMETER)
                     .excludedExtension(JBossExtensionNames.MICROPROFILE_LRA_PARTICIPANT)
                     .excludedExtension(JBossExtensionNames.MICROPROFILE_LRA_COORDINATOR)
@@ -64,6 +67,7 @@ public class WildFly35_0AddHostExcludes<S> extends AddHostExcludes<S> {
                     .name("WildFly26.0")
                     .release("WildFly26.0")
                     .excludedExtension(JBossExtensionNames.CLUSTERING_EJB)
+                    .excludedExtension(JBossExtensionNames.JAKARTA_DATA)
                     .excludedExtension(JBossExtensionNames.MICROMETER)
                     .excludedExtension(JBossExtensionNames.MICROPROFILE_LRA_PARTICIPANT)
                     .excludedExtension(JBossExtensionNames.MICROPROFILE_LRA_COORDINATOR)
@@ -73,6 +77,7 @@ public class WildFly35_0AddHostExcludes<S> extends AddHostExcludes<S> {
             .hostExclude(HostExclude.builder()
                     .name("WildFly27.0")
                     .release("WildFly27.0")
+                    .excludedExtension(JBossExtensionNames.JAKARTA_DATA)
                     .excludedExtension(JBossExtensionNames.MICROMETER)
                     .excludedExtension(JBossExtensionNames.MICROPROFILE_LRA_PARTICIPANT)
                     .excludedExtension(JBossExtensionNames.MICROPROFILE_LRA_COORDINATOR)
@@ -82,23 +87,42 @@ public class WildFly35_0AddHostExcludes<S> extends AddHostExcludes<S> {
             .hostExclude(HostExclude.builder()
                     .name("WildFly28.0")
                     .release("WildFly28.0")
+                    .excludedExtension(JBossExtensionNames.JAKARTA_DATA)
                     .excludedExtension(JBossExtensionNames.MVC_KRAZO)
             )
             .hostExclude(HostExclude.builder()
                     .name("WildFly29.0")
                     .release("WildFly29.0")
+                    .excludedExtension(JBossExtensionNames.JAKARTA_DATA)
                     .excludedExtension(JBossExtensionNames.MVC_KRAZO)
             )
             .hostExclude(HostExclude.builder()
                     .name("WildFly30.0")
                     .release("WildFly30.0")
+                    .excludedExtension(JBossExtensionNames.JAKARTA_DATA)
                     .excludedExtension(JBossExtensionNames.MVC_KRAZO)
             )
             .hostExclude(HostExclude.builder()
                     .name("WildFly31.0")
                     .release("WildFly31.0")
+                    .excludedExtension(JBossExtensionNames.JAKARTA_DATA)
                     .excludedExtension(JBossExtensionNames.MVC_KRAZO)
             )
+            .hostExclude(HostExclude.builder()
+                    .name("WildFly32.0")
+                    .release("WildFly32.0")
+                    .excludedExtension(JBossExtensionNames.JAKARTA_DATA)
+            )
+            .hostExclude(HostExclude.builder()
+                    .name("WildFly33.0")
+                    .release("WildFly33.0")
+                    .excludedExtension(JBossExtensionNames.JAKARTA_DATA)
+            )
+            .hostExclude(HostExclude.builder()
+                    .name("WildFly34.0")
+                    .release("WildFly34.0")
+                    .excludedExtension(JBossExtensionNames.JAKARTA_DATA)
+            )
             .build();
 
     public WildFly35_0AddHostExcludes() {