Skip to content

Commit 5d57a65

Browse files
authored
W-13674211: Set data-weave version to 2.5.0-SNAPSHOT (#85)
* W-13674211: Set data-weave version to 2.5.0-SNAPSHOT * Update scala and scalaTest versions
1 parent d096a2c commit 5d57a65

5 files changed

Lines changed: 12 additions & 17 deletions

File tree

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
weaveVersion=2.6.0-SNAPSHOT
2-
weaveTestSuiteVersion=2.6.0-SNAPSHOT
1+
weaveVersion=2.5.0-SNAPSHOT
2+
weaveTestSuiteVersion=2.5.0-SNAPSHOT
33
nativeVersion=100.100.100
4-
scalaVersion=2.12.11
4+
scalaVersion=2.12.15
55
ioVersion=1.0.0-SNAPSHOT
66
graalvmVersion=22.3.0
77
#Libaries
8-
scalaTestVersion=3.0.1
8+
scalaTestVersion=3.2.15
99
scalaTestPluginVersion=0.32
1010

1111
#org.gradle.jvmargs=-Dfile.encoding=utf-8

native-cli/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies {
3535
}
3636
implementation group: 'org.mule.weave', name: 'ndjson-module', version: weaveVersion
3737
testImplementation group: 'org.scalatest', name: 'scalatest_2.12', version: scalaTestVersion
38-
testRuntimeOnly 'org.pegdown:pegdown:1.6.0'
38+
testRuntimeOnly 'com.vladsch.flexmark:flexmark-all:0.62.2'
3939
}
4040

4141
ext {

native-cli/src/main/scala/org/mule/weave/dwnative/NativeRuntime.scala

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ import org.mule.weave.v2.io.service.CustomWorkingDirectoryService
1212
import org.mule.weave.v2.io.service.WorkingDirectoryService
1313
import org.mule.weave.v2.model.EvaluationContext
1414
import org.mule.weave.v2.model.ServiceManager
15-
import org.mule.weave.v2.model.service.{CharsetProviderService, DefaultLanguageLevelService, DefaultSecurityManagerService, LanguageLevelService, LoggingService, ProtocolUrlSourceProviderResolverService, ReadFunctionProtocolHandler, SecurityManagerService, UrlProtocolHandler, UrlSourceProviderResolverService, WeaveLanguageLevelService, WeaveRuntimePrivilege}
15+
import org.mule.weave.v2.model.service.{CharsetProviderService, DefaultSecurityManagerService, LoggingService, ProtocolUrlSourceProviderResolverService, ReadFunctionProtocolHandler, SecurityManagerService, UrlProtocolHandler, UrlSourceProviderResolverService, WeaveRuntimePrivilege}
1616
import org.mule.weave.v2.model.values.BinaryValue
17-
import org.mule.weave.v2.module.MimeType
1817
import org.mule.weave.v2.module.reader.AutoPersistedOutputStream
1918
import org.mule.weave.v2.module.reader.SourceProvider
2019
import org.mule.weave.v2.parser.ast.variables.NameIdentifier
@@ -25,7 +24,6 @@ import org.mule.weave.v2.parser.phase.CompositeModuleParsingPhasesManager
2524
import org.mule.weave.v2.parser.phase.ModuleLoader
2625
import org.mule.weave.v2.parser.phase.ModuleLoaderManager
2726
import org.mule.weave.v2.parser.phase.ModuleParsingPhasesManager
28-
import org.mule.weave.v2.runtime.CompilationConfig
2927
import org.mule.weave.v2.runtime.DataWeaveResult
3028
import org.mule.weave.v2.runtime.DataWeaveScript
3129
import org.mule.weave.v2.runtime.DataWeaveScriptingEngine
@@ -36,7 +34,6 @@ import org.mule.weave.v2.runtime.ModuleComponentsFactory
3634
import org.mule.weave.v2.runtime.ParserConfiguration
3735
import org.mule.weave.v2.runtime.ScriptingBindings
3836
import org.mule.weave.v2.runtime.ScriptingEngineSetupException
39-
import org.mule.weave.v2.sdk.NameIdentifierHelper
4037
import org.mule.weave.v2.sdk.SPIBasedModuleLoaderProvider
4138
import org.mule.weave.v2.sdk.TwoLevelWeaveResourceResolver
4239
import org.mule.weave.v2.sdk.WeaveResourceResolver

native-cli/src/test/scala/org/mule/weave/dwnative/cli/DataWeaveCLITest.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ import org.mule.weave.cli.DWCLI.DWFactory
44
import org.mule.weave.cli.DWCLI.DataWeaveCLIRunner
55
import org.mule.weave.dwnative.utils.DataWeaveUtils
66
import org.mule.weave.v2.utils.StringHelper.toStringTransformer
7-
import org.scalatest.FreeSpec
8-
import org.scalatest.Matchers
7+
import org.scalatest.freespec.AnyFreeSpec
8+
import org.scalatest.matchers.should.Matchers
99
import picocli.CommandLine
1010

1111
import java.io.ByteArrayInputStream
1212
import java.io.ByteArrayOutputStream
1313
import java.io.File
1414
import scala.io.Source
1515

16-
class DataWeaveCLITest extends FreeSpec with Matchers {
16+
class DataWeaveCLITest extends AnyFreeSpec with Matchers {
1717

1818
"should work with output application/json" in {
1919
val stream = new ByteArrayOutputStream()

native-cli/src/test/scala/org/mule/weave/dwnative/cli/DependencyManagerTest.scala

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
package org.mule.weave.dwnative.cli
22

33
import org.mule.weave.dwnative.NativeRuntime
4-
import org.mule.weave.dwnative.dependencies.ResolutionErrorHandler
54
import org.mule.weave.dwnative.dependencies.DependencyModel
6-
import org.mule.weave.dwnative.dependencies.DependencyResolutionResult
75
import org.mule.weave.dwnative.dependencies.MavenDependencyModel
86
import org.mule.weave.dwnative.dependencies.SpellDependencyManager
9-
import org.scalatest.FreeSpec
10-
import org.scalatest.Matchers
7+
import org.scalatest.freespec.AnyFreeSpec
8+
import org.scalatest.matchers.should.Matchers
119

1210
import java.io.File
1311

14-
class DependencyManagerTest extends FreeSpec with Matchers {
12+
class DependencyManagerTest extends AnyFreeSpec with Matchers {
1513

1614
"it should parse the build definition correctly" in {
1715
val simpleSpellWithDependencies = new File(TestUtils.getSpellsFolder(), "SimpleSpellWithDependencies")

0 commit comments

Comments
 (0)