Merge branch 'main' into fix/bulk-sync-large-modules

Author: mhuster23

.github/CODEOWNERS

@@ -3,6 +3,7 @@
 /bulk-model-sync-gradle/ @mhuster23
 /bulk-model-sync-gradle-test/ @mhuster23
 /bulk-model-sync-lib/ @mhuster23
+/bulk-model-sync-mps/ @mhuster23
 /bulk-model-sync-solution/ @mhuster23
 /light-model-client/ @slisson
 /metamodel-export/ @slisson

.github/workflows/mps-compatibility.yaml

@@ -33,4 +33,10 @@ jobs:
       - name: Set up Gradle
         uses: gradle/gradle-build-action@v2
       - name: Build with ${{ matrix.version }}
-        run: ./gradlew --build-cache :mps-model-adapters:build :mps-model-server-plugin:build -Pmps.version=${{ matrix.version }}
+        run: >-
+          ./gradlew --build-cache
+          :bulk-model-sync-mps:build
+          :metamodel-export:build
+          :mps-model-adapters:build
+          :mps-model-server-plugin:build
+          -Pmps.version=${{ matrix.version }}

commitlint.config.js

@@ -8,6 +8,7 @@ module.exports = {
         "bulk-model-sync",
         "bulk-model-sync-gradle",
         "bulk-model-sync-lib",
+        "bulk-model-sync-mps",
         "deps",
         "light-model-client",
         "model-server-lib",
@@ -26,6 +27,8 @@ module.exports = {
         "vue-model-api",
       ],
     ],
-    "subject-case": [0, 'never']
+    "subject-case": [0, 'never'],
+    // No need to restrict the body line length. That only gives issues with URLs etc.
+    "body-max-line-length": [0, 'always']
   },
 };

docs/global/modules/core/pages/reference/component-bulk-model-sync-gradle.adoc

@@ -171,3 +171,8 @@ modelSync {
 --
 
 Generated Gradle task to perform synchronization: `runSyncPushToMyServer`.
+
+== Logging
+
+The plugin uses the normal Gradle logging.
+In case progress or debug information is required, run Gradle with `--info` or `--debug` command line arguments.

gradle/libs.versions.toml

@@ -12,7 +12,7 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 gitVersion = { id = "com.palantir.git-version", version = "3.0.0" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "11.6.1" }
-spotless = { id = "com.diffplug.spotless", version = "6.23.0" }
+spotless = { id = "com.diffplug.spotless", version = "6.23.3" }
 tasktree = { id = "com.dorongold.task-tree", version = "2.1.1" }
 modelix-mps-buildtools = { id = "org.modelix.mps.build-tools", version.ref = "modelixBuildtools" }
 dokka = {id = "org.jetbrains.dokka", version = "1.9.10"}
@@ -23,9 +23,9 @@ npm-publish = { id = "dev.petuska.npm.publish", version = "3.4.1" }
 [versions]
 kotlin = "1.9.21"
 kotlinCoroutines="1.7.3"
-ktor="2.3.6"
+ktor="2.3.7"
 kotlinHtml="0.8.0"
-kotlinSerialization="1.6.1"
+kotlinSerialization="1.6.2"
 ignite="2.15.0"
 apacheCxf="3.6.2"
 node="18.17.1"
@@ -39,7 +39,7 @@ kotlin-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-s
 kotlin-serialization-yaml = { group = "com.charleskorn.kaml", name = "kaml", version = "0.55.0" }
 kotlin-logging = { group = "io.github.microutils", name = "kotlin-logging", version = "3.0.5" }
 kotlin-collections-immutable = { group = "org.jetbrains.kotlinx", name = "kotlinx-collections-immutable", version = "0.3.6" }
-kotlin-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version = "0.4.1" }
+kotlin-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version = "0.5.0" }
 
 kotlin-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinCoroutines" }
 kotlin-coroutines-swing = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-swing", version.ref = "kotlinCoroutines" }
@@ -68,13 +68,13 @@ ktor-client-auth = { group = "io.ktor", name = "ktor-client-auth", version.ref =
 
 ktor-serialization-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
 
-keycloak-authz-client = { group = "org.keycloak", name = "keycloak-authz-client", version = "23.0.0" }
+keycloak-authz-client = { group = "org.keycloak", name = "keycloak-authz-client", version = "23.0.1" }
 guava = { group = "com.google.guava", name = "guava", version = "32.1.3-jre" }
 modelix-incremental = { group = "org.modelix", name = "incremental", version = "0.2.0" }
-kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version = "1.15.1" }
+kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version = "1.15.3" }
 vavr = { group = "io.vavr", name = "vavr", version = "0.10.4" }
 apache-commons-lang = { group = "org.apache.commons", name = "commons-lang3", version = "3.14.0" }
-apache-commons-io = { group = "commons-io", name = "commons-io", version = "2.15.0" }
+apache-commons-io = { group = "commons-io", name = "commons-io", version = "2.15.1" }
 apache-commons-collections = { group = "org.apache.commons", name = "commons-collections4", version = "4.4" }
 trove = { group = "trove", name = "trove", version = "1.0.2"}
 trove4j = { group = "net.sf.trove4j", name = "trove4j", version = "3.0.3" }
@@ -83,8 +83,8 @@ ignite-core = { group = "org.apache.ignite", name = "ignite-core", version.ref =
 ignite-spring = { group = "org.apache.ignite", name = "ignite-spring", version.ref = "ignite" }
 ignite-indexing = { group = "org.apache.ignite", name = "ignite-indexing", version.ref = "ignite" }
 
-logback-classic = { group = "ch.qos.logback", name = "logback-classic", version = "1.4.11" }
-postgresql = { group = "org.postgresql", name = "postgresql", version = "42.7.0" }
+logback-classic = { group = "ch.qos.logback", name = "logback-classic", version = "1.4.14" }
+postgresql = { group = "org.postgresql", name = "postgresql", version = "42.7.1" }
 jcommander = { group = "com.beust", name = "jcommander", version = "1.82" }
 cucumber-java = { group = "io.cucumber", name = "cucumber-java", version = "7.14.1" }
 junit = { group = "junit", name = "junit", version = "4.13.2" }

metamodel-export/build.gradle.kts

@@ -7,6 +7,8 @@ plugins {
 
 group = "org.modelix.mps"
 
+val mpsVersion = project.findProperty("mps.version")?.toString().takeIf { !it.isNullOrBlank() } ?: "2021.1.4"
+
 val generatorLibs by configurations.creating
 
 dependencies {
@@ -32,7 +34,7 @@ val copyLibs by tasks.registering(Sync::class) {
 
 extensions.configure<MPSBuildSettings> {
     dependsOn(copyLibs)
-    mpsVersion("2021.1.4")
+    mpsVersion(mpsVersion)
     search(".")
     disableParentPublication()
 

mps-model-server-plugin/build.gradle.kts

@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("org.jetbrains.kotlin.jvm")
-    id("org.jetbrains.intellij") version "1.16.0"
+    id("org.jetbrains.intellij") version "1.16.1"
 }
 
 val mpsToIdeaMap = mapOf(