Merge branch 'maintenance/mps20241' into merge/manual20232

# Conflicts:
#	code/languages/org.iets3.opensource/tests/test.ts.expr.os/test.ts.expr.os.msd

Author: arimer

.github/renovate.json5

@@ -0,0 +1,42 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ],
+  "packageRules": [
+    // Rules are evaluated top to bottom, all matching rules are applied
+
+    {
+      "matchPackageNames": [
+        "com.jetbrains:mps",
+        "org.mpsqa:all-in-one",
+        "com.mbeddr:platform"
+      ],
+
+      // Update patch versions (2024.1.x -> 2024.1.y) separately from minor.
+      "separateMinorPatch": true,
+
+      // Commit hashes containing 'a' or 'b' are interpreted by Gradle/Renovate as 'alpha' or 'beta' versions,
+      // and Renovate would normally refuse to update to them. In our case they are stable versions.
+      "ignoreUnstable": false
+    },
+
+    {
+      // Disable major and minor updates of MPS libraries and MPS (e.g. 2024.1 -> 2024.3). Leave patch updates enabled
+      // thanks to the previous rule.
+      "matchPackageNames": [
+        "com.jetbrains:mps",
+        "org.mpsqa:all-in-one",
+        "com.mbeddr:platform"
+      ],
+      "matchUpdateTypes": ["major", "minor"],
+      "enabled": false
+    },
+
+    // Disallow mps-gradle-plugin v2
+    {
+      "matchPackageNames": ["de.itemis.mps:mps-gradle-plugin"],
+      "allowedVersions": "!/^2\\./"
+    }
+  ],
+}

.github/workflows/vulnerability-scanning.yml

@@ -0,0 +1,33 @@
+on: [pull_request]
+
+jobs:
+  depchecktest:
+    runs-on: ubuntu-latest
+    name: depecheck_test
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - name: Setup Java
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
+        with:
+          distribution: temurin
+          java-version: 17
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4
+      - name: Call setup
+        run: ./gradlew dependencies
+      - name: Dependency Check
+        uses: dependency-check/Dependency-Check_Action@3102a65fd5f36d0000297576acc56a475b0de98d
+        env:
+          # actions/setup-java changes JAVA_HOME, so it needs to be reset to match the depcheck image
+          JAVA_HOME: /opt/jdk
+        id: Depcheck
+        with:
+          project: 'iets3.opensource'
+          format: 'HTML'
+          out: 'reports'
+      - name: Upload Test results
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+           name: Dependency Check Report
+           path: ${{github.workspace}}/reports

CHANGELOG.md

@@ -9,6 +9,8 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 
 ### Fixed
 
+- Plugin org.iets3.safety was renamed to org.iets3.safety.os fixing the name collision with a plugin in org.iets3.core 
+
 - A NullPointerException was fixed for cases where a node implementing IValidNamedConcept had no name.
 - When calculating the supertype of number types, the precision is now correctly set to infinite when one of the types has an infinite precision.
 - The primitiveTypeMapper extension supports a new method `PrimitiveTypeMapper#useStringConstraints` that can be set to false to disable string types with constraints and go back to regular string types.

README.md

@@ -8,13 +8,6 @@ import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
 
