Skip to content

Merge maintenance/mps20243 into master #2910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Apr 25, 2025
Merged

Merge maintenance/mps20243 into master #2910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a540946
exclude sbom.json when copying mps-extensions into final layout
wsafonov Apr 15, 2025
e864ad7
Merge pull request #2899 from mbeddr/bugfix/exclude_sbom_from_mpsexte…
wsafonov Apr 15, 2025
1645388
Merge pull request #2900 from mbeddr/merge/mps20241
mps-ci-buildbot Apr 15, 2025
8f41108
mpsutil: removed jcommon.jar (not available anymore with the recent j…
wsafonov Apr 16, 2025
42e9e85
mbeddr.doc: updated java libraries for org.apache.poi bundled dependency
wsafonov Apr 16, 2025
4bdfeb3
Merge pull request #2904 from mbeddr/bugfix/update_bundled_deps
wsafonov Apr 17, 2025
6ec356d
Update dependency gradle to v8.14
renovate[bot] Apr 25, 2025
205e59a
Merge pull request #2908 from mbeddr/renovate/maintenance/mps20241-gr…
sergej-koscejev Apr 25, 2025
2ae1eac
Merge branch 'maintenance/mps20243' into merge/mps20243
sergej-koscejev Apr 25, 2025
4d29f96
Merge pull request #2902 from mbeddr/merge/mps20243
mps-ci-buildbot Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...ages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheet.libs/com.mbeddr.spreadsheet.libs.msd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
<facets>
<facet type="java" compile="mps" classes="mps" ext="no">
<classes generated="true" path="${module}/classes_gen" />
<library location="${module}/lib/commons-io.jar" />
<library location="${module}/lib/log4j-api.jar" />
<library location="${module}/lib/commons-codec.jar" />
<library location="${module}/lib/commons-collections4.jar" />
<library location="${module}/lib/curvesapi.jar" />
Expand Down
2 changes: 0 additions & 2 deletions ...solutions/com.mbeddr.mpsutil.jfreechart.runtime/com.mbeddr.mpsutil.jfreechart.runtime.msd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@
<sourceRoot location="models" />
</modelRoot>
<modelRoot contentPath="${module}/lib" type="java_classes">
<sourceRoot location="jcommon.jar" />
<sourceRoot location="jfreechart.jar" />
</modelRoot>
</models>
<facets>
<facet type="java" compile="mps" classes="mps" ext="yes">
<classes generated="true" path="${module}/classes_gen" />
<library location="${module}/lib/jcommon.jar" />
<library location="${module}/lib/jfreechart.jar" />
</facet>
</facets>
Expand Down
64 changes: 45 additions & 19 deletions ....mbeddr.platform.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,15 @@
</concept>
<concept id="5610619299013057363" name="jetbrains.mps.build.structure.BuildLayout_ImportContent" flags="ng" index="3ygNvl">
<reference id="5610619299013057365" name="target" index="3ygNvj" />
<child id="6789562173791401562" name="selectors" index="1juEy9" />
</concept>
<concept id="841011766565753074" name="jetbrains.mps.build.structure.BuildLayout_Import" flags="ng" index="3_I8Xc">
<reference id="841011766565753076" name="target" index="3_I8Xa" />
</concept>
<concept id="841011766566059607" name="jetbrains.mps.build.structure.BuildStringNotEmpty" flags="ng" index="3_J27D" />
<concept id="5248329904288051111" name="jetbrains.mps.build.structure.BuildFileExcludeSelector" flags="ng" index="3LWZYq">
<property id="5248329904288051112" name="pattern" index="3LWZYl" />
</concept>
<concept id="5248329904288051100" name="jetbrains.mps.build.structure.BuildFileIncludeSelector" flags="ng" index="3LWZYx">
<property id="5248329904288051101" name="pattern" index="3LWZYw" />
</concept>
Expand Down Expand Up @@ -15000,6 +15004,44 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="19CIvIhsHGS" role="3bR37C">
<node concept="1BurEX" id="19CIvIhsHGT" role="1SiIV1">
<node concept="398BVA" id="19CIvIhsHGF" role="1BurEY">
<ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
<node concept="2Ry0Ak" id="19CIvIhsHGG" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="19CIvIhsHGH" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.spreadsheet.libs" />
<node concept="2Ry0Ak" id="19CIvIhsHGI" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="19CIvIhsHGJ" role="2Ry0An">
<property role="2Ry0Am" value="commons-io.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="19CIvIhsHH7" role="3bR37C">
<node concept="1BurEX" id="19CIvIhsHH8" role="1SiIV1">
<node concept="398BVA" id="19CIvIhsHGU" role="1BurEY">
<ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
<node concept="2Ry0Ak" id="19CIvIhsHGV" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="19CIvIhsHGW" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.spreadsheet.libs" />
<node concept="2Ry0Ak" id="19CIvIhsHGX" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="19CIvIhsHGY" role="2Ry0An">
<property role="2Ry0Am" value="log4j-api.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1E1JtD" id="4aKYPQyr67s" role="2G$12L">
<property role="TrG5h" value="com.mbeddr.spreadsheet" />
Expand Down Expand Up @@ -16085,25 +16127,6 @@
<ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
</node>
</node>
<node concept="1SiIV0" id="Cwh4MJ0sWc" role="3bR37C">
<node concept="1BurEX" id="Cwh4MJ0sWd" role="1SiIV1">
<node concept="398BVA" id="Cwh4MJ0sVZ" role="1BurEY">
<ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
<node concept="2Ry0Ak" id="Cwh4MJ0sW0" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="Cwh4MJ0sW1" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.jfreechart.runtime" />
<node concept="2Ry0Ak" id="Cwh4MJ0sW2" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="Cwh4MJ0sW3" role="2Ry0An">
<property role="2Ry0Am" value="jcommon.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="Cwh4MJ0sWr" role="3bR37C">
<node concept="1BurEX" id="Cwh4MJ0sWs" role="1SiIV1">
<node concept="398BVA" id="Cwh4MJ0sWe" role="1BurEY">
Expand Down Expand Up @@ -17381,6 +17404,9 @@
</node>
<node concept="3ygNvl" id="3ZcHznne7By" role="39821P">
<ref role="3ygNvj" to="90a9:2Xjt3l56m3c" />
<node concept="3LWZYq" id="2kSjHhbioMr" role="1juEy9">
<property role="3LWZYl" value="sbom.json" />
</node>
</node>
<node concept="m$_wl" id="6ucYLjolhRD" role="39821P">
<ref role="m_rDy" node="$bJ0jguQdg" resolve="com.mbeddr.platform" />
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions gradlew
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac

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


# Determine the Java command to use to start the JVM.
Expand Down Expand Up @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"

# Stop when "xargs" is not available.
Expand Down
4 changes: 2 additions & 2 deletions gradlew.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ goto fail
:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
set CLASSPATH=


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
"%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" %*

:end
@rem End local scope for the variables with windows NT shell
Expand Down
5 changes: 0 additions & 5 deletions subprojects/com.mbeddr/platform/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,7 @@ class BundledDep {
def bundledDeps = [
new BundledDep('commonmark', ['org.commonmark:commonmark:0.24.0'], 'com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown'),
new BundledDep('poi-ooxml', ['org.apache.poi:poi-ooxml:5.4.1'], 'com.mbeddr.doc/solutions/com.mbeddr.spreadsheet.libs', {
exclude group: 'org.slf4j'
exclude module: 'commons-compress'
exclude group: 'org.bouncycastle'
exclude module: 'xmlsec'
exclude module: 'batik-all'
exclude module: 'graphics2d'
exclude module: 'commons-math3'
exclude module: 'SparseBitSet'
}),
Expand Down
Loading