Merge branch 'release/3.3'

.github/no-response.yml

@@ -0,0 +1,14 @@
+# Configuration for probot-no-response - https://github.com/probot/no-response
+
+# Number of days of inactivity before an Issue is closed for lack of response
+daysUntilClose: 30
+
+# Label requiring a response
+responseRequiredLabel: need-more-info
+
+# Comment to post when closing an Issue for lack of response. Set to `false` to disable
+closeComment: >
+  This issue has been automatically closed because there has been no response
+  to our request for more information from the original author. With only the
+  information that is currently in the issue, we don't have enough to go on.
+  Please reach out if you have any updates that would allow us to proceed.

.github/stale.yml

@@ -0,0 +1,55 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 730
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 14
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - "[Status] Maybe Later"
+  - "priority/high"
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: true
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not been updated recently.
+  It will be closed soon if no further activity occurs. Thank you for your contributions.
+
+# Comment to post when removing the stale label.
+# unmarkComment: >
+#   Your comment here.
+
+# Comment to post when closing a stale Issue or Pull Request.
+# closeComment: >
+#   Your comment here.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
+# pulls:
+#   daysUntilStale: 30
+#   markComment: >
+#     This pull request has been automatically marked as stale because it has not had
+#     recent activity. It will be closed if no further activity occurs. Thank you
+#     for your contributions.
+
+# issues:
+#   exemptLabels:
+#     - confirmed

.gitignore