-//will pull the groovy classes/types from nexus to the classpath
-buildscript {
-    repositories {
-        maven { url 'https://artifacts.itemis.cloud/repository/maven-mps/' }
-    }
-}
-
 plugins {
     id 'base'
     id 'maven-publish'
@@ -24,26 +17,19 @@ plugins {
     id "org.cyclonedx.bom" version "2.2.0"
 }
 
-ext.dependencyRepositories = [
-    'https://artifacts.itemis.cloud/repository/maven-mps/'
-]
-
 repositories {
-    // we don't use mavenLocal() repo, since it can cause various issues with resolving dependencies,
-    // see https://docs.gradle.org/current/userguide/declaring_repositories.html#sec:case-for-maven-local
-    for (repoUrl in project.dependencyRepositories) {
-        maven {
-            url repoUrl
-        }
+    maven {
+        url 'https://artifacts.itemis.cloud/repository/maven-mps/'
     }
+
     mavenCentral()
 }
 
 apply plugin: 'download-jbr'
 
 // configure jbr download version
 downloadJbr {
-    jbrVersion = '17.0.8.1-b1000.32'
+    jbrVersion = '17.0.11-b1207.30'
 }
 
 // detect if we are in a CI build
@@ -56,14 +42,13 @@ if (project.hasProperty("forceCI")) {
 
 def forceLocal = project.hasProperty("forceLocalDependencies")
 
-def major = "2023"
-def minor = "2"
+def major = "2024"
+def minor = "1"
 
 // Dependency versions
 
-ext.mpsVersion = '2023.2.2'
+ext.mpsVersion = '2024.1.3'
 
-def mbeddrVersion = "$major.$minor+"
 def mpsQAVersion = "$major.$minor+"
 
 // if building a against a special branch from mbeddr is required add the name here
@@ -72,11 +57,12 @@ def mpsQAVersion = "$major.$minor+"
 def mbeddrBranch = ""
 def currentBranch = ""
 
-
-if (mbeddrBranch != null && !mbeddrBranch.trim().isEmpty()) {
-    ext.mbeddrVersionSelector = "${mbeddrBranch.replace("/", "-")}.${mbeddrVersion}"
-} else {
-    ext.mbeddrVersionSelector = mbeddrVersion
+if (!project.hasProperty('mbeddrVersion')) {
+    if (mbeddrBranch != null && !mbeddrBranch.trim().isEmpty()) {
+        ext.mbeddrVersion = "${mbeddrBranch.replace("/", "-")}.$major.$minor+"
+    } else {
+        ext.mbeddrVersion = "$major.$minor+"
+    }
 }
 
 // Project group
@@ -98,19 +84,14 @@ if (project.hasProperty('iets3OpenSourceVersion')) {
         } else {
             def isSnapshot = !(currentBranch.equals("master") || currentBranch.startsWith("datev-loon-staging-") || currentBranch.startsWith("datev-steuer-staging-"))
             version = GitBasedVersioning.getVersionWithCount(major, minor, buildNumber) + (isSnapshot ? "-SNAPSHOT" : "")
-        } 
+        }
         println "##teamcity[buildNumber '${version}']"
     } else {
         version = "$major.$minor-SNAPSHOT"
         println "Local build detected, version will be $version"
     }
 }
 
-if (project.hasProperty("mbeddrVersion")) {
-    logger.log(LogLevel.WARN, "mbeddr version externally overwritten to $ext.mbeddrVersion")
-    ext.mbeddrVersionSelector = ext.mbeddrVersion
-}
-
 ext.releaseRepository = 'https://artifacts.itemis.cloud/repository/maven-mps-releases/'
 ext.snapshotRepository = 'https://artifacts.itemis.cloud/repository/maven-mps-snapshots'
 ext.publishingRepository = version.toString().endsWith("-SNAPSHOT") ? snapshotRepository : releaseRepository
@@ -138,10 +119,10 @@ configurations {
 
 dependencies {
     mps "com.jetbrains:mps:$mpsVersion"
-    rerunMigrationsBackend("de.itemis.mps.build-backends:remigrate:0.0.5.+")
+    rerunMigrationsBackend("de.itemis.mps.build-backends:remigrate:0.2.0.+")
     languageLibs "org.mpsqa:all-in-one:$mpsQAVersion"
-    languageLibs "com.mbeddr:platform:$mbeddrVersionSelector"
-    junitAnt 'org.apache.ant:ant-junit:1.10.6'
+    languageLibs "com.mbeddr:platform:$mbeddrVersion"
+    junitAnt 'org.apache.ant:ant-junit:1.10.15'
 }
 
 @TupleConstructor
@@ -165,9 +146,9 @@ class BundledDep {
 }
 
 def bundledDeps = [
-        new BundledDep('pcollections', ['org.pcollections:pcollections:4.0.1'], 'org.iets3.core.expr.base.collections.stubs'),
+        new BundledDep('pcollections', ['org.pcollections:pcollections:4.0.2'], 'org.iets3.core.expr.base.collections.stubs'),
         new BundledDep('bigMath', ['ch.obermuhlner:big-math:2.3.2'], 'org.iets3.core.expr.math.interpreter'),
-        new BundledDep('functionalJava', ['org.functionaljava:functionaljava:4.8.1'], 'org.iets3.core.expr.genjava.functionalJava'),
+        new BundledDep('functionalJava', ['org.functionaljava:functionaljava:5.0'], 'org.iets3.core.expr.genjava.functionalJava'),
         new BundledDep('cpsSuite', ['io.takari.junit:takari-cpsuite:1.2.7'], 'org.iets3.opensource.build.gentests.rt').overrideArtifactName('takari-cpsuite.jar')
 ]
 
@@ -225,6 +206,7 @@ ext.mpsHomeDir = resolveMps.destinationDir
 def defaultScriptArgs = [
         'mps.home'                          : resolveMps.destinationDir,
         'iets3.github.opensource.home'      : rootDir,
+        'mps.test.project.path'             : "${rootDir}/code/languages/org.iets3.opensource",
         'build.jna.library.path'            : new File(resolveMps.destinationDir, "lib/jna/${System.getProperty('os.arch')}"),
         'build.dir'                         : buildDir,
         'version'                           : version
@@ -286,7 +268,7 @@ task buildAndRunTests(type: TestLanguages, dependsOn: buildLanguages) {
 task failOnTestError() {
     description 'evaluate junit result and fail on error'
     doLast {
-        
+
         def juniXml = file('TESTS-TestSuites.xml')
         if(juniXml.exists()){
             def junitResult = new XmlSlurper().parse(juniXml)
@@ -355,13 +337,15 @@ modelcheck {
     maxHeap = "4G"
 }
 
-/*
+
 afterEvaluate {  project ->
+    /*
     check.configure {
         dependsOn tasks.named('checkmodels')
     }
+    */
 }
-*/
+
 
 checkmodels {
     dependsOn(resolveMps)