W-14453564: Change groupId of artifacts that end up in the lib/boot f…

…older (#12987)
mulesoft · Dec 4, 2023 · ef9680b · ef9680b
1 parent 46c35db
commit ef9680b
Show file tree

Hide file tree

Showing 18 changed files with 29 additions and 25 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -105,7 +105,7 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.mule.runtime</groupId>
+            <groupId>org.mule.runtime.boot</groupId>
             <artifactId>mule-module-logging</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>

diff --git a/modules/all-modules/pom.xml b/modules/all-modules/pom.xml
@@ -93,7 +93,7 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.mule.runtime</groupId>
+            <groupId>org.mule.runtime.boot</groupId>
             <artifactId>mule-module-logging</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -127,7 +127,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.mule.runtime</groupId>
+            <groupId>org.mule.runtime.boot</groupId>
             <artifactId>mule-module-jpms-utils</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/modules/boot-api/pom.xml b/modules/boot-api/pom.xml
@@ -9,6 +9,7 @@
         <version>4.7.0-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.mule.runtime.boot</groupId>
     <artifactId>mule-module-boot-api</artifactId>
     <name>Mule Boot API</name>
     <packaging>jar</packaging>
@@ -26,21 +27,21 @@
 
         <!-- Needed by the MuleLog4jConfigurer -->
         <dependency>
-            <groupId>org.mule.runtime</groupId>
+            <groupId>org.mule.runtime.boot</groupId>
             <artifactId>mule-module-log4j-boot-configurator</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <!-- Needed by the BootModuleLayerValidationBootstrapConfigurer and for creating the container ClassLoader -->
         <dependency>
-            <groupId>org.mule.runtime</groupId>
+            <groupId>org.mule.runtime.boot</groupId>
             <artifactId>mule-module-jpms-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <!-- Needed by the SLF4JBridgeHandlerBootstrapConfigurer, but also to make the logging modules available from the boot layer -->
         <dependency>
-            <groupId>org.mule.runtime</groupId>
+            <groupId>org.mule.runtime.boot</groupId>
             <artifactId>mule-module-logging</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/modules/container/pom.xml b/modules/container/pom.xml
@@ -107,7 +107,7 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.mule.runtime</groupId>
+            <groupId>org.mule.runtime.boot</groupId>
             <artifactId>mule-module-jpms-utils</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/modules/core-components/pom.xml b/modules/core-components/pom.xml
@@ -59,7 +59,7 @@
             <version>${muleExtensionsApiVersion}</version>
         </dependency>
         <dependency>
-            <groupId>org.mule.runtime</groupId>
+            <groupId>org.mule.runtime.boot</groupId>
             <artifactId>mule-module-logging</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>

diff --git a/modules/extensions-xml-support/pom.xml b/modules/extensions-xml-support/pom.xml
@@ -53,7 +53,7 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.mule.runtime</groupId>
+            <groupId>org.mule.runtime.boot</groupId>
             <artifactId>mule-module-logging</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>

diff --git a/modules/jpms-utils/pom.xml b/modules/jpms-utils/pom.xml
@@ -9,6 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <groupId>org.mule.runtime.boot</groupId>
     <artifactId>mule-module-jpms-utils</artifactId>
     <name>Mule Java JPMS utilities</name>
     <description>This module provides JMPS utilities for use within the Mule Runtime.</description>

diff --git a/modules/launcher/pom.xml b/modules/launcher/pom.xml
@@ -33,7 +33,7 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.mule.runtime</groupId>
+            <groupId>org.mule.runtime.boot</groupId>
             <artifactId>mule-module-logging</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -63,7 +63,7 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.mule.runtime</groupId>
+            <groupId>org.mule.runtime.boot</groupId>
             <artifactId>mule-module-boot-api</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/modules/log4j-boot-configurator/pom.xml b/modules/log4j-boot-configurator/pom.xml
@@ -8,6 +8,7 @@
         <artifactId>mule-modules</artifactId>
         <version>4.7.0-SNAPSHOT</version>
     </parent>
+    <groupId>org.mule.runtime.boot</groupId>
     <artifactId>mule-module-log4j-boot-configurator</artifactId>
     <packaging>jar</packaging>
     <name>Mule Log4j Boot Configurator Module</name>
@@ -21,7 +22,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.mule.runtime</groupId>
+            <groupId>org.mule.runtime.boot</groupId>
             <artifactId>mule-module-logging</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/modules/log4j-configurator/pom.xml b/modules/log4j-configurator/pom.xml
@@ -39,12 +39,12 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.mule.runtime</groupId>
+            <groupId>org.mule.runtime.boot</groupId>
             <artifactId>mule-module-logging</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.mule.runtime</groupId>
+            <groupId>org.mule.runtime.boot</groupId>
             <artifactId>mule-module-log4j-boot-configurator</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/modules/logging/pom.xml b/modules/logging/pom.xml
@@ -8,6 +8,7 @@
         <artifactId>mule-modules</artifactId>
         <version>4.7.0-SNAPSHOT</version>
     </parent>
+    <groupId>org.mule.runtime.boot</groupId>
     <artifactId>mule-module-logging</artifactId>
     <packaging>jar</packaging>
     <name>Mule Logging</name>

diff --git a/modules/reboot/pom.xml b/modules/reboot/pom.xml
@@ -7,6 +7,7 @@
         <groupId>org.mule.runtime</groupId>
         <version>4.7.0-SNAPSHOT</version>
     </parent>
+    <groupId>org.mule.runtime.boot</groupId>
     <artifactId>mule-module-reboot</artifactId>
     <packaging>jar</packaging>
     <name>Mule 4 Container</name>
@@ -18,7 +19,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.mule.runtime</groupId>
+            <groupId>org.mule.runtime.boot</groupId>
             <artifactId>mule-module-boot-api</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/modules/service/pom.xml b/modules/service/pom.xml
@@ -95,7 +95,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.mule.runtime</groupId>
+            <groupId>org.mule.runtime.boot</groupId>
             <artifactId>mule-module-jpms-utils</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/modules/spring-config/pom.xml b/modules/spring-config/pom.xml
@@ -153,7 +153,7 @@
 
         <!-- Add logging libraries required by spring -->
         <dependency>
-            <groupId>org.mule.runtime</groupId>
+            <groupId>org.mule.runtime.boot</groupId>
             <artifactId>mule-module-logging</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/modules/tanuki-boot/pom.xml b/modules/tanuki-boot/pom.xml
@@ -7,6 +7,7 @@
         <groupId>org.mule.runtime</groupId>
         <version>4.7.0-SNAPSHOT</version>
     </parent>
+    <groupId>org.mule.runtime.boot</groupId>
     <artifactId>mule-module-tanuki-boot</artifactId>
     <packaging>jar</packaging>
     <name>Mule 4 Container Wrapper based on Tanuki</name>
@@ -18,12 +19,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.mule.runtime</groupId>
+            <groupId>org.mule.runtime.boot</groupId>
             <artifactId>mule-module-boot-api</artifactId>
             <version>${project.version}</version>
             <exclusions>
                 <exclusion>
-                    <groupId>org.mule.runtime</groupId>
+                    <groupId>org.mule.runtime.boot</groupId>
                     <artifactId>mule-module-log4j-boot-configurator</artifactId>
                 </exclusion>
             </exclusions>

diff --git a/tests/runner/pom.xml b/tests/runner/pom.xml
@@ -109,7 +109,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.mule.runtime</groupId>
+            <groupId>org.mule.runtime.boot</groupId>
             <artifactId>mule-module-logging</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>

diff --git a/tests/runner/src/main/java/org/mule/test/runner/api/DependencyResolver.java b/tests/runner/src/main/java/org/mule/test/runner/api/DependencyResolver.java
@@ -6,8 +6,6 @@
  */
 package org.mule.test.runner.api;
 
-import static org.mule.maven.client.api.MavenClientProvider.discoverProvider;
-
 import static java.util.Collections.emptyList;
 import static java.util.Objects.requireNonNull;
 import static java.util.Optional.empty;
@@ -16,8 +14,6 @@
 import static com.google.common.base.Joiner.on;
 import static org.eclipse.aether.util.artifact.ArtifactIdUtils.toId;
 
-import org.mule.maven.client.api.MavenClient;
-import org.mule.maven.client.api.MavenClientProvider;
 import org.mule.maven.client.api.model.MavenConfiguration;
 import org.mule.maven.client.internal.MuleMavenRepositoryState;
 import org.mule.maven.client.internal.MuleMavenRepositoryStateFactory;
@@ -385,11 +381,13 @@ private Pair<List<File>, List<File>> getContainerFiles(DependencyNode node) {
   // Implementation note: this must be kept consistent with the equivalent logic in embedded-api and the distro assemblies
   private boolean isMuleContainerGroupId(final String groupId) {
     return groupId.equals("org.mule.runtime")
+        || groupId.equals("org.mule.runtime.boot")
         || groupId.equals("org.mule.sdk")
         || groupId.equals("org.mule.weave")
         || groupId.equals("org.mule.mvel")
         || groupId.equals("org.mule.commons")
         || groupId.equals("com.mulesoft.mule.runtime")
+        || groupId.equals("com.mulesoft.mule.runtime.boot")
         || groupId.equals("com.mulesoft.mule.runtime.modules")
         || groupId.equals("com.mulesoft.anypoint");
   }

diff --git a/tests/unit/pom.xml b/tests/unit/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.mule.runtime</groupId>
+            <groupId>org.mule.runtime.boot</groupId>
             <artifactId>mule-module-logging</artifactId>
             <version>${project.version}</version>
         </dependency>