@@ -8,8 +8,6 @@ target/
 src/main/lib/*.jar
 
 # Generated resources
-src/main/build.xml
-src/main/catalog-dita.xml
 src/main/config/env.bat
 src/main/config/env.sh
 src/main/config/messages.xml
@@ -21,6 +19,15 @@ src/main/plugins/org.dita.base/build.xml
 src/main/plugins/org.dita.base/build_preprocess.xml
 src/main/plugins/org.dita.base/build_preprocess2.xml
 src/main/plugins/org.dita.base/catalog-dita.xml
+src/main/plugins/org.dita.base/xsl/common/allstrings.xml
+src/main/plugins/org.dita.base/xsl/common/strings.xml
+src/main/plugins/org.dita.base/xsl/preprocess/conref.xsl
+src/main/plugins/org.dita.base/xsl/preprocess/flag.xsl
+src/main/plugins/org.dita.base/xsl/preprocess/map-conref.xsl
+src/main/plugins/org.dita.base/xsl/preprocess/maplink.xsl
+src/main/plugins/org.dita.base/xsl/preprocess/mappull.xsl
+src/main/plugins/org.dita.base/xsl/preprocess/mapref.xsl
+src/main/plugins/org.dita.base/xsl/preprocess/topicpull.xsl
 src/main/plugins/org.dita.eclipsehelp/build_dita2eclipsehelp.xml
 src/main/plugins/org.dita.eclipsehelp/lib/eclipsehelp.jar
 src/main/plugins/org.dita.eclipsehelp/xsl/map2eclipse.xsl
@@ -62,16 +69,6 @@ src/main/plugins/org.dita.xhtml/xsl/map2html-coverImpl.xsl
 src/main/plugins/org.dita.xhtml/xsl/map2htmltoc.xsl
 src/main/startcmd.bat
 src/main/startcmd.sh
-src/main/xsl/common/allstrings.xml
-src/main/xsl/common/strings.xml
-src/main/xsl/preprocess/conref.xsl
-src/main/xsl/preprocess/flag.xsl
-src/main/xsl/preprocess/map-conref.xsl
-src/main/xsl/preprocess/maplink.xsl
-src/main/xsl/preprocess/mappull.xsl
-src/main/xsl/preprocess/mapref.xsl
-src/main/xsl/preprocess/topicpull.xsl
-
 
 # OS-specific entries below
 

.travis.yml

@@ -17,6 +17,7 @@ notifications:
   slack:
     secure: IAA4d9O2Dw1hkpY9cwxJz++VMjkgbV3EuaS09DGFujvHl2eQtpKTloE0/CDF+NZA4tcbH1dNqsGw3ETLmrqA581CLpmiiq3LG02cDMoSXZeOKB/9vo6tvLFg0UMawzo+FomJS/hvCmS5KirrFqZQKE5g6SCC05UBM5nwI5d0vOw=
 deploy:
+# Development distribution package
 - provider: s3
   access_key_id: AKIAJUF6ATK6SJEUR4XA
   secret_access_key:
@@ -29,6 +30,13 @@ deploy:
   on:
     repo: dita-ot/dita-ot
     branch: develop
+# Snapshot Maven publish
+- provider: script
+  script: "openssl aes-256-cbc -K $encrypted_1b8d0aeee504_key -iv $encrypted_1b8d0aeee504_iv -in .travis/24AC15F2.gpg.enc -out .travis/24AC15F2.gpg -d && ./gradlew --no-daemon --info publish -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -Psigning.password=$SIGNING_PASSWORD -Psigning.keyId=24AC15F2 -Psigning.secretKeyRingFile=.travis/24AC15F2.gpg"
+  on:
+    repo: dita-ot/dita-ot
+    branch: develop
+# Release distribution package upload
 - provider: releases
   api_key:
     secure: d2vveLfRh+KvjkuJtahHB4buR7qpUXZ7ccrmgwALVboh7BhMgZgdX/puHiEzsiS4CX0xNcV2PpdF6VBGsbMg8TAFn5ap5he7y5MnC5Rt9iaJQtMKuoV3GQ1IoZZOUCRswgpjyLOSxuP3HDgyNn44i9eYT5I9N0wkxQzaleho8Og=
@@ -38,11 +46,13 @@ deploy:
   on:
     tags: true
     repo: dita-ot/dita-ot
+# Release Maven publish
 - provider: script
-  script: "openssl aes-256-cbc -K $encrypted_1b8d0aeee504_key -iv $encrypted_1b8d0aeee504_iv -in .travis/24AC15F2.gpg.enc -out .travis/24AC15F2.gpg -d && ./gradlew uploadArchives -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -Psigning.password=$SIGNING_PASSWORD"
+  script: "openssl aes-256-cbc -K $encrypted_1b8d0aeee504_key -iv $encrypted_1b8d0aeee504_iv -in .travis/24AC15F2.gpg.enc -out .travis/24AC15F2.gpg -d && ./gradlew --no-daemon --info publish -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -Psigning.password=$SIGNING_PASSWORD -Psigning.keyId=24AC15F2 -Psigning.secretKeyRingFile=.travis/24AC15F2.gpg"
   on:
     tags: true
     repo: dita-ot/dita-ot
+# Release registry update
 - provider: script
   script: bash .travis/registry.sh
   skip_cleanup: true

build.gradle

@@ -9,12 +9,12 @@ import org.apache.tools.ant.filters.ReplaceTokens
 import org.apache.tools.ant.taskdefs.condition.Os
 
 apply plugin: 'java'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
 group = 'org.dita-ot'
 archivesBaseName = 'dost'
-version = '3.2.1'
+version = '3.3.0'
 
 description = """DITA Open Toolkit"""
 
@@ -27,26 +27,26 @@ repositories {
 }
 dependencies {
     compile group: 'commons-io', name: 'commons-io', version: '2.6'
-    compile group: 'xerces', name: 'xercesImpl', version:'2.11.0'
+    compile group: 'xerces', name: 'xercesImpl', version:'2.12.0'
     compile group: 'xml-apis', name: 'xml-apis', version:'1.4.01'
     compile group: 'xml-resolver', name: 'xml-resolver', version:'1.2'
-    compile group: 'net.sf.saxon', name: 'Saxon-HE', version: '9.8.0-12'
+    compile group: 'net.sf.saxon', name: 'Saxon-HE', version: '9.8.0-14'
     compile group: 'com.ibm.icu', name: 'icu4j', version:'61.1'
-    compile group: 'org.apache.ant', name: 'ant', version:'1.10.3'
-    compile group: 'org.apache.ant', name: 'ant-launcher', version:'1.10.3'
+    compile group: 'org.apache.ant', name: 'ant', version:'1.10.5'
+    compile group: 'org.apache.ant', name: 'ant-launcher', version:'1.10.5'
     compile(group: 'com.google.guava', name: 'guava', version: '25.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.errorprone:', module: 'error_prone_annotations'
+        exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
         exclude group: 'com.google.j2objc', module: 'j2objc-annotations'
     }
     compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
     compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.6'
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.6'
-    compile group: 'org.dita-ot', name: 'jing', version: '2.0.0'
-    runtime group: 'org.apache.ant', name: 'ant-apache-resolver', version:'1.10.3'
+    compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.8'
+    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.8'
+    compile group: 'org.relaxng', name: 'jing', version: '20181222'
+    runtime group: 'org.apache.ant', name: 'ant-apache-resolver', version:'1.10.5'
     testCompile group: 'nu.validator.htmlparser', name: 'htmlparser', version:'1.4'
     testCompile group: 'junit', name: 'junit', version:'4.12'
     testCompile group: 'org.xmlunit', name: 'xmlunit-core', version: '2.6.0'
@@ -72,7 +72,7 @@ task sourcesJar(type: Jar) {
 }
 
 artifacts {
-    archives javadocJar, sourcesJar
+    archives jar, javadocJar, sourcesJar
 }
 
 test {
@@ -160,7 +160,7 @@ def distFileName = (project.hasProperty("tag") && tag.empty) ?
                    "develop" :
                    "${project.version}"
 def bundled = [
-        "markdown": "https://github.com/jelovirt/org.lwdita/releases/download/2.0.7/org.lwdita-2.0.7.zip",
+        "markdown": "https://github.com/jelovirt/org.lwdita/releases/download/2.2.0/org.lwdita-2.2.0.zip",
         "normalize": "https://github.com/dita-ot/org.dita.normalize/archive/1.0.zip",
         "troff": "https://github.com/dita-ot/org.dita.troff/archive/3.1.1.zip",
         "tocjs": "https://github.com/dita-ot/com.sophos.tocjs/archive/2.5.zip",
@@ -200,14 +200,13 @@ task copyDistTemp(type: Copy, dependsOn: initDist) {
         )
     }
     from ("src/main") {
-        exclude "**/.gradle"
+        exclude ".gradle"
         exclude "plugins/**/build.gradle"
