Skip to content

Commit 598b47e

Browse files
authored
Merge pull request #2843 from mbeddr/feature/publish_platform_sbom
Bundled dependencies & platform SBOM publishing
2 parents 7b3c7ce + 5a009f1 commit 598b47e

File tree

81 files changed

+846
-1747
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+846
-1747
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,16 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
1313

1414
- A new flag was added to make concept diagrams read-only, so that they can't edit the structure of languages.
1515

16+
## com.mbeddr:platform languages
17+
18+
### Changed
19+
20+
- Replaced used bundled jars stored in the source code repo by Gradle dependencies
21+
22+
### Added
23+
24+
- SBOM file with the description of all used components (libraries) and their dependencies
25+
1626
# February 2025
1727

1828
## com.mbeddr.doc

about.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ http://easymock.org
2020
Java3D
2121
https://java3d.java.net/
2222

23-
Jboss
24-
http://jboss-javassist.github.io/
25-
2623
Glassfish
2724
https://glassfish.java.net/
2825

Binary file not shown.

code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/com.mbeddr.doc.gen_markdown.mpl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<language namespace="com.mbeddr.doc.gen_markdown" uuid="8b0f9e01-1098-448b-a2c4-fe1c1896ef86" languageVersion="0" moduleVersion="0">
33
<models>
4-
<modelRoot contentPath="${module}" type="default">
4+
<modelRoot type="default" contentPath="${module}">
55
<sourceRoot location="models" />
66
</modelRoot>
7-
<modelRoot contentPath="${module}/lib" type="java_classes">
8-
<sourceRoot location="commonmark-0.17.1.jar" />
7+
<modelRoot type="java_classes" contentPath="${module}/lib">
8+
<sourceRoot location="commonmark.jar" />
99
</modelRoot>
1010
</models>
1111
<facets>
1212
<facet type="java" compile="mps" classes="mps" ext="yes">
1313
<classes generated="true" path="${module}/classes_gen" />
14-
<library location="${module}/lib/commonmark-0.17.1.jar" />
14+
<library location="${module}/lib/commonmark.jar" />
1515
</facet>
1616
</facets>
1717
<accessoryModels />
@@ -81,6 +81,7 @@
8181
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
8282
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
8383
<module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
84+
<module reference="daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)" version="0" />
8485
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
8586
<module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
8687
<module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
@@ -171,6 +172,7 @@
171172
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
172173
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
173174
<module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
175+
<module reference="daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)" version="0" />
174176
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
175177
<module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
176178
<module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.gitignore
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.gitignore
Binary file not shown.

code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/spreadsheat.mpl

