From 739074ca09b6be971bbe0f5ff9f538eb66cb3758 Mon Sep 17 00:00:00 2001
From: Alejandro Nosenzo <1653997+anosenzo@users.noreply.github.com>
Date: Fri, 28 Jul 2023 16:14:47 -0300
Subject: [PATCH 1/2] W-13799169: Test changes in W-13799169

---
 standalone/pom.xml                   |  1 +
 standalone/src/assembly/assembly.xml | 30 +---------------------------
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/standalone/pom.xml b/standalone/pom.xml
index 3ec161125a6..686db2515b0 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -74,6 +74,7 @@
 
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.6.1-MULE-SNAPSHOT</version>
                 <configuration>
                     <descriptors>
                         <descriptor>src/assembly/assembly.xml</descriptor>
diff --git a/standalone/src/assembly/assembly.xml b/standalone/src/assembly/assembly.xml
index f5cd9f6de2a..f43f6245508 100644
--- a/standalone/src/assembly/assembly.xml
+++ b/standalone/src/assembly/assembly.xml
@@ -266,40 +266,12 @@
         <!-- Mule Services -->
         <dependencySet>
             <outputDirectory>services/${artifact.artifactId}-${artifact.baseVersion}</outputDirectory>
-            <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <useStrictFiltering>true</useStrictFiltering>
-            <unpack>true</unpack>
-            <includes>
-                <include>org.mule.services:mule-service-scheduler</include>
-            </includes>
-        </dependencySet>
-
-        <dependencySet>
-            <outputDirectory>services/${artifact.artifactId}-${artifact.baseVersion}</outputDirectory>
-            <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <useStrictFiltering>true</useStrictFiltering>
             <unpack>true</unpack>
             <includes>
                 <include>org.mule.services:mule-service-http</include>
-            </includes>
-        </dependencySet>
-
-        <dependencySet>
-            <outputDirectory>services/${artifact.artifactId}-${artifact.baseVersion}</outputDirectory>
-            <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <useStrictFiltering>true</useStrictFiltering>
-            <unpack>true</unpack>
-            <includes>
                 <include>org.mule.services:mule-service-oauth</include>
-            </includes>
-        </dependencySet>
-
-        <dependencySet>
-            <outputDirectory>services/${artifact.artifactId}-${artifact.baseVersion}</outputDirectory>
-            <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <useStrictFiltering>true</useStrictFiltering>
-            <unpack>true</unpack>
-            <includes>
+                <include>org.mule.services:mule-service-scheduler</include>
                 <include>org.mule.services:mule-service-soap</include>
             </includes>
         </dependencySet>

From c73cda79a2f626100b4aa429514dd5e41dbcda21 Mon Sep 17 00:00:00 2001
From: Alejandro Nosenzo <1653997+anosenzo@users.noreply.github.com>
Date: Fri, 28 Jul 2023 18:32:34 -0300
Subject: [PATCH 2/2] W-13799169: Test changes in W-13799169

---
 standalone/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/standalone/pom.xml b/standalone/pom.xml
index 686db2515b0..70da4f16762 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -74,7 +74,7 @@
 
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.6.1-MULE-SNAPSHOT</version>
+                <version>3.6.0-MULE-SNAPSHOT</version>
                 <configuration>
                     <descriptors>
                         <descriptor>src/assembly/assembly.xml</descriptor>