Update to 2.6.0-SNAPSHOT (#90)

mulesoft-labs · Nov 10, 2023 · cd011a0 · cd011a0
1 parent be6fd7f
commit cd011a0
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ jobs:
   OSX_LINUX_WINDOWS:
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [ macos-latest, ubuntu-latest, windows-latest ]
         include:
           - os: windows-latest
             script_name: windows
@@ -30,7 +30,7 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
-          
+
       # Read graalvm version
       - name: Read Graalvm version
         run: |
@@ -51,13 +51,16 @@ jobs:
         run: |
           ./gradlew --stacktrace build
         shell: bash
-
       #Run regression tests
-      - name: Run regression test 2.5
+      - name: Run regression test 2.6
         run: |
-          ./gradlew --stacktrace -PweaveTestSuiteVersion=2.5.0-SNAPSHOT native-cli-integration-tests:test
+          ./gradlew --stacktrace -PweaveTestSuiteVersion=2.6.0-SNAPSHOT native-cli-integration-tests:test
+        shell: bash
+      #Run regression tests
+      - name: Run regression test 2.5.x
+        run: |
+          ./gradlew --stacktrace -PweaveTestSuiteVersion=2.5.0 native-cli-integration-tests:test
         shell: bash
-
       - name: Run regression test 2.4
         run: |
           ./gradlew --stacktrace -PweaveTestSuiteVersion=2.4.0-HF-SNAPSHOT native-cli-integration-tests:test

diff --git a/gradle.properties b/gradle.properties
@@ -1,9 +1,9 @@
-weaveVersion=2.5.0-SNAPSHOT
-weaveTestSuiteVersion=2.5.0-SNAPSHOT
+weaveVersion=2.6.0-SNAPSHOT
+weaveTestSuiteVersion=2.6.0-SNAPSHOT
 nativeVersion=100.100.100
 scalaVersion=2.12.15
 ioVersion=1.0.0-SNAPSHOT
-graalvmVersion=22.3.0
+graalvmVersion=22.3.3
 #Libaries
 scalaTestVersion=3.2.15
 scalaTestPluginVersion=0.32

diff --git a/native-cli-integration-tests/src/test/scala/org/mule/weave/native/NativeCliRuntimeIT.scala b/native-cli-integration-tests/src/test/scala/org/mule/weave/native/NativeCliRuntimeIT.scala
@@ -356,7 +356,7 @@ class NativeCliRuntimeIT extends AnyFunSpec
 
   override def ignoreTests(): Array[String] = {
     // Encoding issues
-    val baseArray = Array("csv-invalid-utf8", "splitBy-regex", "splitBy-string" ) ++
+    val baseArray = Array("csv-invalid-utf8", "splitBy-regex", "splitBy-string", "xml-encoding-decl-near", "xml-encoding-decl-far") ++
       // Fail in java11 because broken backwards
       Array("coerciones_toString", "date-coercion") ++
       // Use resources (dwl files) that is present in the Tests but not in Cli (e.g: org::mule::weave::v2::libs::)

diff --git a/native-cli/build.gradle b/native-cli/build.gradle
@@ -27,9 +27,10 @@ dependencies {
     implementation group: 'org.mule.weave', name: 'core-modules', version: weaveVersion
     implementation group: 'org.mule.weave', name: 'yaml-module', version: weaveVersion
     implementation group: 'org.mule.weave', name: 'jsonschema-module', version: weaveVersion
+    implementation group: 'org.mule.weave', name: 'xmlschema-module', version: weaveVersion
     implementation group: 'org.mule.weave', name: 'http-module', version: ioVersion
     implementation group: 'org.mule.weave', name: 'process-module', version: ioVersion
-    implementation group: 'org.mule.weave', name: 'migrant', version: '2.5.0-SNAPSHOT'
+    implementation group: 'org.mule.weave', name: 'migrant', version: weaveVersion
     implementation(group: 'org.mule.weave', name: 'http-netty-module', version: ioVersion) {
         exclude group: 'org.slf4j'
     }

diff --git a/native-cli/src/main/java/org/mule/weave/cli/pico/PicoMigrate.java b/native-cli/src/main/java/org/mule/weave/cli/pico/PicoMigrate.java
@@ -20,7 +20,7 @@ public class PicoMigrate implements Callable<Integer> {
 
     @CommandLine.Parameters(
             index = "0",
-            arity = "0..1",
+            arity = "1",
             description = "The path to the dw1 file."
     )
     private File dw1File = null;

diff --git a/native-cli/src/main/java/org/mule/weave/cli/pico/PicoRunSpell.java b/native-cli/src/main/java/org/mule/weave/cli/pico/PicoRunSpell.java
@@ -87,7 +87,7 @@ protected Integer doCall() {
 
         int lastUpdate = utils.daysSinceLastUpdate();
         if (lastUpdate > 30) {
-            console.info("Your spells are getting old. " + lastUpdate + " days since last update. Please run \n dw update-spells");
+            console.info("Your spells are getting old. " + lastUpdate + " days since last update. Please run \n dw spell update");
         }
 
         File spellFolder;