Lines changed: 17 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -4,67 +4,26 @@
44
<modelRoot type="default" contentPath="${module}">
55
<sourceRoot location="languageModels" />
66
</modelRoot>
7-
<modelRoot type="java_classes" contentPath="${module}">
8-
<sourceRoot location="lib/commons-codec-1.10.jar" />
9-
<sourceRoot location="lib/commons-collections4-4.1.jar" />
10-
<sourceRoot location="lib/curvesapi-1.04.jar" />
11-
<sourceRoot location="lib/poi-5.0.0.jar" />
12-
<sourceRoot location="lib/poi-ooxml-5.0.0.jar" />
13-
<sourceRoot location="lib/poi-ooxml-lite-5.0.0.jar" />
7+
<modelRoot type="java_classes" contentPath="${module}/lib">
8+
<sourceRoot location="commons-codec.jar" />
9+
<sourceRoot location="commons-collections4.jar" />
10+
<sourceRoot location="curvesapi.jar" />
11+
<sourceRoot location="poi-ooxml-lite.jar" />
12+
<sourceRoot location="poi-ooxml.jar" />
13+
<sourceRoot location="poi.jar" />
14+
<sourceRoot location="xmlbeans.jar" />
1415
</modelRoot>
1516
</models>
1617
<facets>
1718
<facet type="java" compile="mps" classes="mps" ext="yes">
1819
<classes generated="true" path="${module}/classes_gen" />
19-
<library location="${module}/lib/commons-collections4-4.1.jar" />
20-
<library location="${module}/lib/curvesapi-1.04.jar" />
21-
<library location="${module}/lib/commons-codec-1.10.jar" />
22-
<library location="${module}/lib/poi-5.0.0.jar" />
23-
<library location="${module}/lib/poi-ooxml-5.0.0.jar" />
24-
<library location="${module}/lib/xmlbeans-4.0.0.jar" />
25-
<library location="${module}/lib/poi-ooxml-lite-5.0.0.jar" />
26-
<library location="${module}/lib/commons-codec-1.10.jar" />
27-
<library location="${module}/lib/commons-collections4-4.1.jar" />
28-
<library location="${module}/lib/curvesapi-1.04.jar" />
29-
<library location="${module}/lib/poi-5.0.0.jar" />
30-
<library location="${module}/lib/poi-ooxml-5.0.0.jar" />
31-
<library location="${module}/lib/xmlbeans-4.0.0.jar" />
32-
<library location="${module}/lib/poi-ooxml-lite-5.0.0.jar" />
33-
<library location="${module}/lib/commons-codec-1.10.jar" />
34-
<library location="${module}/lib/commons-collections4-4.1.jar" />
35-
<library location="${module}/lib/curvesapi-1.04.jar" />
36-
<library location="${module}/lib/poi-5.0.0.jar" />
37-
<library location="${module}/lib/poi-ooxml-5.0.0.jar" />
38-
<library location="${module}/lib/xmlbeans-4.0.0.jar" />
39-
<library location="${module}/lib/poi-ooxml-lite-5.0.0.jar" />
40-
<library location="${module}/lib/commons-codec-1.10.jar" />
41-
<library location="${module}/lib/commons-collections4-4.1.jar" />
42-
<library location="${module}/lib/curvesapi-1.04.jar" />
43-
<library location="${module}/lib/poi-5.0.0.jar" />
44-
<library location="${module}/lib/poi-ooxml-5.0.0.jar" />
45-
<library location="${module}/lib/xmlbeans-4.0.0.jar" />
46-
<library location="${module}/lib/poi-ooxml-lite-5.0.0.jar" />
47-
<library location="${module}/lib/commons-codec-1.10.jar" />
48-
<library location="${module}/lib/commons-collections4-4.1.jar" />
49-
<library location="${module}/lib/curvesapi-1.04.jar" />
50-
<library location="${module}/lib/poi-5.0.0.jar" />
51-
<library location="${module}/lib/poi-ooxml-5.0.0.jar" />
52-
<library location="${module}/lib/xmlbeans-4.0.0.jar" />
53-
<library location="${module}/lib/poi-ooxml-lite-5.0.0.jar" />
54-
<library location="${module}/lib/commons-codec-1.10.jar" />
55-
<library location="${module}/lib/commons-collections4-4.1.jar" />
56-
<library location="${module}/lib/curvesapi-1.04.jar" />
57-
<library location="${module}/lib/poi-5.0.0.jar" />
58-
<library location="${module}/lib/poi-ooxml-5.0.0.jar" />
59-
<library location="${module}/lib/xmlbeans-4.0.0.jar" />
60-
<library location="${module}/lib/poi-ooxml-lite-5.0.0.jar" />
61-
<library location="${module}/lib/commons-codec-1.10.jar" />
62-
<library location="${module}/lib/commons-collections4-4.1.jar" />
63-
<library location="${module}/lib/curvesapi-1.04.jar" />
64-
<library location="${module}/lib/poi-5.0.0.jar" />
65-
<library location="${module}/lib/poi-ooxml-5.0.0.jar" />
66-
<library location="${module}/lib/xmlbeans-4.0.0.jar" />
67-
<library location="${module}/lib/poi-ooxml-lite-5.0.0.jar" />
20+
<library location="${module}/lib/commons-codec.jar" />
21+
<library location="${module}/lib/commons-collections4.jar" />
22+
<library location="${module}/lib/curvesapi.jar" />
23+
<library location="${module}/lib/poi-ooxml-lite.jar" />
24+
<library location="${module}/lib/poi-ooxml.jar" />
25+
<library location="${module}/lib/poi.jar" />
26+
<library location="${module}/lib/xmlbeans.jar" />
6827
</facet>
6928
</facets>
7029
<accessoryModels />
@@ -128,6 +87,7 @@
12887
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
12988
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
13089
<module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
90+
<module reference="daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)" version="0" />
13191
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
13292
<module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
13393
<module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
@@ -158,15 +118,6 @@
158118
</mapping-priorities>
159119
</generator>
160120
</generators>
161-
<stubModelEntries>
162-
<stubModelEntry path="${module}/lib/commons-codec-1.10.jar" />
163-
<stubModelEntry path="${module}/lib/commons-collections4-4.1.jar" />
164-
<stubModelEntry path="${module}/lib/curvesapi-1.04.jar" />
165-
<stubModelEntry path="${module}/lib/poi-5.0.0.jar" />
166-
<stubModelEntry path="${module}/lib/poi-ooxml-5.0.0.jar" />
167-
<stubModelEntry path="${module}/lib/xmlbeans-4.0.0.jar" />
168-
<stubModelEntry path="${module}/lib/poi-ooxml-lite-5.0.0.jar" />
169-
</stubModelEntries>
170121
<dependencies>
171122
<dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
172123
</dependencies>
@@ -225,6 +176,7 @@
225176
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
226177
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
227178
<module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
179+
<module reference="daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)" version="0" />
228180
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
229181
<module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
230182
<module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />

