From aba7c1d2c287d60e5f0bd718239ea84e19b291cb Mon Sep 17 00:00:00 2001 From: Eduardo Martins Date: Fri, 10 Jan 2025 09:30:49 +0000 Subject: [PATCH] [CMTOOL-378] Update domain host excludes + fix subsystem namespaces --- .../migration/core/jboss/JBossExtensions.java | 6 ++--- .../WildFly35_0AddHostExcludes.java | 24 +++++++++++++++++++ 2 files changed, 27 insertions(+), 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 index 05dfc9c7..824be63b 100644 --- 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/servers/wildfly35.0/src/main/java/org/jboss/migration/wfly/task/hostexclude/WildFly35_0AddHostExcludes.java b/servers/wildfly35.0/src/main/java/org/jboss/migration/wfly/task/hostexclude/WildFly35_0AddHostExcludes.java index b50f08f3..79e339cc 100644 --- a/servers/wildfly35.0/src/main/java/org/jboss/migration/wfly/task/hostexclude/WildFly35_0AddHostExcludes.java +++ b/servers/wildfly35.0/src/main/java/org/jboss/migration/wfly/task/hostexclude/WildFly35_0AddHostExcludes.java @@ -31,6 +31,7 @@ public class WildFly35_0AddHostExcludes extends AddHostExcludes { .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 extends AddHostExcludes { .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 extends AddHostExcludes { .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 extends AddHostExcludes { .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 extends AddHostExcludes { .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 extends AddHostExcludes { .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() {