Skip to content

Commit cd011a0

Browse files
authored
Update to 2.6.0-SNAPSHOT (#90)
1 parent be6fd7f commit cd011a0

6 files changed

Lines changed: 17 additions & 13 deletions

File tree

.github/workflows/main.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
OSX_LINUX_WINDOWS:
1818
strategy:
1919
matrix:
20-
os: [macos-latest, ubuntu-latest, windows-latest]
20+
os: [ macos-latest, ubuntu-latest, windows-latest ]
2121
include:
2222
- os: windows-latest
2323
script_name: windows
@@ -30,7 +30,7 @@ jobs:
3030
steps:
3131
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
3232
- uses: actions/checkout@v2
33-
33+
3434
# Read graalvm version
3535
- name: Read Graalvm version
3636
run: |
@@ -51,13 +51,16 @@ jobs:
5151
run: |
5252
./gradlew --stacktrace build
5353
shell: bash
54-
5554
#Run regression tests
56-
- name: Run regression test 2.5
55+
- name: Run regression test 2.6
5756
run: |
58-
./gradlew --stacktrace -PweaveTestSuiteVersion=2.5.0-SNAPSHOT native-cli-integration-tests:test
57+
./gradlew --stacktrace -PweaveTestSuiteVersion=2.6.0-SNAPSHOT native-cli-integration-tests:test
58+
shell: bash
59+
#Run regression tests
60+
- name: Run regression test 2.5.x
61+
run: |
62+
./gradlew --stacktrace -PweaveTestSuiteVersion=2.5.0 native-cli-integration-tests:test
5963
shell: bash
60-
6164
- name: Run regression test 2.4
6265
run: |
6366
./gradlew --stacktrace -PweaveTestSuiteVersion=2.4.0-HF-SNAPSHOT native-cli-integration-tests:test

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
weaveVersion=2.5.0-SNAPSHOT
2-
weaveTestSuiteVersion=2.5.0-SNAPSHOT
1+
weaveVersion=2.6.0-SNAPSHOT
2+
weaveTestSuiteVersion=2.6.0-SNAPSHOT
33
nativeVersion=100.100.100
44
scalaVersion=2.12.15
55
ioVersion=1.0.0-SNAPSHOT
6-
graalvmVersion=22.3.0
6+
graalvmVersion=22.3.3
77
#Libaries
88
scalaTestVersion=3.2.15
99
scalaTestPluginVersion=0.32

native-cli-integration-tests/src/test/scala/org/mule/weave/native/NativeCliRuntimeIT.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ class NativeCliRuntimeIT extends AnyFunSpec
356356

357357
override def ignoreTests(): Array[String] = {
358358
// Encoding issues
359-
val baseArray = Array("csv-invalid-utf8", "splitBy-regex", "splitBy-string" ) ++
359+
val baseArray = Array("csv-invalid-utf8", "splitBy-regex", "splitBy-string", "xml-encoding-decl-near", "xml-encoding-decl-far") ++
360360
// Fail in java11 because broken backwards
361361
Array("coerciones_toString", "date-coercion") ++
362362
// Use resources (dwl files) that is present in the Tests but not in Cli (e.g: org::mule::weave::v2::libs::)

native-cli/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ dependencies {
2727
implementation group: 'org.mule.weave', name: 'core-modules', version: weaveVersion
2828
implementation group: 'org.mule.weave', name: 'yaml-module', version: weaveVersion
2929
implementation group: 'org.mule.weave', name: 'jsonschema-module', version: weaveVersion
30+
implementation group: 'org.mule.weave', name: 'xmlschema-module', version: weaveVersion
3031
implementation group: 'org.mule.weave', name: 'http-module', version: ioVersion
3132
implementation group: 'org.mule.weave', name: 'process-module', version: ioVersion
32-
implementation group: 'org.mule.weave', name: 'migrant', version: '2.5.0-SNAPSHOT'
33+
implementation group: 'org.mule.weave', name: 'migrant', version: weaveVersion
3334
implementation(group: 'org.mule.weave', name: 'http-netty-module', version: ioVersion) {
3435
exclude group: 'org.slf4j'
3536
}

native-cli/src/main/java/org/mule/weave/cli/pico/PicoMigrate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class PicoMigrate implements Callable<Integer> {
2020

2121
@CommandLine.Parameters(
2222
index = "0",
23-
arity = "0..1",
23+
arity = "1",
2424
description = "The path to the dw1 file."
2525
)
2626
private File dw1File = null;

native-cli/src/main/java/org/mule/weave/cli/pico/PicoRunSpell.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ protected Integer doCall() {
8787

8888
int lastUpdate = utils.daysSinceLastUpdate();
8989
if (lastUpdate > 30) {
90-
console.info("Your spells are getting old. " + lastUpdate + " days since last update. Please run \n dw update-spells");
90+
console.info("Your spells are getting old. " + lastUpdate + " days since last update. Please run \n dw spell update");
9191
}
9292

9393
File spellFolder;

0 commit comments

Comments
 (0)