Skip to content

Commit 4bdfeb3

Browse files
wsafonovwsafonov
authored
Merge pull request #2904 from mbeddr/bugfix/update_bundled_deps
Update bundled dependencies
2 parents 1645388 + 42e9e85 commit 4bdfeb3

File tree

4 files changed

+44
-30
lines changed

4 files changed

+44
-30
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<solution name="com.mbeddr.spreadsheet.libs" uuid="fc506c9e-94ac-4d65-9950-01def4cba278" moduleVersion="0">
33
<models>
4-
<modelRoot type="default" contentPath="${module}">
4+
<modelRoot contentPath="${module}" type="default">
55
<sourceRoot location="models" />
66
</modelRoot>
7-
<modelRoot type="java_classes" contentPath="${module}/lib">
7+
<modelRoot contentPath="${module}/lib" type="java_classes">
88
<sourceRoot location="commons-codec.jar" />
99
<sourceRoot location="commons-collections4.jar" />
1010
<sourceRoot location="curvesapi.jar" />
@@ -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: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<solution name="com.mbeddr.mpsutil.jfreechart.runtime" uuid="7fe13e34-8620-4d5d-92c7-df091b0ed628" moduleVersion="0">
33
<models>
4-
<modelRoot type="default" contentPath="${module}">
4+
<modelRoot contentPath="${module}" type="default">
55
<sourceRoot location="models" />
66
</modelRoot>
7-
<modelRoot type="java_classes" contentPath="${module}/lib">
8-
<sourceRoot location="jcommon.jar" />
7+
<modelRoot contentPath="${module}/lib" type="java_classes">
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: 38 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15000,6 +15000,44 @@
1500015000
</node>
1500115001
</node>
1500215002
</node>
15003+
<node concept="1SiIV0" id="19CIvIhsHGS" role="3bR37C">
15004+
<node concept="1BurEX" id="19CIvIhsHGT" role="1SiIV1">
15005+
<node concept="398BVA" id="19CIvIhsHGF" role="1BurEY">
15006+
<ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
15007+
<node concept="2Ry0Ak" id="19CIvIhsHGG" role="iGT6I">
15008+
<property role="2Ry0Am" value="solutions" />
15009+
<node concept="2Ry0Ak" id="19CIvIhsHGH" role="2Ry0An">
15010+
<property role="2Ry0Am" value="com.mbeddr.spreadsheet.libs" />
15011+
<node concept="2Ry0Ak" id="19CIvIhsHGI" role="2Ry0An">
15012+
<property role="2Ry0Am" value="lib" />
15013+
<node concept="2Ry0Ak" id="19CIvIhsHGJ" role="2Ry0An">
15014+
<property role="2Ry0Am" value="commons-io.jar" />
15015+
</node>
15016+
</node>
15017+
</node>
15018+
</node>
15019+
</node>
15020+
</node>
15021+
</node>
15022+
<node concept="1SiIV0" id="19CIvIhsHH7" role="3bR37C">
15023+
<node concept="1BurEX" id="19CIvIhsHH8" role="1SiIV1">
15024+
<node concept="398BVA" id="19CIvIhsHGU" role="1BurEY">
15025+
<ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
15026+
<node concept="2Ry0Ak" id="19CIvIhsHGV" role="iGT6I">
15027+
<property role="2Ry0Am" value="solutions" />
15028+
<node concept="2Ry0Ak" id="19CIvIhsHGW" role="2Ry0An">
15029+
<property role="2Ry0Am" value="com.mbeddr.spreadsheet.libs" />
15030+
<node concept="2Ry0Ak" id="19CIvIhsHGX" role="2Ry0An">
15031+
<property role="2Ry0Am" value="lib" />
15032+
<node concept="2Ry0Ak" id="19CIvIhsHGY" role="2Ry0An">
15033+
<property role="2Ry0Am" value="log4j-api.jar" />
15034+
</node>
15035+
</node>
15036+
</node>
15037+
</node>
15038+
</node>
15039+
</node>
15040+
</node>
1500315041
</node>
1500415042
<node concept="1E1JtD" id="4aKYPQyr67s" role="2G$12L">
1500515043
<property role="TrG5h" value="com.mbeddr.spreadsheet" />
@@ -16085,25 +16123,6 @@
1608516123
<ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
1608616124
</node>
1608716125
</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>
1610716126
<node concept="1SiIV0" id="Cwh4MJ0sWr" role="3bR37C">
1610816127
<node concept="1BurEX" id="Cwh4MJ0sWs" role="1SiIV1">
1610916128
<node concept="398BVA" id="Cwh4MJ0sWe" role="1BurEY">

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,7 @@ class BundledDep {
5050
def bundledDeps = [
5151
new BundledDep('commonmark', ['org.commonmark:commonmark:0.24.0'], 'com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown'),
5252
new BundledDep('poi-ooxml', ['org.apache.poi:poi-ooxml:5.4.1'], 'com.mbeddr.doc/solutions/com.mbeddr.spreadsheet.libs', {
53-
exclude group: 'org.slf4j'
5453
exclude module: 'commons-compress'
55-
exclude group: 'org.bouncycastle'
56-
exclude module: 'xmlsec'
57-
exclude module: 'batik-all'
58-
exclude module: 'graphics2d'
5954
exclude module: 'commons-math3'
6055
exclude module: 'SparseBitSet'
6156
}),

0 commit comments

Comments
 (0)