-        exclude "**/settings.gradle"
+        exclude "plugins/**/settings.gradle"
+        exclude "plugins/**/.gradle"
         exclude ".*"
         exclude "local.properties"
-        exclude "build.log"
         exclude "build_demo.xml"
-        exclude "catalog-dita.txt"
         include "*.*"
         include "bin/dita"
         include "bin/dita.bat"
@@ -223,7 +222,6 @@ task copyDistTemp(type: Copy, dependsOn: initDist) {
         exclude "docsrc/platform.ditaval"
         exclude "docsrc/temp"
         include "docsrc/**"
-        include "dtd/**"
         exclude "plugins/*/plugin.xml"
         include "plugins/org.dita.base/**"
         include "plugins/org.dita.eclipsehelp/**"
@@ -250,8 +248,7 @@ task copyDistTemp(type: Copy, dependsOn: initDist) {
         include "plugins/org.oasis-open.dita.v1_3/**"
         exclude "temp"
         include "config/**"
-        exclude "resources/**"
-        include "xsl/**"
+        include "resources/plugin.rnc"
         // legacy build scripts
         include "startcmd.*"
         include "bin/ant"
@@ -285,9 +282,9 @@ task integrateDistPlugins() {
 integrateDistPlugins.mustRunAfter integrateDistTemp
 
 task generateDocs(type: Exec, dependsOn: integrateDistTemp) {
-    workingDir file("${distTempDir}/docsrc")
-    commandLine Os.isFamily(Os.FAMILY_WINDOWS) ? file("${distTempDir}/docsrc/gradlew.bat") : file("${distTempDir}/docsrc/gradlew")
-    args "dist"
+    workingDir = file("${distTempDir}/docsrc")
+    commandLine = Os.isFamily(Os.FAMILY_WINDOWS) ? file("${distTempDir}/docsrc/gradlew.bat") : file("${distTempDir}/docsrc/gradlew")
+    args = ["--no-daemon", "dist"]
 }
 generateDocs.mustRunAfter integrateDistPlugins
 generateDocs.onlyIf { skipDocs() }
@@ -405,55 +402,55 @@ def getRepositoryPassword() {
                     ""
 }
 
-signing {
-    sign configurations.archives
-}
-
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-            repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-            }
-
-            snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-                authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-            }
-
-            pom.project {
-                name 'DITA Open Toolkit'
-                packaging 'jar'
-                description 'DITA-OT base library'
-                url 'https://www.dita-ot.org/'
-
-                scm {
-                    connection 'scm:git:https://github.com/dita-ot/dita-ot.git'
-                    developerConnection 'scm:git:git@github.com:dita-ot/dita-ot.git'
-                    url 'https://github.com/dita-ot/dita-ot/'
-                }
-
-                licenses {
-                    license {
-                        name 'The Apache License, Version 2.0'
-                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+            afterEvaluate {
+                pom {
+                    name = 'DITA Open Toolkit'
+                    description = 'DITA-OT base library'
+                    url = 'https://www.dita-ot.org/'
+                    scm {
+                        connection = 'scm:git:https://github.com/dita-ot/dita-ot.git'
+                        developerConnection = 'scm:git:git@github.com:dita-ot/dita-ot.git'
+                        url = 'https://github.com/dita-ot/dita-ot/'
                     }
-                }
-
-                developers {
-                    developer {
-                        id 'robander'
-                        name 'Robert D Anderson'
-                        email 'robander@us.ibm.com'
+                    licenses {
+                        license {
+                            name = 'The Apache License, Version 2.0'
+                            url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                        }
                     }
-                    developer {
-                        id 'jelovirt'
-                        name 'Jarno Elovirta'
-                        email 'jarno@elovirta.com'
+                    developers {
+                        developer {
+                            id = 'robander'
+                            name = 'Robert D Anderson'
+                            email = 'robander@us.ibm.com'
+                        }
+                        developer {
+                            id = 'jelovirt'
+                            name = 'Jarno Elovirta'
+                            email = 'jarno@elovirta.com'
+                        }
                     }
                 }
             }
         }
     }
+    repositories {
+        maven {
+            def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+            def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
+            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+            credentials {
+                username getRepositoryUsername()
+                password getRepositoryPassword()
+            }
+        }
+    }
+}
+
+signing {
+    sign configurations.archives
 }

gradle/dist.gradle

@@ -5,6 +5,8 @@ import static groovy.io.FileType.FILES
 def licenses = [
         [name: 'avalon-framework', title: 'Avalon Framework', license: ['apache2.txt']],
         [name: 'batik', title: 'Batik', license: ['apache2.txt']],
+        [name: 'pdfbox', title: 'PDFBox', license: ['apache2.txt']],
+        [name: 'fontbox', title: 'PDFBox', license: ['apache2.txt']],
         [name: 'xmlgraphics-commons', title: 'Apache XML Graphics Commons', license: ['apache2.txt']],
         [name: 'commons-io', title: 'Commons IO', license: ['apache2.txt']],
         [name: 'xercesImpl', title: 'Xerces2 Java', license: ['apache2.txt']],
@@ -19,6 +21,7 @@ def licenses = [
         [name: 'logback', title: 'Logback', license: ['epl-1.0.txt']],
         [name: 'jackson', title: 'Jackson', license: ['apache2.txt']],
         [name: 'jing', title: 'Jing', license: ['bsd-jing.txt']],
+        [name: 'isorelax', title: 'Isorelax', license: ['isorelax.txt']],
         [name: 'gradle-wrapper'],
         [name: 'org.lwdita'],
         [name: 'fo'],

gradle/isorelax.txt

@@ -0,0 +1,7 @@
+Copyright (c) 2001-2002, SourceForge ISO-RELAX Project (ASAMI Tomoharu, Daisuke Okajima, Kohsuke Kawaguchi, and MURATA Makoto)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.