From e50350ec1b165ec14e9aba161610c1f3c7d088ab Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Thu, 6 Jul 2023 21:34:22 +0300 Subject: [PATCH 01/16] Pass HDR, HDR, and FTR params as URL Signed-off-by: Jarno Elovirta --- .../plugins/org.dita.html5/build_dita2html5_template.xml | 9 ++++++--- .../plugins/org.dita.xhtml/build_general_template.xml | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/plugins/org.dita.html5/build_dita2html5_template.xml b/src/main/plugins/org.dita.html5/build_dita2html5_template.xml index aca4778c93..f2e4c1ed51 100644 --- a/src/main/plugins/org.dita.html5/build_dita2html5_template.xml +++ b/src/main/plugins/org.dita.html5/build_dita2html5_template.xml @@ -35,6 +35,7 @@ See the accompanying LICENSE file for applicable license. + @@ -46,6 +47,7 @@ See the accompanying LICENSE file for applicable license. + @@ -57,6 +59,7 @@ See the accompanying LICENSE file for applicable license. + @@ -178,9 +181,9 @@ See the accompanying LICENSE file for applicable license. - - - + + + diff --git a/src/main/plugins/org.dita.xhtml/build_general_template.xml b/src/main/plugins/org.dita.xhtml/build_general_template.xml index 1c6b0e4612..302547ea95 100644 --- a/src/main/plugins/org.dita.xhtml/build_general_template.xml +++ b/src/main/plugins/org.dita.xhtml/build_general_template.xml @@ -23,6 +23,7 @@ See the accompanying LICENSE file for applicable license. + @@ -34,6 +35,7 @@ See the accompanying LICENSE file for applicable license. + @@ -45,6 +47,7 @@ See the accompanying LICENSE file for applicable license. + @@ -133,9 +136,9 @@ See the accompanying LICENSE file for applicable license. if:set="args.css.file" /> - - - + + + From 1f25ef86c939bf4c20efad35a573da3bc1ebff40 Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Tue, 11 Jul 2023 09:36:30 +0300 Subject: [PATCH 02/16] Fix running JUnit5 tests in Gradle Signed-off-by: Jarno Elovirta --- build.gradle | 1 + src/main/plugins/org.dita.htmlhelp/build.gradle | 4 ++++ src/main/plugins/org.dita.pdf2.fop/build.gradle | 4 ++++ src/main/plugins/org.dita.pdf2/build.gradle | 4 ++++ .../org/dita/dost/exception/DITAOTXMLErrorHandlerTest.java | 2 +- 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6dc7e07c3b..a93aece7b7 100644 --- a/build.gradle +++ b/build.gradle @@ -84,6 +84,7 @@ artifacts { } test { + useJUnitPlatform() exclude '**/IntegrationTest*.class' exclude '**/EndToEndTest*.class' } diff --git a/src/main/plugins/org.dita.htmlhelp/build.gradle b/src/main/plugins/org.dita.htmlhelp/build.gradle index 292a87fa2d..76ac880c73 100644 --- a/src/main/plugins/org.dita.htmlhelp/build.gradle +++ b/src/main/plugins/org.dita.htmlhelp/build.gradle @@ -29,6 +29,10 @@ dependencies { testImplementation rootProject.sourceSets.test.output } +test { + useJUnitPlatform() +} + jar.archiveFileName = "${project.name}.jar" task copyInstall(type: Copy) { diff --git a/src/main/plugins/org.dita.pdf2.fop/build.gradle b/src/main/plugins/org.dita.pdf2.fop/build.gradle index ce90c98248..4fa53b8389 100644 --- a/src/main/plugins/org.dita.pdf2.fop/build.gradle +++ b/src/main/plugins/org.dita.pdf2.fop/build.gradle @@ -28,6 +28,10 @@ dependencies { runtimeOnly group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.28' } +test { + useJUnitPlatform() +} + task copyInstall(type: Copy) { from (jar) from(sourceSets.main.runtimeClasspath) { diff --git a/src/main/plugins/org.dita.pdf2/build.gradle b/src/main/plugins/org.dita.pdf2/build.gradle index a3d98dead9..49c7d6bd27 100644 --- a/src/main/plugins/org.dita.pdf2/build.gradle +++ b/src/main/plugins/org.dita.pdf2/build.gradle @@ -33,6 +33,10 @@ sourceSets { } } +test { + useJUnitPlatform() +} + jar.archiveFileName = "${project.name}.jar" jar.include "com/idiominc/**" jar.include "com/suite/**" diff --git a/src/test/java/org/dita/dost/exception/DITAOTXMLErrorHandlerTest.java b/src/test/java/org/dita/dost/exception/DITAOTXMLErrorHandlerTest.java index 64a9624c67..f5f1242b69 100644 --- a/src/test/java/org/dita/dost/exception/DITAOTXMLErrorHandlerTest.java +++ b/src/test/java/org/dita/dost/exception/DITAOTXMLErrorHandlerTest.java @@ -19,7 +19,7 @@ public class DITAOTXMLErrorHandlerTest { private final DITAOTLogger logger = new TestLogger(); - private final DITAOTXMLErrorHandler e = new DITAOTXMLErrorHandler("path", logger, Configuration.Mode.LAX); + private final DITAOTXMLErrorHandler e = new DITAOTXMLErrorHandler("path", logger, Configuration.Mode.STRICT); private final SAXParseException se = new SAXParseException( "message", "publicId", From 1c419eb8d51754650e817776a95d2d9c0eb2909d Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Fri, 7 Jul 2023 08:17:26 +0300 Subject: [PATCH 03/16] Update Jackson to fix snakeyaml security vulnerabilities Signed-off-by: Jarno Elovirta --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index a93aece7b7..671db48066 100644 --- a/build.gradle +++ b/build.gradle @@ -46,9 +46,9 @@ dependencies { } implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32' implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.8' - implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.13.0' - implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.14.0' - implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.13.4' + implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.15.2' + implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.15.2' + implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.15.2' implementation group: 'org.relaxng', name: 'jing', version: '20181222' implementation group: 'org.apache.ant', name: 'ant-apache-resolver', version:'1.10.13' testImplementation group: 'nu.validator.htmlparser', name: 'htmlparser', version:'1.4' From 0acdf3591baec15e9ebad6b7798fdbc34966a055 Mon Sep 17 00:00:00 2001 From: Radu Coravu Date: Sun, 16 Jul 2023 19:31:48 +0300 Subject: [PATCH 04/16] Fix for #4234 XSD-based parsing works + small TC. Signed-off-by: Radu Coravu --- .../defaults/RelaxDefaultsParserConfiguration.java | 3 +-- .../org/dita/dost/IntegrationTestPreprocess1.java | 12 ++++++++++++ .../exp/preprocess/main.ditamap | 4 ++++ .../exp/preprocess/t1.dita | 6 ++++++ .../bookmap-xsd-based-validate/src/main.ditamap | 8 ++++++++ .../resources/bookmap-xsd-based-validate/src/t1.dita | 8 ++++++++ 6 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 src/test/resources/bookmap-xsd-based-validate/exp/preprocess/main.ditamap create mode 100644 src/test/resources/bookmap-xsd-based-validate/exp/preprocess/t1.dita create mode 100644 src/test/resources/bookmap-xsd-based-validate/src/main.ditamap create mode 100644 src/test/resources/bookmap-xsd-based-validate/src/t1.dita diff --git a/src/main/java/org/ditang/relaxng/defaults/RelaxDefaultsParserConfiguration.java b/src/main/java/org/ditang/relaxng/defaults/RelaxDefaultsParserConfiguration.java index 2f48c6bb4c..3a8dc12cf6 100644 --- a/src/main/java/org/ditang/relaxng/defaults/RelaxDefaultsParserConfiguration.java +++ b/src/main/java/org/ditang/relaxng/defaults/RelaxDefaultsParserConfiguration.java @@ -163,9 +163,8 @@ protected void insertRelaxDefaultsComponent() { public void setFeature(String featureId, boolean state) throws XMLConfigurationException { if (XERCES_SCHEMA_VALIDATION.equals(featureId)) { relaxNGValidation = state; - } else { - super.setFeature(featureId, state); } + super.setFeature(featureId, state); } @Override diff --git a/src/test/java/org/dita/dost/IntegrationTestPreprocess1.java b/src/test/java/org/dita/dost/IntegrationTestPreprocess1.java index a0a23e85b7..0daf3eb2b5 100644 --- a/src/test/java/org/dita/dost/IntegrationTestPreprocess1.java +++ b/src/test/java/org/dita/dost/IntegrationTestPreprocess1.java @@ -47,4 +47,16 @@ public void testRngGrammarPoolNoValidate() throws Throwable { .errorCount(0) .test(); } + + @Test + public void testXSDValidate() throws Throwable { + builder() + .name("bookmap-xsd-based-validate") + .transtype(PREPROCESS) + .input(Paths.get("main.ditamap")) + .put("validate", "true") + .warnCount(0) + .errorCount(0) + .test(); + } } diff --git a/src/test/resources/bookmap-xsd-based-validate/exp/preprocess/main.ditamap b/src/test/resources/bookmap-xsd-based-validate/exp/preprocess/main.ditamap new file mode 100644 index 0000000000..8d07b12ba7 --- /dev/null +++ b/src/test/resources/bookmap-xsd-based-validate/exp/preprocess/main.ditamap @@ -0,0 +1,4 @@ + + Main + T1T1 + \ No newline at end of file diff --git a/src/test/resources/bookmap-xsd-based-validate/exp/preprocess/t1.dita b/src/test/resources/bookmap-xsd-based-validate/exp/preprocess/t1.dita new file mode 100644 index 0000000000..dfe5c2f614 --- /dev/null +++ b/src/test/resources/bookmap-xsd-based-validate/exp/preprocess/t1.dita @@ -0,0 +1,6 @@ + + T1 + +

+ + \ No newline at end of file diff --git a/src/test/resources/bookmap-xsd-based-validate/src/main.ditamap b/src/test/resources/bookmap-xsd-based-validate/src/main.ditamap new file mode 100644 index 0000000000..3c972cdbf9 --- /dev/null +++ b/src/test/resources/bookmap-xsd-based-validate/src/main.ditamap @@ -0,0 +1,8 @@ + + + + Main + + + diff --git a/src/test/resources/bookmap-xsd-based-validate/src/t1.dita b/src/test/resources/bookmap-xsd-based-validate/src/t1.dita new file mode 100644 index 0000000000..4f93b4097d --- /dev/null +++ b/src/test/resources/bookmap-xsd-based-validate/src/t1.dita @@ -0,0 +1,8 @@ + + + T1 + +

+ + From 83880b8f706fa21f8fc169e384d0c4832853e7c5 Mon Sep 17 00:00:00 2001 From: Radu Coravu Date: Sun, 16 Jul 2023 20:57:09 +0300 Subject: [PATCH 05/16] Fix for #4234 Removed extra indent. Signed-off-by: Radu Coravu --- src/test/java/org/dita/dost/IntegrationTestPreprocess1.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/dita/dost/IntegrationTestPreprocess1.java b/src/test/java/org/dita/dost/IntegrationTestPreprocess1.java index 0daf3eb2b5..cd91fed435 100644 --- a/src/test/java/org/dita/dost/IntegrationTestPreprocess1.java +++ b/src/test/java/org/dita/dost/IntegrationTestPreprocess1.java @@ -47,7 +47,7 @@ public void testRngGrammarPoolNoValidate() throws Throwable { .errorCount(0) .test(); } - + @Test public void testXSDValidate() throws Throwable { builder() From e724715ae2eb0d8c44e1f0c214344d1bf4a6e1bf Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Mon, 17 Jul 2023 16:15:35 +0300 Subject: [PATCH 06/16] Show development content in README Signed-off-by: Jarno Elovirta --- README.markdown | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/README.markdown b/README.markdown index e06ac4997c..c759810946 100644 --- a/README.markdown +++ b/README.markdown @@ -9,7 +9,9 @@ For information on additional DITA and DITA-OT resources, see [SUPPORT]. To repo - [Prerequisites: Java 17](#prerequisites-java-17) - [Installing](#installing) - [Building output](#building-output) -- [For developers](#for-developers) +- [Development](#development) + - [Formatting code](#formatting-code) + - [Distribution builds](#distribution-builds) - [License](#license) ## Prerequisites: Java 17 @@ -65,10 +67,9 @@ You can generate output using the `dita` command-line tool included with DITA Op See the [documentation][docs] for arguments and [options]. -## For developers +## Development -
-Building the toolkit from source code and compiling the distribution package +Building the toolkit from source code and compiling the distribution package 1. Clone the DITA-OT Git repository: ```shell @@ -118,8 +119,6 @@ Prettier is used retain consistent Java formatting. For more information on the `-Xmx` option, see the [Java SE Documentation][javadoc]. -
- ## License DITA Open Toolkit is licensed for use under the [Apache License 2.0][apache]. From 9b15b3bc36e5e25f73de946fa2ab65295d7e1ab1 Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Mon, 17 Jul 2023 22:26:42 +0300 Subject: [PATCH 07/16] Add section about testing to README Signed-off-by: Jarno Elovirta --- README.markdown | 11 +++++++++++ build.gradle | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/README.markdown b/README.markdown index c759810946..c55a090d65 100644 --- a/README.markdown +++ b/README.markdown @@ -10,6 +10,7 @@ For information on additional DITA and DITA-OT resources, see [SUPPORT]. To repo - [Installing](#installing) - [Building output](#building-output) - [Development](#development) + - [Running tests](#running-tests) - [Formatting code](#formatting-code) - [Distribution builds](#distribution-builds) - [License](#license) @@ -88,6 +89,15 @@ Building the toolkit from source code and compiling the distribution package ./gradlew ``` +### Running tests + +```shell +./gradlew check +``` + +All tests are run by GitHub Actions [test workflow] on each push and +for every pull request. + ### Formatting code Requirements: @@ -135,3 +145,4 @@ DITA Open Toolkit is licensed for use under the [Apache License 2.0][apache]. [apache]: http://www.apache.org/licenses/LICENSE-2.0 [issue]: https://github.com/dita-ot/dita-ot/issues/new/choose [contributing]: https://github.com/dita-ot/.github/blob/master/CONTRIBUTING.md +[test workflow]: https://github.com/dita-ot/dita-ot/actions/workflows/test.yml \ No newline at end of file diff --git a/build.gradle b/build.gradle index 671db48066..0b4fc8732d 100644 --- a/build.gradle +++ b/build.gradle @@ -111,6 +111,10 @@ task integrationTest(type: Test, dependsOn: 'buildLocal') { systemProperties = integrationTestSystemProperties include '**/IntegrationTest*.class' } +tasks.named('check') { + dependsOn('integrationTest') +} + // End to end test @@ -136,6 +140,9 @@ task e2eTest(type: Test, dependsOn: 'buildLocal') { systemProperties = e2eTestSystemProperties include '**/EndToEndTest*.class' } +tasks.named('check') { + dependsOn('e2eTest') +} // Install From 31f7362cacedd4eb578a7b68dae9460788e09a5b Mon Sep 17 00:00:00 2001 From: chrispy Date: Mon, 17 Jul 2023 16:03:52 -0400 Subject: [PATCH 08/16] use correct cross-reference context when computing link description from contents Signed-off-by: chrispy --- src/main/plugins/org.dita.base/xsl/preprocess/topicpullImpl.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/plugins/org.dita.base/xsl/preprocess/topicpullImpl.xsl b/src/main/plugins/org.dita.base/xsl/preprocess/topicpullImpl.xsl index fcf5023e6f..63482ecbb2 100644 --- a/src/main/plugins/org.dita.base/xsl/preprocess/topicpullImpl.xsl +++ b/src/main/plugins/org.dita.base/xsl/preprocess/topicpullImpl.xsl @@ -714,7 +714,7 @@ mode="topicpull:figure-linktext" and mode="topicpull:table-linktext" - + From 3da98b2025c9ba6f7158a9f0d2fa6530598920ca Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Tue, 18 Jul 2023 09:08:11 +0300 Subject: [PATCH 09/16] Update Guava 32.1.1 Fixes #4227 Signed-off-by: Jarno Elovirta --- build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 0b4fc8732d..37c612d857 100644 --- a/build.gradle +++ b/build.gradle @@ -37,10 +37,11 @@ dependencies { implementation group: 'com.ibm.icu', name: 'icu4j', version:'70.1' implementation group: 'org.apache.ant', name: 'ant', version:'1.10.13' implementation group: 'org.apache.ant', name: 'ant-launcher', version:'1.10.13' - implementation(group: 'com.google.guava', name: 'guava', version: '25.1-jre') { + implementation(group: 'com.google.guava', name: 'guava', version: '32.1.1-jre') { exclude group: 'org.checkerframework', module: 'checker-qual' - exclude group: 'org.codehaus.mojo', module: 'animal-sniffer-annotations' exclude group: 'com.google.code.findbugs', module: 'jsr305' + exclude group: 'com.google.guava', module: 'failureaccess' + exclude group: 'com.google.guava', module: 'listenablefuture' exclude group: 'com.google.errorprone', module: 'error_prone_annotations' exclude group: 'com.google.j2objc', module: 'j2objc-annotations' } From 94aaaac820417c3a608e1d4fe7b25b0e89cb32ed Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Tue, 18 Jul 2023 09:46:05 +0300 Subject: [PATCH 10/16] Update Logback and SLF4J Signed-off-by: Jarno Elovirta --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 37c612d857..faa2428f38 100644 --- a/build.gradle +++ b/build.gradle @@ -45,8 +45,8 @@ dependencies { exclude group: 'com.google.errorprone', module: 'error_prone_annotations' exclude group: 'com.google.j2objc', module: 'j2objc-annotations' } - implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32' - implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.8' + implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7' + implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.8' implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.15.2' implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.15.2' implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.15.2' From 0a7c7e0f594cb4721b5699fde681a499d735b7d4 Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Tue, 18 Jul 2023 12:41:54 +0300 Subject: [PATCH 11/16] Update to Saxon-HE 12.3 Fixes #4241 Signed-off-by: Jarno Elovirta --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index faa2428f38..481d8d91dc 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ dependencies { implementation group: 'xerces', name: 'xercesImpl', version:'2.12.2' implementation group: 'xml-apis', name: 'xml-apis', version:'1.4.01' implementation group: 'xml-resolver', name: 'xml-resolver', version:'1.2' - implementation group: 'net.sf.saxon', name: 'Saxon-HE', version: '12.2' + implementation group: 'net.sf.saxon', name: 'Saxon-HE', version: '12.3' implementation group: 'com.ibm.icu', name: 'icu4j', version:'70.1' implementation group: 'org.apache.ant', name: 'ant', version:'1.10.13' implementation group: 'org.apache.ant', name: 'ant-launcher', version:'1.10.13' From 80639433c6e78650ef27fe35951f07d5f3b40b8b Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Tue, 18 Jul 2023 13:34:27 +0300 Subject: [PATCH 12/16] Log exception with location Signed-off-by: Jarno Elovirta --- .../java/org/dita/dost/exception/DITAOTXMLErrorHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/dita/dost/exception/DITAOTXMLErrorHandler.java b/src/main/java/org/dita/dost/exception/DITAOTXMLErrorHandler.java index 09bc39c7bd..e913b2d30a 100644 --- a/src/main/java/org/dita/dost/exception/DITAOTXMLErrorHandler.java +++ b/src/main/java/org/dita/dost/exception/DITAOTXMLErrorHandler.java @@ -45,10 +45,11 @@ public DITAOTXMLErrorHandler(final String file, final DITAOTLogger logger, final */ @Override public void error(final SAXParseException saxException) throws SAXException { + final SAXExceptionWrapper ex = new SAXExceptionWrapper(filePath, saxException); if (mode == Configuration.Mode.STRICT) { - throw new SAXExceptionWrapper(filePath, saxException); + throw ex; } else { - logger.error(saxException.getMessage(), saxException); + logger.error(ex.getMessage(), ex); } } From 49975b0660689d34178612a930a3033f47f58c83 Mon Sep 17 00:00:00 2001 From: chrispy Date: Fri, 31 Mar 2023 11:54:29 -0400 Subject: [PATCH 13/16] insert in cases where it was missing Signed-off-by: chrispy --- .../xsl/preprocess/topicpullImpl.xsl | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/src/main/plugins/org.dita.base/xsl/preprocess/topicpullImpl.xsl b/src/main/plugins/org.dita.base/xsl/preprocess/topicpullImpl.xsl index 63482ecbb2..5bec8fa24e 100644 --- a/src/main/plugins/org.dita.base/xsl/preprocess/topicpullImpl.xsl +++ b/src/main/plugins/org.dita.base/xsl/preprocess/topicpullImpl.xsl @@ -402,6 +402,14 @@ mode="topicpull:figure-linktext" and mode="topicpull:table-linktext" + + + + + + @@ -698,7 +706,6 @@ mode="topicpull:figure-linktext" and mode="topicpull:table-linktext" - @@ -1416,25 +1423,16 @@ mode="topicpull:figure-linktext" and mode="topicpull:table-linktext" - - - - - - - genshortdesc - - + + + + genshortdesc - - - - - - - usershortdesc - - + + + + + usershortdesc From 50f885d8cb16f2ca85bfcb569b5f7311c1ca1c18 Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Wed, 19 Jul 2023 15:21:01 +0300 Subject: [PATCH 14/16] Fix dependency configuration in build Signed-off-by: Jarno Elovirta --- build.gradle | 6 +++--- src/main/plugins/org.dita.htmlhelp/build.gradle | 12 ++++++------ src/main/plugins/org.dita.pdf2.fop/build.gradle | 2 +- src/main/plugins/org.dita.pdf2.fop/plugin.xml | 4 ++-- src/main/plugins/org.dita.pdf2/build.gradle | 5 ++--- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 481d8d91dc..33eb321081 100644 --- a/build.gradle +++ b/build.gradle @@ -53,9 +53,9 @@ dependencies { implementation group: 'org.relaxng', name: 'jing', version: '20181222' implementation group: 'org.apache.ant', name: 'ant-apache-resolver', version:'1.10.13' testImplementation group: 'nu.validator.htmlparser', name: 'htmlparser', version:'1.4' - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.2' - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.8.2' - testImplementation group: 'org.xmlunit', name: 'xmlunit-core', version: '2.6.0' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.3' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.9.3' + testImplementation group: 'org.xmlunit', name: 'xmlunit-core', version: '2.9.1' } jar { diff --git a/src/main/plugins/org.dita.htmlhelp/build.gradle b/src/main/plugins/org.dita.htmlhelp/build.gradle index 76ac880c73..75ff787cea 100644 --- a/src/main/plugins/org.dita.htmlhelp/build.gradle +++ b/src/main/plugins/org.dita.htmlhelp/build.gradle @@ -18,13 +18,13 @@ repositories { dependencies { implementation rootProject implementation group: 'commons-io', name: 'commons-io', version: '2.8.0' - implementation group: 'net.sf.saxon', name: 'Saxon-HE', version: '12.2' - implementation group: 'org.apache.ant', name: 'ant', version:'1.10.12' - implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' + implementation group: 'net.sf.saxon', name: 'Saxon-HE', version: '12.3' + implementation group: 'org.apache.ant', name: 'ant', version:'1.10.13' + implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7' testImplementation rootProject - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.2' - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.8.2' - testImplementation group: 'org.xmlunit', name: 'xmlunit-core', version: '2.3.0' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.3' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.9.3' + testImplementation group: 'org.xmlunit', name: 'xmlunit-core', version: '2.9.1' testImplementation group: 'nu.validator.htmlparser', name: 'htmlparser', version:'1.4' testImplementation rootProject.sourceSets.test.output } diff --git a/src/main/plugins/org.dita.pdf2.fop/build.gradle b/src/main/plugins/org.dita.pdf2.fop/build.gradle index 4fa53b8389..c3023de407 100644 --- a/src/main/plugins/org.dita.pdf2.fop/build.gradle +++ b/src/main/plugins/org.dita.pdf2.fop/build.gradle @@ -21,7 +21,7 @@ dependencies { exclude group: 'xalan' } runtimeOnly group: 'xml-apis', name: 'xml-apis-ext', version: '1.3.04' - runtimeOnly group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.30' + runtimeOnly group: 'org.slf4j', name: 'jcl-over-slf4j', version: '2.0.7' runtimeOnly(group: 'org.apache.xmlgraphics', name: 'fop-pdf-images', version: '2.8') { exclude group: 'xalan' } diff --git a/src/main/plugins/org.dita.pdf2.fop/plugin.xml b/src/main/plugins/org.dita.pdf2.fop/plugin.xml index 335a94a271..207de7e3a2 100644 --- a/src/main/plugins/org.dita.pdf2.fop/plugin.xml +++ b/src/main/plugins/org.dita.pdf2.fop/plugin.xml @@ -15,10 +15,10 @@ See the accompanying LICENSE file for applicable license. - + - + diff --git a/src/main/plugins/org.dita.pdf2/build.gradle b/src/main/plugins/org.dita.pdf2/build.gradle index 49c7d6bd27..2b906afc53 100644 --- a/src/main/plugins/org.dita.pdf2/build.gradle +++ b/src/main/plugins/org.dita.pdf2/build.gradle @@ -19,11 +19,10 @@ dependencies { implementation rootProject implementation group: 'commons-io', name: 'commons-io', version: '2.8.0' implementation group: 'com.ibm.icu', name: 'icu4j', version:'70.1' - implementation group: 'net.sf.saxon', name: 'Saxon-HE', version: '10.6' + implementation group: 'net.sf.saxon', name: 'Saxon-HE', version: '12.3' implementation group: 'org.apache.ant', name: 'ant', version:'1.10.13' - implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' + implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7' implementation group: 'xml-resolver', name: 'xml-resolver', version:'1.2' - implementation group: 'net.sf.saxon', name: 'Saxon-HE', version: '12.2' } sourceSets { main { From f26499170404c275c75982dff63bebd2bf249312 Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Thu, 20 Jul 2023 09:58:22 +0300 Subject: [PATCH 15/16] Update version to 4.1.1 Signed-off-by: Jarno Elovirta --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 33eb321081..9dd9a659e7 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ apply plugin: 'signing' group = 'org.dita-ot' archivesBaseName = 'dost' /** Semver version number */ -version = '4.1.0' +version = '4.1.1' description = """DITA Open Toolkit""" From d709d5bfab5698fa0b1a73a52f1b875dc74d2246 Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Thu, 20 Jul 2023 10:15:16 +0300 Subject: [PATCH 16/16] Update docs to 4.1.1 Signed-off-by: Jarno Elovirta --- src/main/docsrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/docsrc b/src/main/docsrc index a2925714be..6e6e51e892 160000 --- a/src/main/docsrc +++ b/src/main/docsrc @@ -1 +1 @@ -Subproject commit a2925714bea2a4b6ded51f3871bc91d39adb3485 +Subproject commit 6e6e51e89216f9f67cfe5e93f76d389a4e3ce0d5