From 0742ee6c13582440a5193c040371f3ff70b7becb Mon Sep 17 00:00:00 2001 From: Arek Burdach <> Date: Wed, 6 Nov 2024 15:57:10 +0100 Subject: [PATCH] Nu bump 1.17.0 -> 1.18.0-RC1 --- .gitignore | 1 + build.sbt | 2 +- .../common/CommonFlinkStreamingDeploymentManagerSpec.scala | 2 +- .../engine/management/common/StreamingDockerTest.scala | 4 +++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2d20a2f..5e83283 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ _book/ .DS_Store *.log.logstashjson out/ +dumps/ diff --git a/build.sbt b/build.sbt index 83acb3f..6de0b32 100644 --- a/build.sbt +++ b/build.sbt @@ -28,7 +28,7 @@ val baseVersion = "1.0-SNAPSHOT" // todo: for now we should regularly bump the version until we start publish single "latest" -SNAPSHOT version val nussknackerV = settingKey[String]("Nussknacker version") -ThisBuild / nussknackerV := "1.18.0-staging-2024-10-10-20916-2224d333f-SNAPSHOT" +ThisBuild / nussknackerV := "1.18.0-RC1" ThisBuild / version := codeVersion(baseVersion, nussknackerV.value) // Global publish settings diff --git a/commonTest/src/main/scala/pl/touk/nussknacker/engine/management/common/CommonFlinkStreamingDeploymentManagerSpec.scala b/commonTest/src/main/scala/pl/touk/nussknacker/engine/management/common/CommonFlinkStreamingDeploymentManagerSpec.scala index 1048671..2d14be8 100644 --- a/commonTest/src/main/scala/pl/touk/nussknacker/engine/management/common/CommonFlinkStreamingDeploymentManagerSpec.scala +++ b/commonTest/src/main/scala/pl/touk/nussknacker/engine/management/common/CommonFlinkStreamingDeploymentManagerSpec.scala @@ -18,7 +18,7 @@ trait CommonFlinkStreamingDeploymentManagerSpec extends AnyFunSuite with Matcher val deploymentManager = createDeploymentManager(jobManager.jobmanagerRestUrl) val processId = "runningFlink" - val version = ProcessVersion(VersionId(15), ProcessName(processId), ProcessId(1), List.empty, "user1", Some(13)) + val version = ProcessVersion(VersionId(15), ProcessName(processId), ProcessId(1), labels = List.empty, user = "user1", modelVersion = Some(13)) val process = prepareProcess(processId, Some(1)) deployProcessAndWaitIfRunning( diff --git a/commonTest/src/main/scala/pl/touk/nussknacker/engine/management/common/StreamingDockerTest.scala b/commonTest/src/main/scala/pl/touk/nussknacker/engine/management/common/StreamingDockerTest.scala index 408827e..f75216b 100644 --- a/commonTest/src/main/scala/pl/touk/nussknacker/engine/management/common/StreamingDockerTest.scala +++ b/commonTest/src/main/scala/pl/touk/nussknacker/engine/management/common/StreamingDockerTest.scala @@ -19,6 +19,7 @@ import pl.touk.nussknacker.engine.api.deployment._ import pl.touk.nussknacker.engine.api.deployment.simple.SimpleStateStatus import pl.touk.nussknacker.engine.api.process.ProcessName import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess +import pl.touk.nussknacker.engine.definition.component.Components.ComponentDefinitionExtractionMode.FinalDefinition import pl.touk.nussknacker.engine.deployment.{DeploymentData, User} import pl.touk.nussknacker.engine.management.FlinkStreamingDeploymentManagerProvider import sttp.client3.SttpBackend @@ -78,7 +79,8 @@ trait StreamingDockerTest additionalConfigsFromProvider = Map.empty, determineDesignerWideId = componentId => DesignerWideComponentId(componentId.toString), workingDirectoryOpt = None, - shouldIncludeComponentProvider = _ => true + shouldIncludeComponentProvider = _ => true, + componentDefinitionExtractionMode = FinalDefinition ) } val deploymentManagerDependencies = DeploymentManagerDependencies(