Fix #503 by updating all connector/module versions & dependencies, ex…

…tract apikit related ones to file and update test runtime version to latest (#504)
mulesoft · Jul 22, 2021 · fbca3c3 · fbca3c3
1 parent ae52e5c
commit fbca3c3
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 41 deletions.
diff --git a/...com/mulesoft/tools/migration/library/apikit/steps/ApikitMigrationTaskPomContribution.java b/...com/mulesoft/tools/migration/library/apikit/steps/ApikitMigrationTaskPomContribution.java
@@ -5,6 +5,8 @@
  */
 package com.mulesoft.tools.migration.library.apikit.steps;
 
+import static com.mulesoft.tools.migration.library.tools.PluginsVersions.targetVersion;
+
 import com.mulesoft.tools.migration.project.model.pom.Dependency.DependencyBuilder;
 import com.mulesoft.tools.migration.project.model.pom.PomModel;
 import com.mulesoft.tools.migration.step.category.MigrationReport;
@@ -27,7 +29,7 @@ public void execute(PomModel pomModel, MigrationReport report) throws RuntimeExc
     pomModel.addDependency(new DependencyBuilder()
         .withGroupId("org.mule.modules")
         .withArtifactId("mule-apikit-module")
-        .withVersion("1.3.9")
+        .withVersion(targetVersion("mule-apikit-module"))
         .withClassifier("mule-plugin")
         .build());
   }

diff --git a/...m/mulesoft/tools/migration/library/soapkit/steps/SoapkitMigrationTaskPomContribution.java b/...m/mulesoft/tools/migration/library/soapkit/steps/SoapkitMigrationTaskPomContribution.java
@@ -5,6 +5,8 @@
  */
 package com.mulesoft.tools.migration.library.soapkit.steps;
 
+import static com.mulesoft.tools.migration.library.tools.PluginsVersions.targetVersion;
+
 import com.mulesoft.tools.migration.project.model.pom.Dependency;
 import com.mulesoft.tools.migration.project.model.pom.PomModel;
 import com.mulesoft.tools.migration.step.category.MigrationReport;
@@ -27,7 +29,7 @@ public void execute(PomModel pomModel, MigrationReport report) throws RuntimeExc
     pomModel.addDependency(new Dependency.DependencyBuilder()
         .withGroupId("org.mule.modules")
         .withArtifactId("mule-soapkit-module")
-        .withVersion("1.2.6")
+        .withVersion(targetVersion("mule-soapkit-module"))
         .withClassifier("mule-plugin")
         .build());
   }

diff --git a/mule-migration-tool-tests/pom.xml b/mule-migration-tool-tests/pom.xml
@@ -12,7 +12,8 @@
     <properties>
         <formatterConfigPath>../formatter.xml</formatterConfigPath>
         <licensePath>../LICENSE_HEADER.txt</licensePath>
-
+        <!--API version should match Runtime version in tests-->
+        <mule.api.version>1.3.0</mule.api.version>
         <e2e.tests.forkCount>1</e2e.tests.forkCount>
     </properties>
 
@@ -80,6 +81,20 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>mule_4_1</id>
+            <activation>
+                <property>
+                    <name>testMuleVersion</name>
+                    <value>4.1</value>
+                </property>
+            </activation>
+
+            <properties>
+                <mule.runtime.version>4.1.6</mule.runtime.version>
+                <mule.api.version>1.1.6</mule.api.version>
+            </properties>
+        </profile>
         <profile>
             <id>mule_4_2</id>
             <activation>
@@ -90,8 +105,8 @@
             </activation>
 
             <properties>
-                <mule.runtime.version>4.2.0</mule.runtime.version>
-                <mule.api.version>1.2.0</mule.api.version>
+                <mule.runtime.version>4.2.2</mule.runtime.version>
+                <mule.api.version>1.2.2</mule.api.version>
             </properties>
         </profile>
     </profiles>
@@ -157,6 +172,11 @@
             <artifactId>mule-tests-infrastructure</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.mulesoft.mule.distributions</groupId>
             <artifactId>mule-ee-distribution-standalone</artifactId>
@@ -216,4 +236,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/...ol-tests/src/test/java/com/mulesoft/tools/migration/integration/FtpMigrationTestCase.java b/...ol-tests/src/test/java/com/mulesoft/tools/migration/integration/FtpMigrationTestCase.java
@@ -5,10 +5,14 @@
  */
 package com.mulesoft.tools.migration.integration;
 
-import org.mule.runtime.core.api.util.FileUtils;
 import org.mule.tck.junit4.rule.DynamicPort;
 import org.mule.test.infrastructure.server.ftp.EmbeddedFtpServer;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Paths;
