Skip to content

Commit a2858d7

Browse files
arimerarimer
authored
Merge branch 'master' into merge/mps20251
2 parents e01260a + 1215635 commit a2858d7

File tree

12 files changed

+131
-124
lines changed

12 files changed

+131
-124
lines changed

‎.github/workflows/vulnerability-scanning.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ jobs:
66
name: depecheck_test
77
steps:
88
- name: Checkout
9-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
9+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
1010
- name: Setup Java
11-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
11+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5
1212
with:
1313
distribution: temurin
1414
java-version: 17
1515
- name: Setup Gradle
16-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4
16+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4
1717
- name: Call setup
1818
run: ./gradlew dependencies
1919
- name: Dependency Check
20-
uses: dependency-check/Dependency-Check_Action@3102a65fd5f36d0000297576acc56a475b0de98d
20+
uses: dependency-check/Dependency-Check_Action@2ba636726705b0f74f126ebeaacaf2ad4600b967
2121
env:
2222
# actions/setup-java changes JAVA_HOME, so it needs to be reset to match the depcheck image
2323
JAVA_HOME: /opt/jdk

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1212

1313
- Variability: In the configuration editor, pressing Return/Enter anywhere will create an empty line after the configuration. Pressing Shift-Return/Enter on the header line of a configuration will create an empty line before the configuration.
1414

15+
### Removed
16+
- To enable github release the usage of `listMergedPRs` script is removed for the time beeing.
17+
1518

