diff --git a/.github/dependabot.yml b/.github/dependabot.yml
deleted file mode 100644
index bafc22b164..0000000000
--- a/.github/dependabot.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: 2
-updates:
- - package-ecosystem: gradle
- directory: /
- schedule:
- interval: weekly
- registries: "*"
-
-registries:
- itemis:
- type: maven-repository
- url: https://artifacts.itemis.cloud/repository/maven-mps
diff --git a/.github/renovate.json5 b/.github/renovate.json5
new file mode 100644
index 0000000000..a111e90275
--- /dev/null
+++ b/.github/renovate.json5
@@ -0,0 +1,18 @@
+{
+ "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+ "extends": [
+ "config:best-practices"
+ ],
+
+ "packageRules": [
+ {
+ "matchPackageNames": ["download-jbr:download-jbr.gradle.plugin", "de.itemis.mps.gradle.common:de.itemis.mps.gradle.common.gradle.plugin"],
+ "groupName": "mps-gradle-plugin",
+ "allowedVersions": "< 2.0"
+ },
+ {
+ "matchPackageNames": ["org.eclipse*"],
+ "groupName": "eclipse"
+ },
+ ]
+}
diff --git a/.github/workflows/vulnerability-scanning.yml b/.github/workflows/vulnerability-scanning.yml
new file mode 100644
index 0000000000..51f8eadd03
--- /dev/null
+++ b/.github/workflows/vulnerability-scanning.yml
@@ -0,0 +1,35 @@
+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@8df1039502a15bceb9433410b1a100fbe190c53b # v4
+ with:
+ distribution: temurin
+ java-version: 17
+ - name: Setup Gradle
+ uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4
+ - name: Call setup
+ run: ./gradlew dependencies
+ - name: Depcheck
+ 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: 'MPS-extensions'
+ format: 'HTML'
+ out: 'reports'
+ args: >
+ --exclude ${{github.workspace}}/build/mps/**
+ - name: Upload Test results
+ uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
+ with:
+ name: Depcheck report
+ path: ${{github.workspace}}/reports
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7f965c460..5afff955d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,17 @@ All notable changes to this project are documented in this file.
The format 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.
+## November 2024
+
+### Changed
+
+- The project was migrated to 2024.1.
+
+### Removed
+
+- *de.itemis.mps.nativelibs* : This unmaintained language was removed.
+- *de.itemis.mps.hacks.xmodelgen* : This unmaintained (and broken) language was removed.
+
## October 2024
### Added
diff --git a/README.md b/README.md
index d9cc971408..75eca50290 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# MPS Extensions
/statusIcon)
-
+
[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
@@ -17,7 +17,9 @@ To use MPS Extensions in your project, add one of the following dependencies to
| MPS version | nexus status |
| --------------- | --------------- |
-| 2023.2 | [](https://artifacts.itemis.cloud/#browse/browse:maven-mps:de%2Fitemis%2Fmps%2Fextensions) |
+| Master | [](https://artifacts.itemis.cloud/#browse/browse:maven-mps:de%2Fitemis%2Fmps%2Fextensions) |
+| 2024.1 | [,'2024.1')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:de%2Fitemis%2Fmps%2Fextensions) |
+| 2023.2 | [,'2023.2')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:de%2Fitemis%2Fmps%2Fextensions) |
| 2022.3 | [,'2022.3')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:de%2Fitemis%2Fmps%2Fextensions) |
| 2022.2 | [,'2022.2')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:de%2Fitemis%2Fmps%2Fextensions) |
| 2021.3 | [,'2021.3')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:de%2Fitemis%2Fmps%2Fextensions) |
diff --git a/build.gradle b/build.gradle
index 9ad5ce53bd..c06c5524de 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ plugins {
id "com.github.breadmoirai.github-release" version "2.5.2"
id 'maven-publish'
id 'base'
- id 'de.itemis.mps.gradle.launcher' version '2.4.2.+'
+ id 'de.itemis.mps.gradle.launcher' version '2.5.2.+'
}
import de.itemis.mps.gradle.*
@@ -17,7 +17,7 @@ import java.time.LocalDateTime
apply plugin: 'download-jbr'
downloadJbr {
- jbrVersion = '17.0.8.1-b1000.32'
+ jbrVersion = '21.0.5-b631.8'
}
// detect if we are in a CI build
@@ -42,9 +42,9 @@ logger.info 'Repository username: {}', project.nexusUsername
// Dependency versions
// major version, e.g. '2021.1', '2021.2'
-ext.mpsMajor = '2023.2'
+ext.mpsMajor = '9999.9'
// optional minor/bugfix number (not added to the final build version)
-ext.mpsMinor = '1'
+ext.mpsMinor = ''
// e.g. Beta, EAP, RC
ext.mpsReleaseType = ''
@@ -60,8 +60,7 @@ if (ciBuild) {
if (branch.matches(/(maintenance|mps)[\/-](mps)?\d+(\.\d+)*/)) {
version = "$buildMajor.$buildMinor.$buildNumber.${GitBasedVersioning.gitShortCommitHash}"
} else {
- def isSnapshot = !(branch.equals("master"))
- version = GitBasedVersioning.getVersionWithCount(buildMajor, buildMinor, buildNumber) + (isSnapshot ? "-SNAPSHOT" : "")
+ version = GitBasedVersioning.getVersionWithCount(buildMajor, buildMinor, buildNumber) + "-SNAPSHOT"
}
println "##teamcity[buildNumber '${version}']"
@@ -94,7 +93,9 @@ configurations {
}
dependencies {
- mps "com.jetbrains:mps:$mpsVersion"
+ // For published releases adjust ext.mpsMajor and ext.mpsMinor above and use this dependency:
+ // mps "com.jetbrains:mps:$mpsVersion"
+ mps "com.jetbrains.mps:mps-prerelease:243.21565.10033"
}
repositories {
@@ -170,15 +171,18 @@ configurations {
exclude(group: 'com.google.guava')
attributes.attribute(Attribute.of('org.gradle.jvm.environment', String), 'standard-jvm')
}
+ xml_lib {
+ exclude(group: 'system')
+ exclude(module: 'xml-apis')
+ }
batik {
- exclude(group: 'xml-apis')
exclude(group: 'commons-io')
exclude(group: 'commons-logging')
}
}
dependencies {
- ant_lib "org.apache.ant:ant-junit:1.10.14"
+ ant_lib "org.apache.ant:ant-junit:1.10.15"
def elkVersion = "0.9.1"
diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.common:$elkVersion")
@@ -192,12 +196,14 @@ dependencies {
diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.topdownpacking:$elkVersion")
diagram_lib ("org.eclipse.elk:org.eclipse.elk.core:$elkVersion")
diagram_lib ("org.eclipse.elk:org.eclipse.elk.graph:$elkVersion")
- diagram_lib ("org.eclipse.emf:org.eclipse.emf.common:2.30.0")
- diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore:2.36.0")
- diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.37.0")
+ diagram_lib ("org.eclipse.emf:org.eclipse.emf.common:2.40.0")
+ diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore:2.38.0")
+ diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.38.0")
+
+ xml_lib("xerces:xercesImpl:2.12.2")
+ xml_lib("xml-apis:xml-apis-ext:1.3.04")
- batik ("org.apache.xmlgraphics:batik-svggen:1.17")
- batik ("org.apache.xmlgraphics:batik-dom:1.17")
+ batik ("org.apache.xmlgraphics:batik-all:1.18")
}
@@ -225,19 +231,6 @@ def defaultScriptArgs = [mps_home, build_dir, artifacts_dir, ext.buildDate, ext.
afterEvaluate {
project.ext["itemis.mps.gradle.ant.defaultJavaExecutable"] = tasks.getByName('downloadJbr').javaExecutable
- def jdk_home = null
- if (ext.has('java17_home')) {
- jdk_home = ext.get('java17_home')
- } else if (System.getenv('JB_JAVA17_HOME') != null) {
- jdk_home = System.getenv('JB_JAVA17_HOME')
- }
- if(jdk_home != null) {
- if (!new File(jdk_home, "lib").exists()) {
- throw new GradleException("Unable to locate JDK home folder. Detected folder is: $jdk_home")
- } else {
- ext["itemis.mps.gradle.ant.defaultJavaExecutable"] = new File(jdk_home, 'bin/java')
- }
- }
}
// enables https://github.com/mbeddr/mps-gradle-plugin#providing-global-defaults
@@ -278,8 +271,25 @@ task resolved_batik_dependencies(type: Sync) {
}
}
+task resolved_xml_dependencies(type: Sync) {
+ from configurations.xml_lib
+ into file('code/xml/solutions/lib')
+
+ // Strip version numbers from file names
+ rename { filename ->
+ def ra = configurations.xml_lib.resolvedConfiguration.resolvedArtifacts.find { ResolvedArtifact ra -> ra.file.name == filename }
+ String finalName
+ if (ra.classifier != null) {
+ finalName = "${ra.name}-${ra.classifier}.${ra.extension}"
+ } else {
+ finalName = "${ra.name}.${ra.extension}"
+ }
+ return finalName
+ }
+}
+
tasks.register('build_allScripts', BuildLanguages) {
- dependsOn 'downloadJbr', resolveMps, copyModelApi, resolved_diagram_dependencies, resolved_batik_dependencies
+ dependsOn 'downloadJbr', resolveMps, copyModelApi, resolved_diagram_dependencies, resolved_batik_dependencies, resolved_xml_dependencies
script "$rootDir/scripts/build.xml"
}
@@ -365,10 +375,10 @@ configurations {
}
dependencies {
junitAnt 'junit:junit:4.13.2'
- junitAnt('org.apache.ant:ant-junit:1.10.14') {
+ junitAnt('org.apache.ant:ant-junit:1.10.15') {
transitive = false
}
- junitAnt('org.apache.ant:ant-junit4:1.10.14') {
+ junitAnt('org.apache.ant:ant-junit4:1.10.15') {
transitive = false
}
}
@@ -526,6 +536,7 @@ def usedPluginRoots = [
new File(mpsHomeDir, 'plugins/mps-vcs'),
new File(mpsHomeDir, 'plugins/mps-git4idea'),
new File(mpsHomeDir, 'plugins/mps-httpsupport'),
+ new File(mpsHomeDir, 'plugins/mps-testing'),
new File(mpsHomeDir, 'plugins/mps-spellcheck')
]
diff --git a/code/.mps/migration.xml b/code/.mps/migration.xml
index a2e96ad573..3fa862a78a 100644
--- a/code/.mps/migration.xml
+++ b/code/.mps/migration.xml
@@ -12,6 +12,7 @@
-
+
+
\ No newline at end of file
diff --git a/code/.mps/modules.xml b/code/.mps/modules.xml
index e1bde166de..ab685df487 100644
--- a/code/.mps/modules.xml
+++ b/code/.mps/modules.xml
@@ -57,10 +57,7 @@
-
-
-
@@ -80,6 +77,7 @@
+
@@ -203,7 +201,6 @@
-
@@ -231,6 +228,7 @@
+
-
\ No newline at end of file
+
diff --git a/code/batik/solutions/de.itemis.stubs.batik.msd b/code/batik/solutions/de.itemis.stubs.batik.msd
index 61ae94e318..abaea64c86 100644
--- a/code/batik/solutions/de.itemis.stubs.batik.msd
+++ b/code/batik/solutions/de.itemis.stubs.batik.msd
@@ -1,38 +1,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)
+ 124d077c-270f-42ca-8bf8-bee488dc96dc(de.itemis.stubs.xml)
@@ -43,6 +26,7 @@
+
diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil.genutil/com.mbeddr.mpsutil.blutil.genutil.mpl b/code/blutil/languages/com.mbeddr.mpsutil.blutil.genutil/com.mbeddr.mpsutil.blutil.genutil.mpl
index 4a14896c46..35579ed785 100644
--- a/code/blutil/languages/com.mbeddr.mpsutil.blutil.genutil/com.mbeddr.mpsutil.blutil.genutil.mpl
+++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil.genutil/com.mbeddr.mpsutil.blutil.genutil.mpl
@@ -115,7 +115,7 @@
-
+
diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil.genutil/models/structure.mps b/code/blutil/languages/com.mbeddr.mpsutil.blutil.genutil/models/structure.mps
index 2f7017a37d..5bccb1da36 100644
--- a/code/blutil/languages/com.mbeddr.mpsutil.blutil.genutil/models/structure.mps
+++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil.genutil/models/structure.mps
@@ -2,7 +2,7 @@
-
+
diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl b/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl
index d83d3303db..2b59bcd223 100644
--- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl
+++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl
@@ -174,7 +174,7 @@
-
+
@@ -197,7 +197,6 @@
-
diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/generator/template/main@generator.mps b/code/blutil/languages/com.mbeddr.mpsutil.blutil/generator/template/main@generator.mps
index acffe31523..a19064414a 100644
--- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/generator/template/main@generator.mps
+++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/generator/template/main@generator.mps
@@ -7586,14 +7586,19 @@
-
-
-
+
+
+
-
-
-
-