From ede44be6120d5b6e73fa716bcefdf1740afbca7a Mon Sep 17 00:00:00 2001
From: mikr <michael.krimgen@ximedes.com>
Date: Sun, 9 Feb 2020 14:43:20 +0100
Subject: [PATCH 1/3] BAEL-20604 Fix Mule ESB integration test

---
 muleesb/pom.xml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/muleesb/pom.xml b/muleesb/pom.xml
index c8468c1e00..bd719b5a1e 100644
--- a/muleesb/pom.xml
+++ b/muleesb/pom.xml
@@ -108,19 +108,15 @@
             <plugin>
                 <groupId>org.mule.tools</groupId>
                 <artifactId>muleesb-maven-plugin</artifactId>
-                <version>${muleesb-maven-plugin.version}</version>
                 <configuration>
-                    <muleVersion>${mule.version}</muleVersion>
-                    <applications>/home/abir/AnypointStudio/workspace/variablescopetest</applications>
+                    <muleDistribution>
+                        <groupId>com.mulesoft.muleesb.distributions</groupId>
+                        <artifactId>mule-ee-distribution-standalone</artifactId>
+                        <version>${mule.version}</version>
+                        <type>tar.gz</type>
+                    </muleDistribution>
+                    <clusterSize>2</clusterSize>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>deploy</id>
-                        <goals>
-                            <goal>start</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

From 2d7702ab7275847bc0975ecb29224b2765f129d6 Mon Sep 17 00:00:00 2001
From: mikr <michael.krimgen@ximedes.com>
Date: Tue, 25 Feb 2020 14:17:27 +0100
Subject: [PATCH 2/3] BAEL-20604 Update Mule ESB version

---
 muleesb/pom.xml | 50 ++++++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/muleesb/pom.xml b/muleesb/pom.xml
index bd719b5a1e..fb386a1d77 100644
--- a/muleesb/pom.xml
+++ b/muleesb/pom.xml
@@ -20,70 +20,70 @@
         <dependency>
             <groupId>org.mule.modules</groupId>
             <artifactId>mule-module-spring-config</artifactId>
-            <version>${mule.version}</version>
+            <version>${mule.dependecies.version}</version>
             <scope>provided</scope>
         </dependency>
         <!-- Mule Transports -->
         <dependency>
             <groupId>org.mule.transports</groupId>
             <artifactId>mule-transport-file</artifactId>