1619
## July 2025
1720

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ For details, see the [wiki](https://github.com/IETS3/iets3.opensource/wiki/Suppo
2626
| MPS version | Nexus | branch |
2727
| --------------- | --------------- | --------------- |
2828
| Master | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/org/iets3/opensource/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/latest)](https://artifacts.itemis.cloud/#browse/browse:maven-mps:org%2Fiets3%2Fopensource) | [master](https://github.com/IETS3/iets3.opensource/tree/master) |
29+
| 2025.1 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/org/iets3/opensource/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2025.1')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:org%2Fiets3%2Fopensource) | [maintenance/mps20251](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20251) | [maintenance/mps20251](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20251) |
2930
| 2024.1 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/org/iets3/opensource/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2024.1')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:org%2Fiets3%2Fopensource) | [maintenance/mps20241](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20241) | [maintenance/mps20241](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20241) |
3031
| 2023.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/org/iets3/opensource/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2023.2')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:org%2Fiets3%2Fopensource) | [maintenance/mps20232](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20232) | [maintenance/mps20232](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20232) |
3132
| 2022.3 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/org/iets3/opensource/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2022.3')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:org%2Fiets3%2Fopensource) | [maintenance/mps20223](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20223) | [maintenance/mps20223](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20223) |

‎build.gradle‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ plugins {
1111
id 'base'
1212
id 'maven-publish'
1313
id 'de.itemis.mps.gradle.common' version '1.29.+'
14-
id 'de.itemis.mps.gradle.launcher' version '2.5.2.+'
15-
id "com.github.breadmoirai.github-release" version "2.4.1"
16-
id "org.cyclonedx.bom" version "2.2.0"
14+
id "com.github.breadmoirai.github-release" version "2.5.2"
15+
id 'de.itemis.mps.gradle.launcher' version '2.7.0.+'
16+
id "org.cyclonedx.bom" version "2.3.1"
1717
}
1818

1919
repositories {
@@ -41,16 +41,17 @@ if (project.hasProperty("forceCI")) {
4141

4242
def forceLocal = project.hasProperty("forceLocalDependencies")
4343

44-
def major = '2025'
45-
def minor = '1'
46-
def bugfix = ''
44+
def major = "9999"
45+
def minor = "9"
4746

4847
// Dependency versions
4948

50-
ext.mpsVersion = "$major.$minor" + (bugfix ? ".$bugfix" : '')
5149

50+
51+
ext.mpsVersion = "252.18003.155"
5252
def mpsQAVersion = "$major.$minor+"
5353

54+
5455
// if building a against a special branch from mbeddr is required add the name here
5556
// the name is enough no trailing "." is required, also the plain name from git can
5657
// be used here. No need to convert "/" the script will take care of that.
@@ -118,8 +119,10 @@ configurations {
118119
}
119120

120121
dependencies {
121-
mps "com.jetbrains:mps:$mpsVersion"
122-
rerunMigrationsBackend("de.itemis.mps.build-backends:remigrate:0.2.0.+")
122+
// For a release version of MPS, use this dependency:
123+
//mps "com.jetbrains:mps:$mpsBuild"
124+
mps "com.jetbrains.mps:mps-prerelease:$mpsVersion"
125+
rerunMigrationsBackend("de.itemis.mps.build-backends:remigrate:0.3.0.+")
123126
languageLibs "org.mpsqa:all-in-one:$mpsQAVersion"
124127
languageLibs "com.mbeddr:platform:$mbeddrVersion"
125128
junitAnt 'org.apache.ant:ant-junit:1.10.15'
@@ -146,7 +149,7 @@ class BundledDep {
146149
}
147150

148151
def bundledDeps = [
149-
new BundledDep('pcollections', ['org.pcollections:pcollections:4.0.2'], 'org.iets3.core.expr.base.collections.stubs'),
152+
new BundledDep('pcollections', ['org.pcollections:pcollections:5.0.0'], 'org.iets3.core.expr.base.collections.stubs'),
150153
new BundledDep('bigMath', ['ch.obermuhlner:big-math:2.3.2'], 'org.iets3.core.expr.math.interpreter'),
151154
new BundledDep('functionalJava', ['org.functionaljava:functionaljava:5.0'], 'org.iets3.core.expr.genjava.functionalJava'),
152155
new BundledDep('cpsSuite', ['io.takari.junit:takari-cpsuite:1.2.7'], 'org.iets3.opensource.build.gentests.rt').overrideArtifactName('takari-cpsuite.jar')
@@ -539,7 +542,7 @@ defaultTasks 'buildLanguages'
539542
} */
540543

541544
def currentDate = LocalDate.now().format(DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL))
542-
// def prCommitsList = "${-> listMergedPRs().readLines().collect { line -> "- $line"}.join("\n")}"
545+
//def prCommitsList = "${-> listMergedPRs().readLines().collect { line -> "- $line"}.join("\n")}"
543546
def langLibDeps = project.configurations.languageLibs.resolvedConfiguration.lenientConfiguration.allModuleDependencies
544547
def depsList = langLibDeps.collect {"- `${it.moduleGroup}:${it.moduleName}` : `${it.moduleVersion}`"}.join("\n")
545548
def releaseNotes = """Automated Nighly build from ${currentDate}.

‎code/languages/org.iets3.opensource/.mps/migration.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
<entry key="jetbrains.mps.ide.mpsmigration.v_2024_3.LangResourceImport4Migration" value="executed" />
2626
<entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
2727
<entry key="jetbrains.mps.v8_elimination" value="executed" />
28-
<entry key="project.migrated.version" value="251" />
28+
<entry key="project.migrated.version" value="252" />
2929
</component>
3030
</project>

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.junit.interpreter.run.configuration/models/xml4JUnit.mps‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
</languages>
1313
<imports>
1414
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
15-
<import index="eaz0" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:javax.xml.bind(MPS.ThirdParty/)" />
1615
<import index="h0j0" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.xml.namespace(JDK/)" />
17-
<import index="m3wx" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:javax.xml.bind.annotation(MPS.ThirdParty/)" />
1816
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
1917
<import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
2018
<import index="ni5j" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.regex(JDK/)" />
@@ -30,6 +28,8 @@
3028
<import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
3129
<import index="d6jk" ref="r:52c49891-65a1-45a5-a86b-4a7aa1e6c12e(org.iets3.core.junit.interpreter.run.configuration.plugin)" />
3230
<import index="av4b" ref="r:ba7faab6-2b80-43d5-8b95-0c440665312c(org.iets3.core.expr.tests.structure)" />
31+
<import index="eaz0" ref="72acac8d-4dd3-4bac-a8ea-ee97162c24e8/java:javax.xml.bind(JAXB/)" />
32+
<import index="m3wx" ref="72acac8d-4dd3-4bac-a8ea-ee97162c24e8/java:javax.xml.bind.annotation(JAXB/)" />
3333
</imports>
3434
<registry>
3535
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -1988,9 +1988,9 @@
19881988
<ref role="2AI5Lk" to="m3wx:~XmlAccessorType" resolve="XmlAccessorType" />
19891989
<node concept="2B6LJw" id="5ZZgOa8J67d" role="2B76xF">
19901990
<ref role="2B6OnR" to="m3wx:~XmlAccessorType.value()" resolve="value" />
1991-
<node concept="Rm8GO" id="5ZZgOa8J7LK" role="2B70Vg">
1992-
<ref role="1Px2BO" to="m3wx:~XmlAccessType" resolve="XmlAccessType" />
1991+
<node concept="Rm8GO" id="bwlmYfXKrh" role="2B70Vg">
19931992
<ref role="Rm8GQ" to="m3wx:~XmlAccessType.FIELD" resolve="FIELD" />
1993+
<ref role="1Px2BO" to="m3wx:~XmlAccessType" resolve="XmlAccessType" />
19941994
</node>
19951995
</node>
19961996
</node>

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.junit.interpreter.run.configuration/org.iets3.core.junit.interpreter.run.configuration.msd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
<dependency reexport="false">86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)</dependency>
2929
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
3030
<dependency reexport="false">33f214de-6dce-4396-83c7-640823b7c525(jetbrains.mps.baselanguage.unitTest.launcher)</dependency>
31-
<dependency reexport="false">39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)</dependency>
3231
<dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
3332
<dependency reexport="false">cbb71b24-470d-4374-b77c-ebd0d3b3bb27(org.iets3.core.expr.plugin)</dependency>
33+
<dependency reexport="false">72acac8d-4dd3-4bac-a8ea-ee97162c24e8(JAXB)</dependency>
3434
</dependencies>
3535
<languageVersions>
3636
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -58,6 +58,7 @@
5858
</languageVersions>
5959
<dependencyVersions>
6060
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
61+
<module reference="72acac8d-4dd3-4bac-a8ea-ee97162c24e8(JAXB)" version="0" />
6162
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
6263
<module reference="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" version="0" />
6364
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
@@ -66,7 +67,6 @@
6667
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
6768
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
6869
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
69-
<module reference="39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)" version="0" />
7070
<module reference="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" version="0" />
7171
<module reference="68e30703-3df8-4f84-a3eb-772b21d7fc85(TempModule68e30703-3df8-4f84-a3eb-772b21d7fc85)" version="0" />
7272
<module reference="97495013-dd3f-4cf4-b0d1-93daf53c9b77(TempModule97495013-dd3f-4cf4-b0d1-93daf53c9b77)" version="0" />

‎code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2942,16 +2942,16 @@
29422942
<ref role="3bR37D" node="3FexrMiSOe$" resolve="org.iets3.core.expr.plugin" />
29432943
</node>
29442944
</node>
2945-
<node concept="1SiIV0" id="62vWlLjQioO" role="3bR37C">
2946-
<node concept="3bR9La" id="62vWlLjQioP" role="1SiIV1">
2947-
<ref role="3bR37D" to="90a9:3$A0JaN5bpX" resolve="MPS.ThirdParty" />
2948-
</node>
2949-
</node>
29502945
<node concept="1SiIV0" id="62vWlLjQioQ" role="3bR37C">
29512946
<node concept="3bR9La" id="62vWlLjQioR" role="1SiIV1">
29522947
<ref role="3bR37D" to="90a9:PE3B26QCrP" resolve="org.apache.commons" />
29532948
</node>
29542949
</node>
2950+
<node concept="1SiIV0" id="bwlmYgn$D7" role="3bR37C">
2951+
<node concept="3bR9La" id="bwlmYgn$D8" role="1SiIV1">
2952+
<ref role="3bR37D" to="ffeo:6U$p2g0pj3R" resolve="JAXB" />
2953+
</node>
2954+
</node>
29552955
</node>
29562956
</node>
29572957
<node concept="2G$12M" id="5wLtKNeSWz5" role="3989C9">

‎gradle/wrapper/gradle-wrapper.jar‎

59 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)