Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docx4j to 11.4.11 #118

Merged
merged 2 commits into from
Nov 25, 2024
Merged

Update docx4j to 11.4.11 #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30cffa6
com.mpsbasics: add a libraries.xml
alexanderpann Nov 14, 2024
89aac03
upgrade docx4j to 11.4.11
alexanderpann Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
}
}

Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -205,7 +216,7 @@ tasks {
fun scriptFile(name: String): Provider<RegularFile> = 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")
}

Expand Down
688 changes: 303 additions & 385 deletions ....formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
View file
Open in desktop

Large diffs are not rendered by default.

704 changes: 311 additions & 393 deletions ...safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions code/languages/com.mpsbasics/.mps/libraries.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectLibraryManager">
<option name="libraries">
<map>
<entry key="dependencies">
<value>
<Library>
<option name="name" value="dependencies" />
<option name="path" value="${mbeddr.formal.home}/build/dependencies" />
</Library>
</value>
</entry>
</map>
</option>
</component>
</project>
1 change: 0 additions & 1 deletion code/languages/com.mpsbasics/.mps/modules.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<modulePath path="$PROJECT_DIR$/languages/com.mpsbasics.pdfexporter/com.mpsbasics.pdfexporter.mpl" folder="pdfbox" />
<modulePath path="$PROJECT_DIR$/solutions/com.mpsbasics.build/com.mpsbasics.build.msd" folder="" />
<modulePath path="$PROJECT_DIR$/solutions/com.mpsbasics.docx4j.core/com.mpsbasics.docx4j.core.msd" folder="docx4j" />
<modulePath path="$PROJECT_DIR$/solutions/com.mpsbasics.docx4j.diffx.lib/com.mpsbasics.docx4j.diffx.lib.msd" folder="docx4j" />
<modulePath path="$PROJECT_DIR$/solutions/com.mpsbasics.docx4j.lib/com.mpsbasics.docx4j.lib.msd" folder="docx4j" />
<modulePath path="$PROJECT_DIR$/solutions/com.mpsbasics.docx4j.sandbox/com.mpsbasics.docx4j.sandbox.msd" folder="docx4j" />
<modulePath path="$PROJECT_DIR$/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd" folder="docx4j" />
Expand Down
674 changes: 296 additions & 378 deletions ...anguages/com.mpsbasics/solutions/com.mpsbasics.build/models/com.mpsbasics.build.build.mps
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 0 additions & 30 deletions ...com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/com.mpsbasics.docx4j.diffx.lib.msd
View file
Open in desktop

This file was deleted.

