diff --git a/build.gradle.kts b/build.gradle.kts index f35ab44ec..ae2279c39 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -83,6 +83,7 @@ configurations { val jbrWin by creating val jbrMac by creating val jbrLinux by creating + val docx4j by creating dependencies { mps("com.jetbrains:mps:$mpsVersion") @@ -92,6 +93,8 @@ configurations { jbrWin("com.jetbrains.jdk:jbr_jcef:$jbrVers:windows-x64@tgz") jbrMac("com.jetbrains.jdk:jbr_jcef:$jbrVers:osx-x64@tgz") jbrLinux("com.jetbrains.jdk:jbr_jcef:$jbrVers:linux-x64@tgz") + docx4j("org.docx4j:docx4j-diffx:11.4.11") + docx4j("org.docx4j:docx4j-JAXB-MOXy:11.4.11") } } @@ -171,12 +174,20 @@ tasks { } } + val resolveLanguageLibs by registering(Copy::class) { dependsOn(configureJava) from({ configurations["languageLibs"].resolve().map(::zipTree) }) into(dependenciesDir) } + val resolveDocx4j by registering(Sync::class) { + duplicatesStrategy = DuplicatesStrategy.INCLUDE + dependsOn(configureJava) + from({ configurations["docx4j"].resolve() }) + into("code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib") + } + // "com.fasten.safety.rcp.pluginSolution" makes use of the mbeddr actionsfilter plugin. // The "actionsfilter" plugin and dependencies must be copied to "MPS\plugins" folder in order to load properly. val copy_mbeddr_actionsfilter by registering { @@ -205,7 +216,7 @@ tasks { fun scriptFile(name: String): Provider = layout.buildDirectory.file("scripts/$name") val build_allScripts_unpatched by registering(BuildLanguages::class) { - dependsOn(resolveMps, resolveLanguageLibs) + dependsOn(resolveMps, resolveLanguageLibs,resolveDocx4j) script = scriptFile("build_all_scripts.xml") } diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps index d5db9b880..acdb83db4 100644 --- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps +++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps @@ -489,15 +489,18 @@ - - + + - + + + + @@ -1107,18 +1110,18 @@ - - - + + + - + - + - + - - + + @@ -1126,18 +1129,18 @@ - - - + + + - + - + - + - - + + @@ -1145,18 +1148,18 @@ - - - + + + - + - + - + - - + + @@ -1164,18 +1167,18 @@ - - - + + + - + - + - + - - + + @@ -1183,18 +1186,18 @@ - - - + + + - + - + - + - - + + @@ -1202,21 +1205,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1224,21 +1224,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1246,21 +1243,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1268,21 +1262,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1290,21 +1281,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1312,21 +1300,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1334,21 +1319,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1356,21 +1338,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1378,21 +1357,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1400,21 +1376,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1422,21 +1395,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1444,21 +1414,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1466,21 +1433,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1488,21 +1452,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1510,21 +1471,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1532,21 +1490,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1554,21 +1509,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1576,21 +1528,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1598,21 +1547,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1620,21 +1566,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1642,21 +1585,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1664,21 +1604,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1686,21 +1623,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1708,21 +1642,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1730,21 +1661,75 @@ - - - + + + - + - + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2614,68 +2599,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2702,11 +2625,6 @@ - - - - - diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps index 6dc7b6ee6..54a50c85b 100644 --- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps +++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps @@ -582,25 +582,28 @@ - - - - - - - + + - + - - - + + + + + + + + + + + @@ -1359,18 +1362,18 @@ - - - + + + - + - + - + - - + + @@ -1378,18 +1381,18 @@ - - - + + + - + - + - + - - + + @@ -1397,18 +1400,18 @@ - - - + + + - + - + - + - - + + @@ -1416,18 +1419,18 @@ - - - + + + - + - + - + - - + + @@ -1435,18 +1438,18 @@ - - - + + + - + - + - + - - + + @@ -1454,21 +1457,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1476,21 +1476,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1498,21 +1495,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1520,21 +1514,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1542,21 +1533,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1564,21 +1552,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1586,21 +1571,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1608,21 +1590,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1630,21 +1609,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1652,21 +1628,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1674,21 +1647,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1696,21 +1666,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1718,21 +1685,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1740,21 +1704,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1762,21 +1723,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1784,21 +1742,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1806,21 +1761,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1828,21 +1780,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1850,21 +1799,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1872,21 +1818,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1894,21 +1837,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1916,21 +1856,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1938,21 +1875,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1960,21 +1894,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1982,21 +1913,75 @@ - - - + + + - + - + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2866,68 +2851,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2954,11 +2877,6 @@ - - - - - diff --git a/code/languages/com.mpsbasics/.mps/libraries.xml b/code/languages/com.mpsbasics/.mps/libraries.xml new file mode 100644 index 000000000..6b84430d8 --- /dev/null +++ b/code/languages/com.mpsbasics/.mps/libraries.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/code/languages/com.mpsbasics/.mps/modules.xml b/code/languages/com.mpsbasics/.mps/modules.xml index 114a6c14c..87dacf675 100644 --- a/code/languages/com.mpsbasics/.mps/modules.xml +++ b/code/languages/com.mpsbasics/.mps/modules.xml @@ -6,7 +6,6 @@ - diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.build/models/com.mpsbasics.build.build.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.build/models/com.mpsbasics.build.build.mps index 2fda48187..338fc2094 100644 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.build/models/com.mpsbasics.build.build.mps +++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.build/models/com.mpsbasics.build.build.mps @@ -11,6 +11,9 @@ + + + @@ -115,7 +118,6 @@ - @@ -247,25 +249,28 @@ - - - - - - - + + - + - - - + + + + + + + + + + + @@ -455,7 +460,6 @@ - @@ -494,18 +498,18 @@ - - - + + + - + - + - + - - + + @@ -513,18 +517,18 @@ - - - + + + - + - + - + - - + + @@ -532,18 +536,18 @@ - - - + + + - + - + - + - - + + @@ -551,18 +555,18 @@ - - - + + + - + - + - + - - + + @@ -570,18 +574,18 @@ - - - + + + - + - + - + - - + + @@ -589,21 +593,18 @@ - - - + + + - + - + - + - - - - - + + @@ -611,21 +612,18 @@ - - - + + + - + - + - + - - - - - + + @@ -633,21 +631,18 @@ - - - + + + - + - + - + - - - - - + + @@ -655,21 +650,18 @@ - - - + + + - + - + - + - - - - - + + @@ -677,21 +669,18 @@ - - - + + + - + - + - + - - - - - + + @@ -699,21 +688,18 @@ - - - + + + - + - + - + - - - - - + + @@ -721,21 +707,18 @@ - - - + + + - + - + - + - - - - - + + @@ -743,21 +726,18 @@ - - - + + + - + - + - + - - - - - + + @@ -765,21 +745,18 @@ - - - + + + - + - + - + - - - - - + + @@ -787,21 +764,18 @@ - - - + + + - + - + - + - - - - - + + @@ -809,21 +783,18 @@ - - - + + + - + - + - + - - - - - + + @@ -831,21 +802,18 @@ - - - + + + - + - + - + - - - - - + + @@ -853,21 +821,18 @@ - - - + + + - + - + - + - - - - - + + @@ -875,21 +840,18 @@ - - - + + + - + - + - + - - - - - + + @@ -897,21 +859,18 @@ - - - + + + - + - + - + - - - - - + + @@ -919,21 +878,18 @@ - - - + + + - + - + - + - - - - - + + @@ -941,21 +897,18 @@ - - - + + + - + - + - + - - - - - + + @@ -963,21 +916,18 @@ - - - + + + - + - + - + - - - - - + + @@ -985,21 +935,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1007,21 +954,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1029,21 +973,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1051,21 +992,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1073,21 +1011,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1095,21 +1030,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1117,21 +1049,18 @@ - - - + + + - + - + - + - - - - - + + @@ -1139,49 +1068,37 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + - + - - - + + + - - + + @@ -1189,23 +1106,29 @@ - - - - - - + + + - + - - + + + + + + + + + + + @@ -1232,11 +1155,6 @@ - - - - - diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/com.mpsbasics.docx4j.diffx.lib.msd b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/com.mpsbasics.docx4j.diffx.lib.msd deleted file mode 100644 index ecdcc49e3..000000000 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/com.mpsbasics.docx4j.diffx.lib.msd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - 71bb25aa-20fa-4c18-8954-1b176576f52d(com.mpsbasics.docx4j.lib) - - - - - - - - - - - - - - diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/lib/docx4j-diffx-11.4.9.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/lib/docx4j-diffx-11.4.9.jar deleted file mode 100644 index 889174853..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/lib/docx4j-diffx-11.4.9.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/com.mpsbasics.docx4j.lib.msd b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/com.mpsbasics.docx4j.lib.msd index eb03c4566..eece533fb 100644 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/com.mpsbasics.docx4j.lib.msd +++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/com.mpsbasics.docx4j.lib.msd @@ -1,73 +1,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/.gitignore b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/.gitignore new file mode 100644 index 000000000..c96a04f00 --- /dev/null +++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/antlr-2.7.7.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/antlr-2.7.7.jar deleted file mode 100644 index 5e5f14b35..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/antlr-2.7.7.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/antlr-runtime-3.5.2.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/antlr-runtime-3.5.2.jar deleted file mode 100644 index d48e3e867..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/antlr-runtime-3.5.2.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/checker-qual-2.8.1.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/checker-qual-2.8.1.jar deleted file mode 100644 index 09269be6a..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/checker-qual-2.8.1.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-codec-1.12.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-codec-1.12.jar deleted file mode 100644 index 531478ea9..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-codec-1.12.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-compress-1.21.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-compress-1.21.jar deleted file mode 100644 index 4892334d0..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-compress-1.21.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-io-2.7.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-io-2.7.jar deleted file mode 100644 index 588945892..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-io-2.7.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-lang3-3.9.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-lang3-3.9.jar deleted file mode 100644 index 0d8969392..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-lang3-3.9.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/error_prone_annotations-2.3.3.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/error_prone_annotations-2.3.3.jar deleted file mode 100644 index 8fe4938d9..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/error_prone_annotations-2.3.3.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/fontbox-2.0.24.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/fontbox-2.0.24.jar deleted file mode 100644 index e93794c15..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/fontbox-2.0.24.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.activation-2.0.1.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.activation-2.0.1.jar deleted file mode 100644 index 521c7c49f..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.activation-2.0.1.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.mail-2.0.1.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.mail-2.0.1.jar deleted file mode 100644 index 17e07ccfe..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.mail-2.0.1.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.xml.bind-api-3.0.1.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.xml.bind-api-3.0.1.jar deleted file mode 100644 index f890cba5e..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.xml.bind-api-3.0.1.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jaxb-svg11-11.4.0.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jaxb-svg11-11.4.0.jar deleted file mode 100644 index 9e2a2d8bf..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jaxb-svg11-11.4.0.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jcl-over-slf4j-2.0.0-alpha5.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jcl-over-slf4j-2.0.0-alpha5.jar deleted file mode 100644 index a472dc73c..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jcl-over-slf4j-2.0.0-alpha5.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/mbassador-1.3.2.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/mbassador-1.3.2.jar deleted file mode 100644 index 203655868..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/mbassador-1.3.2.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.asm-9.1.0.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.asm-9.1.0.jar deleted file mode 100644 index d1b3b5997..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.asm-9.1.0.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.core-3.0.2.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.core-3.0.2.jar deleted file mode 100644 index 2ca27d75a..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.core-3.0.2.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.moxy-3.0.2.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.moxy-3.0.2.jar deleted file mode 100644 index f762d2da1..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.moxy-3.0.2.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/qdox-1.12.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/qdox-1.12.jar deleted file mode 100644 index 3d850e5f5..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/qdox-1.12.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/slf4j-api-2.0.0-alpha6.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/slf4j-api-2.0.0-alpha6.jar deleted file mode 100644 index 6e43ddd65..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/slf4j-api-2.0.0-alpha6.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/stringtemplate-3.2.1.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/stringtemplate-3.2.1.jar deleted file mode 100644 index d0e11b719..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/stringtemplate-3.2.1.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/wmf2svg-0.9.8.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/wmf2svg-0.9.8.jar deleted file mode 100644 index 50fa35544..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/wmf2svg-0.9.8.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xalan-interpretive-11.0.0.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xalan-interpretive-11.0.0.jar deleted file mode 100644 index 80011e32c..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xalan-interpretive-11.0.0.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xalan-serializer-11.0.0.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xalan-serializer-11.0.0.jar deleted file mode 100644 index cc95d45fa..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xalan-serializer-11.0.0.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xmlgraphics-commons-2.7.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xmlgraphics-commons-2.7.jar deleted file mode 100644 index 7396f1307..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xmlgraphics-commons-2.7.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-JAXB-MOXy-11.4.9.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-JAXB-MOXy-11.4.9.jar deleted file mode 100644 index 2152221fe..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-JAXB-MOXy-11.4.9.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-core-11.4.9.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-core-11.4.9.jar deleted file mode 100644 index 4f52fb23a..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-core-11.4.9.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-11.4.9.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-11.4.9.jar deleted file mode 100644 index f00409f57..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-11.4.9.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-pml-11.4.9.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-pml-11.4.9.jar deleted file mode 100644 index ad1a7b3fa..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-pml-11.4.9.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-sml-11.4.9.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-sml-11.4.9.jar deleted file mode 100644 index 783ddaad3..000000000 Binary files a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-sml-11.4.9.jar and /dev/null differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd index eb751678e..0680d2478 100644 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd +++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd @@ -1,7 +1,7 @@ - + @@ -13,7 +13,6 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 71bb25aa-20fa-4c18-8954-1b176576f52d(com.mpsbasics.docx4j.lib) - 1cb48442-05da-4cad-b5c5-e31ddd69e322(com.mpsbasics.docx4j.diffx.lib) diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/models/com.mpsbasics.docx4j.testutils.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/models/com.mpsbasics.docx4j.testutils.mps index c3a6123d4..45de3e373 100644 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/models/com.mpsbasics.docx4j.testutils.mps +++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/models/com.mpsbasics.docx4j.testutils.mps @@ -15,7 +15,7 @@ - + @@ -323,7 +323,7 @@ - +