Merge pull request #68 from modelix/modelixCore-5.0.0

bump modelixCore from 4.11.5 to 5.0.0
modelix · Mar 18, 2024 · 8d8f279 · 8d8f279
2 parents 515789b + 1d9fca2
commit 8d8f279
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ modelix-model-api-gen = { id = "org.modelix.model-api-gen", version.ref = "model
 npm-publish = { id = "dev.petuska.npm.publish", version = "3.4.2" }
 
 [versions]
-modelixCore = "4.11.5"
+modelixCore = "5.0.0"
 
 [libraries]
 modelix-model-api = { group = "org.modelix", name = "model-api", version.ref = "modelixCore" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/mps-legacy-sync-plugin/src/test/kotlin/SyncPluginTestBase.kt b/mps-legacy-sync-plugin/src/test/kotlin/SyncPluginTestBase.kt
@@ -286,7 +286,7 @@ private fun NodeData.normalize(): NodeData {
 
 private fun normalizeNodeData(node: NodeData, originalIds: MutableMap<String, String>): NodeData {
     var filteredChildren = node.children
-    var filteredProperties = node.properties.minus(NodeData.ID_PROPERTY_KEY).minus("\$originalId")
+    var filteredProperties = node.properties.minus(NodeData.ID_PROPERTY_KEY).minus("\$originalId").minus("#mpsNodeId#")
     var replacedId = (originalIds[node.id] ?: node.id)
     var replacedRole = node.role
     when (node.concept) {