Skip to content

Commit 9fc6585

Browse files
Merge master into merge/mps20251
2 parents 8a2188d + fbe95e5 commit 9fc6585

File tree

10 files changed

+122
-119
lines changed

10 files changed

+122
-119
lines changed

.github/workflows/vulnerability-scanning.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
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@ac638b010cf58a27ee6c972d7336334ccaf61c96 # 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

build.gradle

Lines changed: 11 additions & 8 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.+'
14+
id 'de.itemis.mps.gradle.launcher' version '2.6.1.+'
1515
id "com.github.breadmoirai.github-release" version "2.4.1"
16-
id "org.cyclonedx.bom" version "2.2.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.138"
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'

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
@@ -1515,16 +1515,16 @@
15151515
<ref role="3bR37D" node="3FexrMiSOe$" resolve="org.iets3.core.expr.plugin" />
15161516
</node>
15171517
</node>
1518-
<node concept="1SiIV0" id="62vWlLjQioO" role="3bR37C">
1519-
<node concept="3bR9La" id="62vWlLjQioP" role="1SiIV1">
1520-
<ref role="3bR37D" to="90a9:3$A0JaN5bpX" resolve="MPS.ThirdParty" />
1521-
</node>
1522-
</node>
15231518
<node concept="1SiIV0" id="62vWlLjQioQ" role="3bR37C">
15241519
<node concept="3bR9La" id="62vWlLjQioR" role="1SiIV1">
15251520
<ref role="3bR37D" to="90a9:PE3B26QCrP" resolve="org.apache.commons" />
15261521
</node>
15271522
</node>
1523+
<node concept="1SiIV0" id="bwlmYgn$D7" role="3bR37C">
1524+
<node concept="3bR9La" id="bwlmYgn$D8" role="1SiIV1">
1525+
<ref role="3bR37D" to="ffeo:6U$p2g0pj3R" resolve="JAXB" />
1526+
</node>
1527+
</node>
15281528
</node>
15291529
</node>
15301530
<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.2-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
118118

119119

120120
# Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
213213
set -- \
214214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215215
-classpath "$CLASSPATH" \
216-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217217
"$@"
218218

219219
# Stop when "xargs" is not available.

gradlew.bat

Lines changed: 94 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,94 @@
1-
@rem
2-
@rem Copyright 2015 the original author or authors.
3-
@rem
4-
@rem Licensed under the Apache License, Version 2.0 (the "License");
5-
@rem you may not use this file except in compliance with the License.
6-
@rem You may obtain a copy of the License at
7-
@rem
8-
@rem https://www.apache.org/licenses/LICENSE-2.0
9-
@rem
10-
@rem Unless required by applicable law or agreed to in writing, software
11-
@rem distributed under the License is distributed on an "AS IS" BASIS,
12-
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
@rem See the License for the specific language governing permissions and
14-
@rem limitations under the License.
15-
@rem
16-
@rem SPDX-License-Identifier: Apache-2.0
17-
@rem
18-
19-
@if "%DEBUG%"=="" @echo off
20-
@rem ##########################################################################
21-
@rem
22-
@rem Gradle startup script for Windows
23-
@rem
24-
@rem ##########################################################################
25-
26-
@rem Set local scope for the variables with windows NT shell
27-
if "%OS%"=="Windows_NT" setlocal
28-
29-
set DIRNAME=%~dp0
30-
if "%DIRNAME%"=="" set DIRNAME=.
31-
@rem This is normally unused
32-
set APP_BASE_NAME=%~n0
33-
set APP_HOME=%DIRNAME%
34-
35-
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
36-
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
37-
38-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
39-
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
40-
41-
@rem Find java.exe
42-
if defined JAVA_HOME goto findJavaFromJavaHome
43-
44-
set JAVA_EXE=java.exe
45-
%JAVA_EXE% -version >NUL 2>&1
46-
if %ERRORLEVEL% equ 0 goto execute
47-
48-
echo. 1>&2
49-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50-
echo. 1>&2
51-
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52-
echo location of your Java installation. 1>&2
53-
54-
goto fail
55-
56-
:findJavaFromJavaHome
57-
set JAVA_HOME=%JAVA_HOME:"=%
58-
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
59-
60-
if exist "%JAVA_EXE%" goto execute
61-
62-
echo. 1>&2
63-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64-
echo. 1>&2
65-
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66-
echo location of your Java installation. 1>&2
67-
68-
goto fail
69-
70-
:execute
71-
@rem Setup the command line
72-
73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
74-
75-
76-
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
78-
79-
:end
80-
@rem End local scope for the variables with windows NT shell
81-
if %ERRORLEVEL% equ 0 goto mainEnd
82-
83-
:fail
84-
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
85-
rem the _cmd.exe /c_ return code!
86-
set EXIT_CODE=%ERRORLEVEL%
87-
if %EXIT_CODE% equ 0 set EXIT_CODE=1
88-
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
89-
exit /b %EXIT_CODE%
90-
91-
:mainEnd
92-
if "%OS%"=="Windows_NT" endlocal
93-
94-
:omega
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
18+
19+
@if "%DEBUG%"=="" @echo off
20+
@rem ##########################################################################
21+
@rem
22+
@rem Gradle startup script for Windows
23+
@rem
24+
@rem ##########################################################################
25+
26+
@rem Set local scope for the variables with windows NT shell
27+
if "%OS%"=="Windows_NT" setlocal
28+
29+
set DIRNAME=%~dp0
30+
if "%DIRNAME%"=="" set DIRNAME=.
31+
@rem This is normally unused
32+
set APP_BASE_NAME=%~n0
33+
set APP_HOME=%DIRNAME%
34+
35+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
36+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
37+
38+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
39+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
40+
41+
@rem Find java.exe
42+
if defined JAVA_HOME goto findJavaFromJavaHome
43+
44+
set JAVA_EXE=java.exe
45+
%JAVA_EXE% -version >NUL 2>&1
46+
if %ERRORLEVEL% equ 0 goto execute
47+
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
53+
54+
goto fail
55+
56+
:findJavaFromJavaHome
57+
set JAVA_HOME=%JAVA_HOME:"=%
58+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
59+
60+
if exist "%JAVA_EXE%" goto execute
61+
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
67+
68+
goto fail
69+
70+
:execute
71+
@rem Setup the command line
72+
73+
set CLASSPATH=
74+
75+
76+
@rem Execute Gradle
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
78+
79+
:end
80+
@rem End local scope for the variables with windows NT shell
81+
if %ERRORLEVEL% equ 0 goto mainEnd
82+
83+
:fail
84+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
85+
rem the _cmd.exe /c_ return code!
86+
set EXIT_CODE=%ERRORLEVEL%
87+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
88+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
89+
exit /b %EXIT_CODE%
90+
91+
:mainEnd
92+
if "%OS%"=="Windows_NT" endlocal
93+
94+
:omega

0 commit comments

Comments
 (0)