+
+import org.apache.commons.io.FileUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -17,9 +21,6 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import java.io.File;
-import java.nio.file.Paths;
-
 @RunWith(Parameterized.class)
 public class FtpMigrationTestCase extends EndToEndTestCase {
 
@@ -61,13 +62,13 @@ public void before() throws Exception {
     ftpDestinationServer.start();
   }
 
-  private void createFtpServerBaseDir() {
+  private void createFtpServerBaseDir() throws IOException {
     this.deleteFtpServerBaseDir();
     this.serverBaseDir.mkdirs();
   }
 
-  private void deleteFtpServerBaseDir() {
-    FileUtils.deleteTree(this.serverBaseDir);
+  private void deleteFtpServerBaseDir() throws IOException {
+    FileUtils.deleteDirectory(serverBaseDir);
   }
 
   @After

diff --git a/pom.xml b/pom.xml
@@ -84,27 +84,27 @@
         <jacoco.report.location>${session.executionRootDirectory}/target/site/jacoco/jacoco.xml</jacoco.report.location>
 
         <!-- Dependencies -->
-        <gson.version>2.8.6</gson.version>
-        <guava.version>19.0</guava.version>
+        <gson.version>2.8.7</gson.version>
+        <guava.version>30.1.1-jre</guava.version>
         <jaxen.version>1.2.0</jaxen.version>
         <jdom2.version>2.0.6</jdom2.version>
-        <commons.io.version>2.7</commons.io.version>
-        <commons.net.version>3.6</commons.net.version>
-        <commons.text.version>1.8</commons.text.version>
+        <commons.io.version>2.11.0</commons.io.version>
+        <commons.net.version>3.8.0</commons.net.version>
+        <commons.text.version>1.9</commons.text.version>
         <commons.cli.version>1.4</commons.cli.version>
-        <commons.lang3.version>3.10</commons.lang3.version>
+        <commons.lang3.version>3.12.0</commons.lang3.version>
         <log4j.version>2.9.1</log4j.version>
 
         <junit.version>4.13</junit.version>
         <hamcrest.version>1.3</hamcrest.version>
         <mockito.version>2.23.0</mockito.version>
         <xmlunit.version>2.5.1</xmlunit.version>
         <powermock.module.junit4>2.0.0-beta.5</powermock.module.junit4>
-        <snakeyaml.version>1.26</snakeyaml.version>
+        <snakeyaml.version>1.29</snakeyaml.version>
 
         <maven.model.version>3.5.0</maven.model.version>
 
-        <mule.runtime.version>4.1.5</mule.runtime.version>
+        <mule.runtime.version>4.3.0</mule.runtime.version>
         <munit.version>2.2.1</munit.version>
 
         <mule.api.version>1.1.5</mule.api.version>

diff --git a/target-modules/pom.xml b/target-modules/pom.xml
@@ -19,19 +19,19 @@
         <maven.compiler.target>1.8</maven.compiler.target>
 
         <!-- Target versions for migrated components -->
-        <mule.http.connector.version>1.5.6</mule.http.connector.version>
-        <mule.sockets.connector.version>1.1.6</mule.sockets.connector.version>
-        <mule.file.connector.version>1.3.2</mule.file.connector.version>
-        <mule.jms.connector.version>1.7.0</mule.jms.connector.version>
+        <mule.http.connector.version>1.5.25</mule.http.connector.version>
+        <mule.sockets.connector.version>1.2.1</mule.sockets.connector.version>
+        <mule.file.connector.version>1.3.4</mule.file.connector.version>
+        <mule.jms.connector.version>1.7.5</mule.jms.connector.version>
         <mule.vm.connector.version>2.0.0</mule.vm.connector.version>
-        <mule.amqp.connector.version>1.6.2</mule.amqp.connector.version>
-        <mule.aggregators.module.version>1.0.2</mule.aggregators.module.version>
+        <mule.amqp.connector.version>1.7.1</mule.amqp.connector.version>
+        <mule.aggregators.module.version>1.0.4</mule.aggregators.module.version>
 
-        <mule.validation.module.version>1.4.0</mule.validation.module.version>
-        <mule.secureProps.module.version>1.2.2</mule.secureProps.module.version>
+        <mule.validation.module.version>1.4.5</mule.validation.module.version>
+        <mule.secureProps.module.version>1.2.3</mule.secureProps.module.version>
         <mule.scripting.module.version>1.1.7</mule.scripting.module.version>
-        <mule.spring.module.version>1.3.3</mule.spring.module.version>
-        <mule.compression.module.version>2.1.0</mule.compression.module.version>
+        <mule.spring.module.version>1.3.6</mule.spring.module.version>
+        <mule.compression.module.version>2.1.1</mule.compression.module.version>
 
         <munit.version>2.2.5</munit.version>
     </properties>

diff --git a/target-modules/src/main/resources/target-versions.properties b/target-modules/src/main/resources/target-versions.properties
@@ -1,26 +1,28 @@
 mule-http-connector=${mule.http.connector.version}
 mule-sockets-connector=${mule.sockets.connector.version}
-mule-db-connector=1.8.1
+mule-db-connector=1.10.1
 mule-amqp-connector=${mule.amqp.connector.version}
+mule-apikit-module=1.5.3
 mule-jms-connector=${mule.jms.connector.version}
-mule-wsc-connector=1.5.8
-mule-email-connector=1.2.1
+mule-wsc-connector=1.6.4
+mule-email-connector=1.4.1
 mule-file-connector=${mule.file.connector.version}
-mule-ftp-connector=1.5.1
-mule-sftp-connector=1.3.7
+mule-ftp-connector=1.5.4
+mule-sftp-connector=1.4.0
 mule-vm-connector=${mule.vm.connector.version}
-mule-objectstore-connector=1.1.5
+mule-objectstore-connector=1.2.1
 mule-aggregators-module=${mule.aggregators.module.version}
 mule-salesforce-connector=10.3.0
 
 mule-validation-module=${mule.validation.module.version}
 mule-scripting-module=${mule.scripting.module.version}
 mule-secure-configuration-property-module=${mule.secureProps.module.version}
+mule-soapkit-module=1.2.11
 mule-spring-module=${mule.spring.module.version}
-mule-json-module=2.1.3
-mule-java-module=1.2.6
-mule-cryptography-module=1.3.5
-mule-oauth2-provider-module=1.0.5
+mule-json-module=2.1.4
+mule-java-module=1.2.8
+mule-cryptography-module=1.3.8
+mule-oauth2-provider-module=1.0.6
 mule-compression-module=${mule.compression.module.version}
 
 munit-maven-plugin=${munit.version}