Binary file removed ...guages/com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/lib/docx4j-diffx-11.4.9.jar
View file
Open in desktop
Binary file not shown.
97 changes: 35 additions & 62 deletions code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/com.mpsbasics.docx4j.lib.msd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,73 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<solution name="com.mpsbasics.docx4j.lib" uuid="71bb25aa-20fa-4c18-8954-1b176576f52d" moduleVersion="0">
<models>
<modelRoot type="java_classes" contentPath="${module}/lib">
<sourceRoot location="docx4j-core-11.4.9.jar" />
<sourceRoot location="docx4j-openxml-objects-11.4.9.jar" />
<sourceRoot location="docx4j-openxml-objects-pml-11.4.9.jar" />
<sourceRoot location="docx4j-openxml-objects-sml-11.4.9.jar" />
<sourceRoot location="dependencies/antlr-2.7.7.jar" />
<sourceRoot location="dependencies/antlr-runtime-3.5.2.jar" />
<sourceRoot location="dependencies/checker-qual-2.8.1.jar" />
<sourceRoot location="dependencies/commons-codec-1.12.jar" />
<sourceRoot location="dependencies/commons-compress-1.21.jar" />
<sourceRoot location="dependencies/commons-io-2.7.jar" />
<sourceRoot location="dependencies/commons-lang3-3.9.jar" />
<sourceRoot location="dependencies/error_prone_annotations-2.3.3.jar" />
<sourceRoot location="dependencies/fontbox-2.0.24.jar" />
<sourceRoot location="dependencies/jakarta.activation-2.0.1.jar" />
<sourceRoot location="dependencies/jakarta.xml.bind-api-3.0.1.jar" />
<sourceRoot location="dependencies/jaxb-svg11-11.4.0.jar" />
<sourceRoot location="dependencies/jcl-over-slf4j-2.0.0-alpha5.jar" />
<sourceRoot location="dependencies/mbassador-1.3.2.jar" />
<sourceRoot location="dependencies/qdox-1.12.jar" />
<sourceRoot location="dependencies/slf4j-api-2.0.0-alpha6.jar" />
<sourceRoot location="dependencies/stringtemplate-3.2.1.jar" />
<sourceRoot location="dependencies/wmf2svg-0.9.8.jar" />
<sourceRoot location="dependencies/xalan-interpretive-11.0.0.jar" />
<sourceRoot location="dependencies/xalan-serializer-11.0.0.jar" />
<sourceRoot location="dependencies/xmlgraphics-commons-2.7.jar" />
<sourceRoot location="docx4j-JAXB-MOXy-11.4.9.jar" />
<sourceRoot location="dependencies/org.eclipse.persistence.asm-9.1.0.jar" />
<sourceRoot location="dependencies/org.eclipse.persistence.core-3.0.2.jar" />
<sourceRoot location="dependencies/org.eclipse.persistence.moxy-3.0.2.jar" />
<sourceRoot location="dependencies/jakarta.mail-2.0.1.jar" />
<modelRoot type="java_classes" contentPath="${module}">
<sourceRoot location="lib" />
</modelRoot>
<modelRoot type="java_classes" contentPath="${module}/lib" />
</models>
<facets>
<facet type="java" languageLevel="JAVA_8" compile="mps" classes="mps" ext="yes">
<classes generated="true" path="${module}/classes_gen" />
<library location="${module}/lib/docx4j-core-11.4.9.jar" />
<library location="${module}/lib/docx4j-JAXB-MOXy-11.4.9.jar" />
<library location="${module}/lib/docx4j-openxml-objects-11.4.9.jar" />
<library location="${module}/lib/docx4j-openxml-objects-pml-11.4.9.jar" />
<library location="${module}/lib/docx4j-openxml-objects-sml-11.4.9.jar" />
<library location="${module}/lib/dependencies/antlr-2.7.7.jar" />
<library location="${module}/lib/dependencies/antlr-runtime-3.5.2.jar" />
<library location="${module}/lib/dependencies/checker-qual-2.8.1.jar" />
<library location="${module}/lib/dependencies/commons-codec-1.12.jar" />
<library location="${module}/lib/dependencies/commons-compress-1.21.jar" />
<library location="${module}/lib/dependencies/commons-io-2.7.jar" />
<library location="${module}/lib/dependencies/commons-lang3-3.9.jar" />
<library location="${module}/lib/dependencies/error_prone_annotations-2.3.3.jar" />
<library location="${module}/lib/dependencies/fontbox-2.0.24.jar" />
<library location="${module}/lib/dependencies/jakarta.activation-2.0.1.jar" />
<library location="${module}/lib/dependencies/jakarta.mail-2.0.1.jar" />
<library location="${module}/lib/dependencies/jakarta.xml.bind-api-3.0.1.jar" />
<library location="${module}/lib/dependencies/jaxb-svg11-11.4.0.jar" />
<library location="${module}/lib/dependencies/jcl-over-slf4j-2.0.0-alpha5.jar" />
<library location="${module}/lib/dependencies/mbassador-1.3.2.jar" />
<library location="${module}/lib/dependencies/org.eclipse.persistence.asm-9.1.0.jar" />
<library location="${module}/lib/dependencies/org.eclipse.persistence.core-3.0.2.jar" />
<library location="${module}/lib/dependencies/org.eclipse.persistence.moxy-3.0.2.jar" />
<library location="${module}/lib/dependencies/qdox-1.12.jar" />
<library location="${module}/lib/dependencies/slf4j-api-2.0.0-alpha6.jar" />
<library location="${module}/lib/dependencies/stringtemplate-3.2.1.jar" />
<library location="${module}/lib/dependencies/wmf2svg-0.9.8.jar" />
<library location="${module}/lib/dependencies/xalan-interpretive-11.0.0.jar" />
<library location="${module}/lib/dependencies/xalan-serializer-11.0.0.jar" />
<library location="${module}/lib/dependencies/xmlgraphics-commons-2.7.jar" />
<library location="${module}/lib/antlr-2.7.7.jar" />
<library location="${module}/lib/antlr-runtime-3.5.3.jar" />
<library location="${module}/lib/checker-qual-3.42.0.jar" />
<library location="${module}/lib/commons-codec-1.16.0.jar" />
<library location="${module}/lib/commons-compress-1.26.0.jar" />
<library location="${module}/lib/commons-io-2.15.1.jar" />
<library location="${module}/lib/commons-lang3-3.14.0.jar" />
<library location="${module}/lib/docx4j-core-11.4.11.jar" />
<library location="${module}/lib/docx4j-diffx-11.4.11.jar" />
<library location="${module}/lib/docx4j-JAXB-MOXy-11.4.11.jar" />
<library location="${module}/lib/docx4j-openxml-objects-11.4.11.jar" />
<library location="${module}/lib/docx4j-openxml-objects-pml-11.4.11.jar" />
<library location="${module}/lib/docx4j-openxml-objects-sml-11.4.11.jar" />
<library location="${module}/lib/error_prone_annotations-2.3.3.jar" />
<library location="${module}/lib/fontbox-2.0.30.jar" />
<library location="${module}/lib/jakarta.activation-2.0.1.jar" />
<library location="${module}/lib/jakarta.activation-api-2.1.0.jar" />
<library location="${module}/lib/jakarta.mail-2.0.1.jar" />
<library location="${module}/lib/jakarta.mail-api-2.1.0.jar" />
<library location="${module}/lib/jakarta.xml.bind-api-3.0.1.jar" />
<library location="${module}/lib/jaxb-svg11-11.4.0.jar" />
<library location="${module}/lib/jcl-over-slf4j-2.0.12.jar" />
<library location="${module}/lib/mbassador-1.3.2.jar" />
<library location="${module}/lib/org.eclipse.persistence.asm-9.1.0.jar" />
<library location="${module}/lib/org.eclipse.persistence.core-3.0.2.jar" />
<library location="${module}/lib/org.eclipse.persistence.moxy-3.0.2.jar" />
<library location="${module}/lib/qdox-1.12.jar" />
<library location="${module}/lib/slf4j-api-2.0.12.jar" />
<library location="${module}/lib/stringtemplate-3.2.1.jar" />
<library location="${module}/lib/wmf2svg-0.9.11.jar" />
<library location="${module}/lib/xalan-interpretive-11.0.0.jar" />
<library location="${module}/lib/xalan-serializer-11.0.0.jar" />
<library location="${module}/lib/xmlgraphics-commons-2.9.jar" />
</facet>
</facets>
<dependencies>
Expand Down
2 changes: 2 additions & 0 deletions code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*
!.gitignore
Binary file removed ...nguages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/antlr-2.7.7.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/antlr-runtime-3.5.2.jar
View file
Open in desktop
Binary file not shown.
Binary file removed .../com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/checker-qual-2.8.1.jar
View file
Open in desktop
Binary file not shown.
Binary file removed .../com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-codec-1.12.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...m.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-compress-1.21.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...ages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-io-2.7.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...s/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/commons-lang3-3.9.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...ics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/error_prone_annotations-2.3.3.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...ages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/fontbox-2.0.24.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...psbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.activation-2.0.1.jar
View file
Open in desktop
Binary file not shown.
Binary file removed .../com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.mail-2.0.1.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...basics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jakarta.xml.bind-api-3.0.1.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...s/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jaxb-svg11-11.4.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...asics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/jcl-over-slf4j-2.0.0-alpha5.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...ges/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/mbassador-1.3.2.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...solutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.asm-9.1.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...olutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.core-3.0.2.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...olutions/com.mpsbasics.docx4j.lib/lib/dependencies/org.eclipse.persistence.moxy-3.0.2.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/qdox-1.12.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ....mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/slf4j-api-2.0.0-alpha6.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...om.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/stringtemplate-3.2.1.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...uages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/wmf2svg-0.9.8.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...sbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xalan-interpretive-11.0.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xalan-serializer-11.0.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/dependencies/xmlgraphics-commons-2.7.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...anguages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-JAXB-MOXy-11.4.9.jar
View file
Open in desktop
Binary file not shown.
Binary file removed code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-core-11.4.9.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...es/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-11.4.9.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...om.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-pml-11.4.9.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...om.mpsbasics/solutions/com.mpsbasics.docx4j.lib/lib/docx4j-openxml-objects-sml-11.4.9.jar
View file
Open in desktop
Binary file not shown.
3 changes: 1 addition & 2 deletions ...com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<solution name="com.mpsbasics.docx4j.testutils" uuid="5f04c496-eb21-4501-981b-4e5fc2ab46ec" moduleVersion="0">
<models>
<modelRoot contentPath="${module}" type="default">
<modelRoot type="default" contentPath="${module}">
<sourceRoot location="models" />
</modelRoot>
</models>
Expand All @@ -13,7 +13,6 @@
<dependencies>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
<dependency reexport="false">71bb25aa-20fa-4c18-8954-1b176576f52d(com.mpsbasics.docx4j.lib)</dependency>
<dependency reexport="false">1cb48442-05da-4cad-b5c5-e31ddd69e322(com.mpsbasics.docx4j.diffx.lib)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
Expand Down
4 changes: 2 additions & 2 deletions ...basics/solutions/com.mpsbasics.docx4j.testutils/models/com.mpsbasics.docx4j.testutils.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
<import index="5zxs" ref="71bb25aa-20fa-4c18-8954-1b176576f52d/java:org.docx4j.openpackaging.packages(com.mpsbasics.docx4j.lib/)" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
<import index="mtwz" ref="1cb48442-05da-4cad-b5c5-e31ddd69e322/java:org.docx4j.diff(com.mpsbasics.docx4j.diffx.lib/)" />
<import index="mtwz" ref="71bb25aa-20fa-4c18-8954-1b176576f52d/java:org.docx4j.diff(com.mpsbasics.docx4j.lib/)" />
</imports>
<registry>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
Expand Down Expand Up @@ -323,7 +323,7 @@
<ref role="3uigEE" to="mtwz:~Differencer" resolve="Differencer" />
</node>
<node concept="2ShNRf" id="4ziKDEndpgL" role="33vP2m">
<node concept="1pGfFk" id="5QnufgdhSQ1" role="2ShVmc">
<node concept="1pGfFk" id="Kl54_$nNGH" role="2ShVmc">
<ref role="37wK5l" to="mtwz:~Differencer.&lt;init&gt;()" resolve="Differencer" />
</node>
</node>
Expand Down
Loading