code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/solutions/pluginSolution/com.mbeddr.mpsutil.jung.pluginSolution.msd

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<solution name="com.mbeddr.mpsutil.jung.pluginSolution" uuid="1338ba73-5059-479b-a929-de86597a62b8" moduleVersion="0">
33
<models>
4-
<modelRoot contentPath="${module}" type="default">
4+
<modelRoot type="default" contentPath="${module}">
55
<sourceRoot location="models" />
66
</modelRoot>
7-
<modelRoot contentPath="${module}" type="java_classes">
8-
<sourceRoot location="lib/collections-generic-4.01.jar" />
9-
<sourceRoot location="lib/colt-1.2.0.jar" />
10-
<sourceRoot location="lib/concurrent-1.3.4.jar" />
11-
<sourceRoot location="lib/j3d-core-1.3.1.jar" />
12-
<sourceRoot location="lib/jung-3d-2.0.1.jar" />
13-
<sourceRoot location="lib/jung-3d-demos-2.0.1.jar" />
14-
<sourceRoot location="lib/jung-algorithms-2.0.1.jar" />
15-
<sourceRoot location="lib/jung-api-2.0.1.jar" />
16-
<sourceRoot location="lib/jung-graph-impl-2.0.1.jar" />
17-
<sourceRoot location="lib/jung-io-2.0.1.jar" />
18-
<sourceRoot location="lib/jung-jai-2.0.1.jar" />
19-
<sourceRoot location="lib/jung-jai-samples-2.0.1.jar" />
20-
<sourceRoot location="lib/jung-samples-2.0.1.jar" />
21-
<sourceRoot location="lib/jung-visualization-2.0.1.jar" />
22-
<sourceRoot location="lib/vecmath-1.3.1.jar" />
23-
<sourceRoot location="lib/wstx-asl-3.2.6.jar" />
7+
<modelRoot type="java_classes" contentPath="${module}/lib">
8+
<sourceRoot location="collections-generic.jar" />
9+
<sourceRoot location="colt.jar" />
10+
<sourceRoot location="concurrent.jar" />
11+
<sourceRoot location="j3d-core.jar" />
12+
<sourceRoot location="jung-3d-demos.jar" />
13+
<sourceRoot location="jung-3d.jar" />
14+
<sourceRoot location="jung-algorithms.jar" />
15+
<sourceRoot location="jung-api.jar" />
16+
<sourceRoot location="jung-graph-impl.jar" />
17+
<sourceRoot location="jung-io.jar" />
18+
<sourceRoot location="jung-jai-samples.jar" />
19+
<sourceRoot location="jung-jai.jar" />
20+
<sourceRoot location="jung-samples.jar" />
21+
<sourceRoot location="jung-visualization.jar" />
22+
<sourceRoot location="vecmath.jar" />
23+
<sourceRoot location="wstx-asl.jar" />
2424
</modelRoot>
2525
</models>
2626
<facets>
2727
<facet type="java" compile="mps" classes="mps" ext="yes">
2828
<classes generated="true" path="${module}/classes_gen" />
29-
<library location="${module}/lib/collections-generic-4.01.jar" />
30-
<library location="${module}/lib/colt-1.2.0.jar" />
31-
<library location="${module}/lib/concurrent-1.3.4.jar" />
32-
<library location="${module}/lib/j3d-core-1.3.1.jar" />
33-
<library location="${module}/lib/jung-3d-2.0.1.jar" />
34-
<library location="${module}/lib/jung-3d-demos-2.0.1.jar" />
35-
<library location="${module}/lib/jung-algorithms-2.0.1.jar" />
36-
<library location="${module}/lib/jung-api-2.0.1.jar" />
37-
<library location="${module}/lib/jung-graph-impl-2.0.1.jar" />
38-
<library location="${module}/lib/jung-io-2.0.1.jar" />
39-
<library location="${module}/lib/jung-jai-2.0.1.jar" />
40-
<library location="${module}/lib/jung-jai-samples-2.0.1.jar" />
41-
<library location="${module}/lib/jung-samples-2.0.1.jar" />
42-
<library location="${module}/lib/jung-visualization-2.0.1.jar" />
43-
<library location="${module}/lib/vecmath-1.3.1.jar" />
44-
<library location="${module}/lib/wstx-asl-3.2.6.jar" />
29+
<library location="${module}/lib/collections-generic.jar" />
30+
<library location="${module}/lib/colt.jar" />
31+
<library location="${module}/lib/concurrent.jar" />
32+
<library location="${module}/lib/j3d-core.jar" />
33+
<library location="${module}/lib/jung-3d-demos.jar" />
34+
<library location="${module}/lib/jung-3d.jar" />
35+
<library location="${module}/lib/jung-algorithms.jar" />
36+
<library location="${module}/lib/jung-api.jar" />
37+
<library location="${module}/lib/jung-graph-impl.jar" />
38+
<library location="${module}/lib/jung-io.jar" />
39+
<library location="${module}/lib/jung-jai-samples.jar" />
40+
<library location="${module}/lib/jung-jai.jar" />
41+
<library location="${module}/lib/jung-samples.jar" />
42+
<library location="${module}/lib/jung-visualization.jar" />
43+
<library location="${module}/lib/vecmath.jar" />
44+
<library location="${module}/lib/wstx-asl.jar" />
4545
</facet>
4646
</facets>
4747
<dependencies>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.gitignore

code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.runtime/com.mbeddr.mpsutil.datepicker.runtime.msd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<solution name="com.mbeddr.mpsutil.datepicker.runtime" uuid="98a7bbe2-0ea1-4503-9fc1-9efb7b48c6ea" moduleVersion="0">
33
<models>
4-
<modelRoot contentPath="${module}" type="default">
4+
<modelRoot type="default" contentPath="${module}">
55
<sourceRoot location="models" />
66
</modelRoot>
7-
<modelRoot contentPath="${module}" type="java_classes">
8-
<sourceRoot location="lib/microba-0.4.4.jar" />
7+
<modelRoot type="java_classes" contentPath="${module}/lib">
8+
<sourceRoot location="microba.jar" />
99
</modelRoot>
1010
</models>
1111
<facets>
1212
<facet type="java" languageLevel="JAVA_9" compile="mps" classes="mps" ext="no">
1313
<classes generated="true" path="${module}/classes_gen" />
14-
<library location="${module}/lib/microba-0.4.4.jar" />
14+
<library location="${module}/lib/microba.jar" />
1515
</facet>
1616
</facets>
1717
<dependencies>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.gitignore

0 commit comments

Comments
 (0)