Skip to content

Commit

Permalink
W-13674211: Set data-weave version to 2.5.0-SNAPSHOT (#85)
Browse files Browse the repository at this point in the history
* W-13674211: Set data-weave version to 2.5.0-SNAPSHOT

* Update scala and scalaTest versions
  • Loading branch information
mlischetti authored Jul 4, 2023
1 parent d096a2c commit 5d57a65
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 17 deletions.
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
weaveVersion=2.6.0-SNAPSHOT
weaveTestSuiteVersion=2.6.0-SNAPSHOT
weaveVersion=2.5.0-SNAPSHOT
weaveTestSuiteVersion=2.5.0-SNAPSHOT
nativeVersion=100.100.100
scalaVersion=2.12.11
scalaVersion=2.12.15
ioVersion=1.0.0-SNAPSHOT
graalvmVersion=22.3.0
#Libaries
scalaTestVersion=3.0.1
scalaTestVersion=3.2.15
scalaTestPluginVersion=0.32

#org.gradle.jvmargs=-Dfile.encoding=utf-8
2 changes: 1 addition & 1 deletion native-cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies {
}
implementation group: 'org.mule.weave', name: 'ndjson-module', version: weaveVersion
testImplementation group: 'org.scalatest', name: 'scalatest_2.12', version: scalaTestVersion
testRuntimeOnly 'org.pegdown:pegdown:1.6.0'
testRuntimeOnly 'com.vladsch.flexmark:flexmark-all:0.62.2'
}

ext {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ import org.mule.weave.v2.io.service.CustomWorkingDirectoryService
import org.mule.weave.v2.io.service.WorkingDirectoryService
import org.mule.weave.v2.model.EvaluationContext
import org.mule.weave.v2.model.ServiceManager
import org.mule.weave.v2.model.service.{CharsetProviderService, DefaultLanguageLevelService, DefaultSecurityManagerService, LanguageLevelService, LoggingService, ProtocolUrlSourceProviderResolverService, ReadFunctionProtocolHandler, SecurityManagerService, UrlProtocolHandler, UrlSourceProviderResolverService, WeaveLanguageLevelService, WeaveRuntimePrivilege}
import org.mule.weave.v2.model.service.{CharsetProviderService, DefaultSecurityManagerService, LoggingService, ProtocolUrlSourceProviderResolverService, ReadFunctionProtocolHandler, SecurityManagerService, UrlProtocolHandler, UrlSourceProviderResolverService, WeaveRuntimePrivilege}
import org.mule.weave.v2.model.values.BinaryValue
import org.mule.weave.v2.module.MimeType
import org.mule.weave.v2.module.reader.AutoPersistedOutputStream
import org.mule.weave.v2.module.reader.SourceProvider
import org.mule.weave.v2.parser.ast.variables.NameIdentifier
Expand All @@ -25,7 +24,6 @@ import org.mule.weave.v2.parser.phase.CompositeModuleParsingPhasesManager
import org.mule.weave.v2.parser.phase.ModuleLoader
import org.mule.weave.v2.parser.phase.ModuleLoaderManager
import org.mule.weave.v2.parser.phase.ModuleParsingPhasesManager
import org.mule.weave.v2.runtime.CompilationConfig
import org.mule.weave.v2.runtime.DataWeaveResult
import org.mule.weave.v2.runtime.DataWeaveScript
import org.mule.weave.v2.runtime.DataWeaveScriptingEngine
Expand All @@ -36,7 +34,6 @@ import org.mule.weave.v2.runtime.ModuleComponentsFactory
import org.mule.weave.v2.runtime.ParserConfiguration
import org.mule.weave.v2.runtime.ScriptingBindings
import org.mule.weave.v2.runtime.ScriptingEngineSetupException
import org.mule.weave.v2.sdk.NameIdentifierHelper
import org.mule.weave.v2.sdk.SPIBasedModuleLoaderProvider
import org.mule.weave.v2.sdk.TwoLevelWeaveResourceResolver
import org.mule.weave.v2.sdk.WeaveResourceResolver
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ import org.mule.weave.cli.DWCLI.DWFactory
import org.mule.weave.cli.DWCLI.DataWeaveCLIRunner
import org.mule.weave.dwnative.utils.DataWeaveUtils
import org.mule.weave.v2.utils.StringHelper.toStringTransformer
import org.scalatest.FreeSpec
import org.scalatest.Matchers
import org.scalatest.freespec.AnyFreeSpec
import org.scalatest.matchers.should.Matchers
import picocli.CommandLine

import java.io.ByteArrayInputStream
import java.io.ByteArrayOutputStream
import java.io.File
import scala.io.Source

class DataWeaveCLITest extends FreeSpec with Matchers {
class DataWeaveCLITest extends AnyFreeSpec with Matchers {

"should work with output application/json" in {
val stream = new ByteArrayOutputStream()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package org.mule.weave.dwnative.cli

import org.mule.weave.dwnative.NativeRuntime
import org.mule.weave.dwnative.dependencies.ResolutionErrorHandler
import org.mule.weave.dwnative.dependencies.DependencyModel
import org.mule.weave.dwnative.dependencies.DependencyResolutionResult
import org.mule.weave.dwnative.dependencies.MavenDependencyModel
import org.mule.weave.dwnative.dependencies.SpellDependencyManager
import org.scalatest.FreeSpec
import org.scalatest.Matchers
import org.scalatest.freespec.AnyFreeSpec
import org.scalatest.matchers.should.Matchers

import java.io.File

class DependencyManagerTest extends FreeSpec with Matchers {
class DependencyManagerTest extends AnyFreeSpec with Matchers {

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

0 comments on commit 5d57a65

Please sign in to comment.