Skip to content

Commit

Permalink
Merge pull request #2374 from mbeddr/feature/upgrade_XMLBeans
Browse files Browse the repository at this point in the history 
Spreadsheet: upgrade xmlbeans from 2.6.0 to 4.0.0 and Apache POI from 2.6.0 to 5.0.0
  • Loading branch information
@alexanderpann
alexanderpann authored Jan 30, 2024
2 parents 0ecdf0e + 3189d0d commit 9f7aac4
Show file tree
Hide file tree
Showing 13 changed files with 124 additions and 107 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,18 @@ Semantic Versioning and the changes are simply documented in reverse chronologic

## com.mbeddr.mpsutils

### Fixed

- A dummy computation trace is now used when the computation trace is not available in the interpreter to prevent NullPointerExceptions.
- Referenced actions in action profiles now emit a warning when they can't be found.

## com.mbeddr.doc

### Changed

- The Java library xmlbeans of the spreadsheet language was upgraded from version 2.6.0 to 4.0.0
- The Java library Apache Poi of the spreadsheet language was upgraded from 2.6.0 to 5.0.0

# December 2023

## com.mbeddr.mpsutils
Expand Down
105 changes: 50 additions & 55 deletions ...uages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9348,11 +9348,6 @@
<ref role="3bR37D" node="5GUwywcVavP" resolve="com.mbeddr.mpsutil.interpreter" />
</node>
</node>
<node concept="1SiIV0" id="kZqQ7ZZcsU" role="3bR37C">
<node concept="3bR9La" id="kZqQ7ZZcsV" role="1SiIV1">
<ref role="3bR37D" node="2mU72gDxe9F" resolve="com.mbeddr.mpsutil.jung.pluginSolution" />
</node>
</node>
</node>
<node concept="1E1JtA" id="2bBLuwR9$cn" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -18333,7 +18328,7 @@
<node concept="2Ry0Ak" id="6qrqamSa6lG" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="6qrqamSa6lH" role="2Ry0An">
<property role="2Ry0Am" value="poi-3.16.jar" />
<property role="2Ry0Am" value="poi-5.0.0.jar" />
</node>
</node>
</node>
Expand All @@ -18352,45 +18347,7 @@
<node concept="2Ry0Ak" id="6qrqamSa6lV" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="6qrqamSa6lW" role="2Ry0An">
<property role="2Ry0Am" value="poi-ooxml-3.16.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="6qrqamSa6mk" role="3bR37C">
<node concept="1BurEX" id="6qrqamSa6ml" role="1SiIV1">
<node concept="398BVA" id="6qrqamSa6m7" role="1BurEY">
<ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
<node concept="2Ry0Ak" id="6qrqamSa6m8" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="6qrqamSa6m9" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
<node concept="2Ry0Ak" id="6qrqamSa6ma" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="6qrqamSa6mb" role="2Ry0An">
<property role="2Ry0Am" value="poi-ooxml-schemas-3.16.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="6qrqamSa6mz" role="3bR37C">
<node concept="1BurEX" id="6qrqamSa6m$" role="1SiIV1">
<node concept="398BVA" id="6qrqamSa6mm" role="1BurEY">
<ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
<node concept="2Ry0Ak" id="6qrqamSa6mn" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="6qrqamSa6mo" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
<node concept="2Ry0Ak" id="6qrqamSa6mp" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="6qrqamSa6mq" role="2Ry0An">
<property role="2Ry0Am" value="xmlbeans-2.6.0.jar" />
<property role="2Ry0Am" value="poi-ooxml-5.0.0.jar" />
</node>
</node>
</node>
Expand Down Expand Up @@ -18459,6 +18416,44 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="2tOXMOy_0rv" role="3bR37C">
<node concept="1BurEX" id="2tOXMOy_0rw" role="1SiIV1">
<node concept="398BVA" id="2tOXMOy_0ri" role="1BurEY">
<ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
<node concept="2Ry0Ak" id="2tOXMOy_0rj" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="2tOXMOy_0rk" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
<node concept="2Ry0Ak" id="2tOXMOy_0rl" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="2tOXMOy_0rm" role="2Ry0An">
<property role="2Ry0Am" value="poi-ooxml-lite-5.0.0.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="BNROLcYFVv" role="3bR37C">
<node concept="1BurEX" id="BNROLcYFVw" role="1SiIV1">
<node concept="398BVA" id="BNROLcYFVi" role="1BurEY">
<ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
<node concept="2Ry0Ak" id="BNROLcYFVj" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="BNROLcYFVk" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
<node concept="2Ry0Ak" id="BNROLcYFVl" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="BNROLcYFVm" role="2Ry0An">
<property role="2Ry0Am" value="xmlbeans-4.0.0.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1E1JtD" id="5xsBLDL_TZv" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -20877,7 +20872,7 @@
<node concept="2Ry0Ak" id="4aKYPQyrjED" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="3gPJ5IrGodP" role="2Ry0An">
<property role="2Ry0Am" value="poi-3.16.jar" />
<property role="2Ry0Am" value="poi-5.0.0.jar" />
</node>
</node>
</node>
Expand All @@ -20894,24 +20889,24 @@
<node concept="2Ry0Ak" id="4aKYPQyrjFv" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="3gPJ5IrGpl6" role="2Ry0An">
<property role="2Ry0Am" value="poi-ooxml-3.16.jar" />
<property role="2Ry0Am" value="poi-ooxml-5.0.0.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="28jJK3" id="4aKYPQyrjGt" role="39821P">
<node concept="398BVA" id="4aKYPQyrjGu" role="28jJRO">
<node concept="28jJK3" id="2tOXMOy_sN9" role="39821P">
<node concept="398BVA" id="2tOXMOy_sNa" role="28jJRO">
<ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
<node concept="2Ry0Ak" id="4aKYPQyrjGv" role="iGT6I">
<node concept="2Ry0Ak" id="2tOXMOy_sNb" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="4aKYPQyrjGw" role="2Ry0An">
<node concept="2Ry0Ak" id="2tOXMOy_sNc" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
<node concept="2Ry0Ak" id="4aKYPQyrjGx" role="2Ry0An">
<node concept="2Ry0Ak" id="2tOXMOy_sNd" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="3gPJ5IrGqsn" role="2Ry0An">
<property role="2Ry0Am" value="poi-ooxml-schemas-3.16.jar" />
<node concept="2Ry0Ak" id="2tOXMOy_sNe" role="2Ry0An">
<property role="2Ry0Am" value="poi-ooxml-lite-5.0.0.jar" />
</node>
</node>
</node>
Expand All @@ -20928,7 +20923,7 @@
<node concept="2Ry0Ak" id="4aKYPQyrkIn" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="3gPJ5IrGsGm" role="2Ry0An">
<property role="2Ry0Am" value="xmlbeans-2.6.0.jar" />
<property role="2Ry0Am" value="xmlbeans-4.0.0.jar" />
</node>
</node>
</node>
Expand Down
67 changes: 37 additions & 30 deletions .../com.mbeddr.spreadsheat/generator/template/com/mbeddr/spreadsheat/generator/main/util.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
<child id="1197027771414" name="operand" index="2Oq$k0" />
<child id="1197027833540" name="operation" index="2OqNvi" />
</concept>
<concept id="1083260308424" name="jetbrains.mps.baseLanguage.structure.EnumConstantReference" flags="nn" index="Rm8GO">
<reference id="1083260308426" name="enumConstantDeclaration" index="Rm8GQ" />
<reference id="1144432896254" name="enumClass" index="1Px2BO" />
</concept>
<concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
<child id="1145553007750" name="creator" index="2ShVmc" />
</concept>
Expand All @@ -29,7 +33,6 @@
<concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
<reference id="1144433057691" name="classifier" index="1PxDUh" />
</concept>
<concept id="1070533982221" name="jetbrains.mps.baseLanguage.structure.ShortType" flags="in" index="10N3zO" />
<concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
<concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
Expand Down Expand Up @@ -421,15 +424,14 @@
<node concept="3Tm1VV" id="1LnB5xdHLd8" role="1B3o_S" />
<node concept="2YIFZL" id="1LnB5xdHLd9" role="jymVt">
<property role="TrG5h" value="alignmentFor" />
<node concept="10N3zO" id="1LnB5xdHLdq" role="3clF45" />
<node concept="3Tm1VV" id="1LnB5xdHLdb" role="1B3o_S" />
<node concept="3clFbS" id="1LnB5xdHLdc" role="3clF47">
<node concept="3clFbJ" id="1LnB5xdHLNt" role="3cqZAp">
<node concept="3clFbS" id="1LnB5xdHLNu" role="3clFbx">
<node concept="3cpWs6" id="1LnB5xdHL$z" role="3cqZAp">
<node concept="10M0yZ" id="1LnB5xdHL$$" role="3cqZAk">
<ref role="1PxDUh" to="54ve:~CellStyle" resolve="CellStyle" />
<ref role="3cqZAo" to="54ve:~CellStyle.ALIGN_CENTER" resolve="ALIGN_CENTER" />
<node concept="Rm8GO" id="2tOXMOyzjND" role="3cqZAk">
<ref role="Rm8GQ" to="54ve:~HorizontalAlignment.CENTER" resolve="CENTER" />
<ref role="1Px2BO" to="54ve:~HorizontalAlignment" resolve="HorizontalAlignment" />
</node>
</node>
</node>
Expand Down Expand Up @@ -469,9 +471,9 @@
<node concept="3clFbJ" id="1LnB5xdHLN_" role="3cqZAp">
<node concept="3clFbS" id="1LnB5xdHLNA" role="3clFbx">
<node concept="3cpWs6" id="1LnB5xdHL__" role="3cqZAp">
<node concept="10M0yZ" id="7bplM0p9th4" role="3cqZAk">
<ref role="1PxDUh" to="54ve:~CellStyle" resolve="CellStyle" />
<ref role="3cqZAo" to="54ve:~CellStyle.ALIGN_RIGHT" resolve="ALIGN_RIGHT" />
<node concept="Rm8GO" id="2tOXMOyzjZ1" role="3cqZAk">
<ref role="Rm8GQ" to="54ve:~HorizontalAlignment.RIGHT" resolve="RIGHT" />
<ref role="1Px2BO" to="54ve:~HorizontalAlignment" resolve="HorizontalAlignment" />
</node>
</node>
</node>
Expand Down Expand Up @@ -511,9 +513,9 @@
<node concept="3clFbJ" id="1LnB5xdHLNH" role="3cqZAp">
<node concept="3clFbS" id="1LnB5xdHLNI" role="3clFbx">
<node concept="3cpWs6" id="1LnB5xdHL_I" role="3cqZAp">
<node concept="10M0yZ" id="7bplM0p9t_X" role="3cqZAk">
<ref role="1PxDUh" to="54ve:~CellStyle" resolve="CellStyle" />
<ref role="3cqZAo" to="54ve:~CellStyle.ALIGN_JUSTIFY" resolve="ALIGN_JUSTIFY" />
<node concept="Rm8GO" id="2tOXMOyzkTJ" role="3cqZAk">
<ref role="Rm8GQ" to="54ve:~HorizontalAlignment.JUSTIFY" resolve="JUSTIFY" />
<ref role="1Px2BO" to="54ve:~HorizontalAlignment" resolve="HorizontalAlignment" />
</node>
</node>
</node>
Expand Down Expand Up @@ -551,9 +553,9 @@
</node>
</node>
<node concept="3cpWs6" id="1LnB5xdHLeH" role="3cqZAp">
<node concept="10M0yZ" id="7bplM0p9tVe" role="3cqZAk">
<ref role="1PxDUh" to="54ve:~CellStyle" resolve="CellStyle" />
<ref role="3cqZAo" to="54ve:~CellStyle.ALIGN_LEFT" resolve="ALIGN_LEFT" />
<node concept="Rm8GO" id="2tOXMOyzl5v" role="3cqZAk">
<ref role="Rm8GQ" to="54ve:~HorizontalAlignment.LEFT" resolve="LEFT" />
<ref role="1Px2BO" to="54ve:~HorizontalAlignment" resolve="HorizontalAlignment" />
</node>
</node>
<node concept="3clFbH" id="1LnB5xdHLdT" role="3cqZAp" />
Expand All @@ -562,22 +564,24 @@
<property role="TrG5h" value="alignment" />
<node concept="10Oyi0" id="1LnB5xdHLdI" role="1tU5fm" />
</node>
<node concept="3uibUv" id="2tOXMOyziTl" role="3clF45">
<ref role="3uigEE" to="54ve:~HorizontalAlignment" resolve="HorizontalAlignment" />
</node>
</node>
</node>
<node concept="312cEu" id="1LnB5xdHRnk">
<property role="TrG5h" value="BorderHelper" />
<node concept="3Tm1VV" id="1LnB5xdHRoi" role="1B3o_S" />
<node concept="2YIFZL" id="1LnB5xdHRnl" role="jymVt">
<property role="TrG5h" value="borderFor" />
<node concept="10N3zO" id="1LnB5xdHRnm" role="3clF45" />
<node concept="3Tm1VV" id="1LnB5xdHRnn" role="1B3o_S" />
<node concept="3clFbS" id="1LnB5xdHRno" role="3clF47">
<node concept="3clFbJ" id="1LnB5xdHRnp" role="3cqZAp">
<node concept="3clFbS" id="1LnB5xdHRnq" role="3clFbx">
<node concept="3cpWs6" id="1LnB5xdHRnr" role="3cqZAp">
<node concept="10M0yZ" id="7bplM0p9uCc" role="3cqZAk">
<ref role="1PxDUh" to="54ve:~CellStyle" resolve="CellStyle" />
<ref role="3cqZAo" to="54ve:~CellStyle.BORDER_THIN" resolve="BORDER_THIN" />
<node concept="Rm8GO" id="2tOXMOyzeGJ" role="3cqZAk">
<ref role="Rm8GQ" to="54ve:~BorderStyle.THIN" resolve="THIN" />
<ref role="1Px2BO" to="54ve:~BorderStyle" resolve="BorderStyle" />
</node>
</node>
</node>
Expand Down Expand Up @@ -617,9 +621,9 @@
<node concept="3clFbJ" id="1LnB5xdHRnA" role="3cqZAp">
<node concept="3clFbS" id="1LnB5xdHRnB" role="3clFbx">
<node concept="3cpWs6" id="1LnB5xdHRnC" role="3cqZAp">
<node concept="10M0yZ" id="7bplM0p9uY6" role="3cqZAk">
<ref role="1PxDUh" to="54ve:~CellStyle" resolve="CellStyle" />
<ref role="3cqZAo" to="54ve:~CellStyle.BORDER_MEDIUM" resolve="BORDER_MEDIUM" />
<node concept="Rm8GO" id="2tOXMOyzfEH" role="3cqZAk">
<ref role="Rm8GQ" to="54ve:~BorderStyle.MEDIUM" resolve="MEDIUM" />
<ref role="1Px2BO" to="54ve:~BorderStyle" resolve="BorderStyle" />
</node>
</node>
</node>
Expand Down Expand Up @@ -659,9 +663,9 @@
<node concept="3clFbJ" id="1LnB5xdHRnN" role="3cqZAp">
<node concept="3clFbS" id="1LnB5xdHRnO" role="3clFbx">
<node concept="3cpWs6" id="1LnB5xdHRnP" role="3cqZAp">
<node concept="10M0yZ" id="7bplM0p9vkw" role="3cqZAk">
<ref role="1PxDUh" to="54ve:~CellStyle" resolve="CellStyle" />
<ref role="3cqZAo" to="54ve:~CellStyle.BORDER_THICK" resolve="BORDER_THICK" />
<node concept="Rm8GO" id="2tOXMOyzgCJ" role="3cqZAk">
<ref role="Rm8GQ" to="54ve:~BorderStyle.THICK" resolve="THICK" />
<ref role="1Px2BO" to="54ve:~BorderStyle" resolve="BorderStyle" />
</node>
</node>
</node>
Expand Down Expand Up @@ -701,9 +705,9 @@
<node concept="3clFbJ" id="1LnB5xdHRo0" role="3cqZAp">
<node concept="3clFbS" id="1LnB5xdHRo1" role="3clFbx">
<node concept="3cpWs6" id="1LnB5xdHRo2" role="3cqZAp">
<node concept="10M0yZ" id="7bplM0p9vEU" role="3cqZAk">
<ref role="1PxDUh" to="54ve:~CellStyle" resolve="CellStyle" />
<ref role="3cqZAo" to="54ve:~CellStyle.BORDER_DOUBLE" resolve="BORDER_DOUBLE" />
<node concept="Rm8GO" id="2tOXMOyzgRN" role="3cqZAk">
<ref role="Rm8GQ" to="54ve:~BorderStyle.DOUBLE" resolve="DOUBLE" />
<ref role="1Px2BO" to="54ve:~BorderStyle" resolve="BorderStyle" />
</node>
</node>
</node>
Expand Down Expand Up @@ -741,9 +745,9 @@
</node>
</node>
<node concept="3cpWs6" id="1LnB5xdHRod" role="3cqZAp">
<node concept="10M0yZ" id="7bplM0p9w1k" role="3cqZAk">
<ref role="1PxDUh" to="54ve:~CellStyle" resolve="CellStyle" />
<ref role="3cqZAo" to="54ve:~CellStyle.BORDER_NONE" resolve="BORDER_NONE" />
<node concept="Rm8GO" id="2tOXMOyzdJ5" role="3cqZAk">
<ref role="Rm8GQ" to="54ve:~BorderStyle.NONE" resolve="NONE" />
<ref role="1Px2BO" to="54ve:~BorderStyle" resolve="BorderStyle" />
</node>
</node>
<node concept="3clFbH" id="1LnB5xdHRof" role="3cqZAp" />
Expand All @@ -752,6 +756,9 @@
<property role="TrG5h" value="border" />
<node concept="10Oyi0" id="1LnB5xdHRoh" role="1tU5fm" />
</node>
<node concept="3uibUv" id="2tOXMOyzc23" role="3clF45">
<ref role="3uigEE" to="54ve:~BorderStyle" resolve="BorderStyle" />
</node>
</node>
</node>
</model>
Expand Down
Loading

0 comments on commit 9f7aac4

Please sign in to comment.