-            <version>${mule.version}</version>
+            <version>${mule.dependecies.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.mule.transports</groupId>
             <artifactId>mule-transport-http</artifactId>
-            <version>${mule.version}</version>
+            <version>${mule.dependecies.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.mule.transports</groupId>
             <artifactId>mule-transport-jdbc</artifactId>
-            <version>${mule.version}</version>
+            <version>${mule.dependecies.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.mule.transports</groupId>
             <artifactId>mule-transport-jms</artifactId>
-            <version>${mule.version}</version>
+            <version>${mule.dependecies.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.mule.transports</groupId>
             <artifactId>mule-transport-vm</artifactId>
-            <version>${mule.version}</version>
+            <version>${mule.dependecies.version}</version>
             <scope>provided</scope>
         </dependency>
         <!-- Mule Modules -->
         <dependency>
             <groupId>org.mule.modules</groupId>
             <artifactId>mule-module-scripting</artifactId>
-            <version>${mule.version}</version>
+            <version>${mule.dependecies.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.mule.modules</groupId>
             <artifactId>mule-module-xml</artifactId>
-            <version>${mule.version}</version>
+            <version>${mule.dependecies.version}</version>
             <scope>provided</scope>
         </dependency>
         <!-- for testing -->
         <dependency>
             <groupId>org.mule.tests</groupId>
             <artifactId>mule-tests-functional</artifactId>
-            <version>${mule.version}</version>
+            <version>${mule.dependecies.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mule.modules</groupId>
             <artifactId>mule-module-apikit</artifactId>
-            <version>${mule.version}</version>
+            <version>${mule.dependecies.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.mulesoft.munit</groupId>
             <artifactId>mule-munit-support</artifactId>
-            <version>${mule.munit.support.version}</version>
+            <version>${mule.dependecies.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -106,17 +106,22 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.mule.tools</groupId>
-                <artifactId>muleesb-maven-plugin</artifactId>
+                <groupId>org.mule.tools.maven</groupId>
+                <artifactId>mule-maven-plugin</artifactId>
+                <version>2.2.1</version>
                 <configuration>
-                    <muleDistribution>
-                        <groupId>com.mulesoft.muleesb.distributions</groupId>
-                        <artifactId>mule-ee-distribution-standalone</artifactId>
-                        <version>${mule.version}</version>
-                        <type>tar.gz</type>
-                    </muleDistribution>
-                    <clusterSize>2</clusterSize>
+                    <deploymentType>standalone</deploymentType>
+                    <muleVersion>${mule.version}</muleVersion>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>deploy</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>deploy</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -206,11 +211,10 @@
     </pluginRepositories>
 
     <properties>
-        <mule.version>3.8.1</mule.version>
+        <mule.version>4.2.1</mule.version>
         <mule.tools.version>1.2</mule.tools.version>
         <munit.version>1.3.6</munit.version>
-        <mule.munit.support.version>3.9.0</mule.munit.support.version>
-        <muleesb-maven-plugin.version>1.0</muleesb-maven-plugin.version>
+        <mule.dependecies.version>3.9.0</mule.dependecies.version>
         <build-helper-maven-plugin.version>1.7</build-helper-maven-plugin.version>
     </properties>
 

From 27bbbdad76558dc2be6f479f503033e9791f13f5 Mon Sep 17 00:00:00 2001
From: mikr <michael.krimgen@ximedes.com>
Date: Sat, 29 Feb 2020 15:30:39 +0100
Subject: [PATCH 3/3] BAEL-20604 Update Mule ESB version to 3.9.0

---
 muleesb/pom.xml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/muleesb/pom.xml b/muleesb/pom.xml
index fb386a1d77..e7c7e50cbe 100644
--- a/muleesb/pom.xml
+++ b/muleesb/pom.xml
@@ -20,70 +20,70 @@
         <dependency>
             <groupId>org.mule.modules</groupId>
             <artifactId>mule-module-spring-config</artifactId>
-            <version>${mule.dependecies.version}</version>
+            <version>${mule.version}</version>
             <scope>provided</scope>
         </dependency>
         <!-- Mule Transports -->
         <dependency>
             <groupId>org.mule.transports</groupId>
             <artifactId>mule-transport-file</artifactId>
-            <version>${mule.dependecies.version}</version>
+            <version>${mule.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.mule.transports</groupId>
             <artifactId>mule-transport-http</artifactId>
-            <version>${mule.dependecies.version}</version>
+            <version>${mule.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.mule.transports</groupId>
             <artifactId>mule-transport-jdbc</artifactId>
-            <version>${mule.dependecies.version}</version>
+            <version>${mule.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.mule.transports</groupId>
             <artifactId>mule-transport-jms</artifactId>
-            <version>${mule.dependecies.version}</version>
+            <version>${mule.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.mule.transports</groupId>
             <artifactId>mule-transport-vm</artifactId>
-            <version>${mule.dependecies.version}</version>
+            <version>${mule.version}</version>
             <scope>provided</scope>
         </dependency>
         <!-- Mule Modules -->
         <dependency>
             <groupId>org.mule.modules</groupId>
             <artifactId>mule-module-scripting</artifactId>
-            <version>${mule.dependecies.version}</version>
+            <version>${mule.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.mule.modules</groupId>
             <artifactId>mule-module-xml</artifactId>
-            <version>${mule.dependecies.version}</version>
+            <version>${mule.version}</version>
             <scope>provided</scope>
         </dependency>
         <!-- for testing -->
         <dependency>
             <groupId>org.mule.tests</groupId>
             <artifactId>mule-tests-functional</artifactId>
-            <version>${mule.dependecies.version}</version>
+            <version>${mule.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mule.modules</groupId>
             <artifactId>mule-module-apikit</artifactId>
-            <version>${mule.dependecies.version}</version>
+            <version>${mule.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.mulesoft.munit</groupId>
             <artifactId>mule-munit-support</artifactId>
-            <version>${mule.dependecies.version}</version>
+            <version>${mule.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -211,10 +211,9 @@
     </pluginRepositories>
 
     <properties>
-        <mule.version>4.2.1</mule.version>
+        <mule.version>3.9.0</mule.version>
         <mule.tools.version>1.2</mule.tools.version>
         <munit.version>1.3.6</munit.version>
-        <mule.dependecies.version>3.9.0</mule.dependecies.version>
         <build-helper-maven-plugin.version>1.7</build-helper-maven-plugin.version>
     </properties>