Skip to content

Commit 9828486

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #2910 from mbeddr/merge/master
Merge maintenance/mps20243 into master
2 parents 65549d5 + 4d29f96 commit 9828486

File tree

8 files changed

+53
-32
lines changed

8 files changed

+53
-32
lines changed

‎code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheet.libs/com.mbeddr.spreadsheet.libs.msd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<facets>
1818
<facet type="java" compile="mps" classes="mps" ext="no">
1919
<classes generated="true" path="${module}/classes_gen" />
20+
<library location="${module}/lib/commons-io.jar" />
21+
<library location="${module}/lib/log4j-api.jar" />
2022
<library location="${module}/lib/commons-codec.jar" />
2123
<library location="${module}/lib/commons-collections4.jar" />
2224
<library location="${module}/lib/curvesapi.jar" />

‎code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/com.mbeddr.mpsutil.jfreechart.runtime.msd

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
<sourceRoot location="models" />
66
</modelRoot>
77
<modelRoot contentPath="${module}/lib" type="java_classes">
8-
<sourceRoot location="jcommon.jar" />
98
<sourceRoot location="jfreechart.jar" />
109
</modelRoot>
1110
</models>
1211
<facets>
1312
<facet type="java" compile="mps" classes="mps" ext="yes">
1413
<classes generated="true" path="${module}/classes_gen" />
15-
<library location="${module}/lib/jcommon.jar" />
1614
<library location="${module}/lib/jfreechart.jar" />
1715
</facet>
1816
</facets>

‎code/languages/com.mbeddr.platform.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps

Lines changed: 45 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,15 @@
9494
</concept>
9595
<concept id="5610619299013057363" name="jetbrains.mps.build.structure.BuildLayout_ImportContent" flags="ng" index="3ygNvl">
9696
<reference id="5610619299013057365" name="target" index="3ygNvj" />
97+
<child id="6789562173791401562" name="selectors" index="1juEy9" />
9798
</concept>
9899
<concept id="841011766565753074" name="jetbrains.mps.build.structure.BuildLayout_Import" flags="ng" index="3_I8Xc">
99100
<reference id="841011766565753076" name="target" index="3_I8Xa" />
100101
</concept>
101102
<concept id="841011766566059607" name="jetbrains.mps.build.structure.BuildStringNotEmpty" flags="ng" index="3_J27D" />
103+
<concept id="5248329904288051111" name="jetbrains.mps.build.structure.BuildFileExcludeSelector" flags="ng" index="3LWZYq">
104+
<property id="5248329904288051112" name="pattern" index="3LWZYl" />
105+
</concept>
102106
<concept id="5248329904288051100" name="jetbrains.mps.build.structure.BuildFileIncludeSelector" flags="ng" index="3LWZYx">
103107
<property id="5248329904288051101" name="pattern" index="3LWZYw" />
104108
</concept>
@@ -15000,6 +15004,44 @@
1500015004
</node>
1500115005
</node>
1500215006
</node>
15007+
<node concept="1SiIV0" id="19CIvIhsHGS" role="3bR37C">
15008+
<node concept="1BurEX" id="19CIvIhsHGT" role="1SiIV1">
15009+
<node concept="398BVA" id="19CIvIhsHGF" role="1BurEY">
15010+
<ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
15011+
<node concept="2Ry0Ak" id="19CIvIhsHGG" role="iGT6I">
15012+
<property role="2Ry0Am" value="solutions" />
15013+
<node concept="2Ry0Ak" id="19CIvIhsHGH" role="2Ry0An">
15014+
<property role="2Ry0Am" value="com.mbeddr.spreadsheet.libs" />
15015+
<node concept="2Ry0Ak" id="19CIvIhsHGI" role="2Ry0An">
15016+
<property role="2Ry0Am" value="lib" />
15017+
<node concept="2Ry0Ak" id="19CIvIhsHGJ" role="2Ry0An">
15018+
<property role="2Ry0Am" value="commons-io.jar" />
15019+
</node>
15020+
</node>
15021+
</node>
15022+
</node>
15023+
</node>
15024+
</node>
15025+
</node>
15026+
<node concept="1SiIV0" id="19CIvIhsHH7" role="3bR37C">
15027+
<node concept="1BurEX" id="19CIvIhsHH8" role="1SiIV1">
15028+
<node concept="398BVA" id="19CIvIhsHGU" role="1BurEY">
15029+
<ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
15030+
<node concept="2Ry0Ak" id="19CIvIhsHGV" role="iGT6I">
15031+
<property role="2Ry0Am" value="solutions" />
15032+
<node concept="2Ry0Ak" id="19CIvIhsHGW" role="2Ry0An">
15033+
<property role="2Ry0Am" value="com.mbeddr.spreadsheet.libs" />
15034+
<node concept="2Ry0Ak" id="19CIvIhsHGX" role="2Ry0An">
15035+
<property role="2Ry0Am" value="lib" />
15036+
<node concept="2Ry0Ak" id="19CIvIhsHGY" role="2Ry0An">
15037+
<property role="2Ry0Am" value="log4j-api.jar" />
15038+
</node>
15039+
</node>
15040+
</node>
15041+
</node>
15042+
</node>
15043+
</node>
15044+
</node>
1500315045
</node>
1500415046
<node concept="1E1JtD" id="4aKYPQyr67s" role="2G$12L">
1500515047
<property role="TrG5h" value="com.mbeddr.spreadsheet" />
@@ -16085,25 +16127,6 @@
1608516127
<ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
1608616128
</node>
1608716129
</node>
16088-
<node concept="1SiIV0" id="Cwh4MJ0sWc" role="3bR37C">
16089-
<node concept="1BurEX" id="Cwh4MJ0sWd" role="1SiIV1">
16090-
<node concept="398BVA" id="Cwh4MJ0sVZ" role="1BurEY">
16091-
<ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
16092-
<node concept="2Ry0Ak" id="Cwh4MJ0sW0" role="iGT6I">
16093-
<property role="2Ry0Am" value="solutions" />
16094-
<node concept="2Ry0Ak" id="Cwh4MJ0sW1" role="2Ry0An">
16095-
<property role="2Ry0Am" value="com.mbeddr.mpsutil.jfreechart.runtime" />
16096-
<node concept="2Ry0Ak" id="Cwh4MJ0sW2" role="2Ry0An">
16097-
<property role="2Ry0Am" value="lib" />
16098-
<node concept="2Ry0Ak" id="Cwh4MJ0sW3" role="2Ry0An">
16099-
<property role="2Ry0Am" value="jcommon.jar" />
16100-
</node>
16101-
</node>
16102-
</node>
16103-
</node>
16104-
</node>
16105-
</node>
16106-
</node>
1610716130
<node concept="1SiIV0" id="Cwh4MJ0sWr" role="3bR37C">
1610816131
<node concept="1BurEX" id="Cwh4MJ0sWs" role="1SiIV1">
1610916132
<node concept="398BVA" id="Cwh4MJ0sWe" role="1BurEY">
@@ -17381,6 +17404,9 @@
1738117404
</node>
1738217405
<node concept="3ygNvl" id="3ZcHznne7By" role="39821P">
1738317406
<ref role="3ygNvj" to="90a9:2Xjt3l56m3c" />
17407+
<node concept="3LWZYq" id="2kSjHhbioMr" role="1juEy9">
17408+
<property role="3LWZYl" value="sbom.json" />
17409+
</node>
1738417410
</node>
1738517411
<node concept="m$_wl" id="6ucYLjolhRD" role="39821P">
1738617412
<ref role="m_rDy" node="$bJ0jguQdg" resolve="com.mbeddr.platform" />

‎gradle/wrapper/gradle-wrapper.jar

59 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@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 %*
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" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

‎subprojects/com.mbeddr/platform/build.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,7 @@ class BundledDep {
4545
def bundledDeps = [
4646
new BundledDep('commonmark', ['org.commonmark:commonmark:0.24.0'], 'com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown'),
4747
new BundledDep('poi-ooxml', ['org.apache.poi:poi-ooxml:5.4.1'], 'com.mbeddr.doc/solutions/com.mbeddr.spreadsheet.libs', {
48-
exclude group: 'org.slf4j'
4948
exclude module: 'commons-compress'
50-
exclude group: 'org.bouncycastle'
51-
exclude module: 'xmlsec'
52-
exclude module: 'batik-all'
53-
exclude module: 'graphics2d'
5449
exclude module: 'commons-math3'
5550
exclude module: 'SparseBitSet'
5651
}),

0 commit comments

Comments
 (0)