Merge branch 'maintenance/mps20241' into merge/mps20232

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

.gitignore

@@ -45,6 +45,7 @@ classes_gen
 source_gen
 source_gen.caches
 test_gen
+doc_gen
 test_gen.caches
 code/languages/*/*.iws
 code/languages/*/build.properties

CHANGELOG.md

@@ -5,10 +5,36 @@ All notable changes to this project are documented in this file.
 Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
 
+## June 2025
+
+### Added
+
+- Added languages and solution for basic variability, moved from IETS3-Core project. The following modules were added:
+  - variability: `org.iets3.variability.*` (6 languages, 2 solutions)
+  - variability devkit: `org.iets3.variability.base.devkit`
+  - analysis support: `org.iets3.analysis.logic.operator`, `org.iets3.analysis.solversupport.util`
+  - contextfilter for UI: `org.iets3.contextfilter`, `org.iets3.contextfilter.plugin`
+
+### Changed
+
+- Published SBOM contains dependencies only from runtime configurations
+- To avoid confusion, `U+03BC μ GREEK SMALL LETTER MU` is no longer recognized as the 'micro' unit prefix, only
+  `U+00B5 µ MICRO SIGN` is. Although technically considered 'legacy', the micro sign is the character produced by macOS
+  and Windows keyboard layouts when pressing `AltGr/Option+M`.
+
+  An [enhancement script](http://127.0.0.1:63320/node?ref=r%3A531014dc-62ca-45fa-b1c2-cf992369440b%28org.iets3.core.expr.typetags.physunits.scripts%29%2F6252521573649140294)
+  is provided to replace 'mu' with 'micro sign'.
+
 ## May 2025
 
+### Changed
+
+- The language org.iets3.variability.artifacts.base was temporarily renamed to org.iets3.variability.artifacts.vanguard.
+
 ### 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.