Merge pull request #3011 from jelovirt/feature/deprecate_dost_class_path

Deprecate and remove Ant properties
dita-ot · Jul 13, 2018 · 19f5e4d · 19f5e4d
2 parents d9f9ce7 + 9d8899b
commit 19f5e4d
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -97,6 +97,8 @@ task integrationTest(type: Test, dependsOn: 'buildLocal') {
 dependencies {
     testCompile project(':eclipsehelp')
     testCompile project(':htmlhelp')
+    testCompile project(':fo')
+    testCompile project(':fop')
 }
 
 def e2eTestSystemProperties = [

diff --git a/src/main/build_template.xml b/src/main/build_template.xml
@@ -23,6 +23,7 @@ See the accompanying LICENSE file for applicable license.
     </not>
   </condition>
 
+  <!-- Deprecated since 3.1 -->
   <path id="dost.class.path">
     <dita:extension id="dita.conductor.lib.import" behavior="org.dita.dost.platform.ImportAntLibAction"/>
     <pathelement location="${dita.dir}/lib/dost.jar"/>

diff --git a/src/main/integrator.xml b/src/main/integrator.xml
@@ -29,6 +29,7 @@ See the accompanying LICENSE file for applicable license.
     </not>
   </condition>
 
+  <!-- Deprecated since 3.1 -->
   <path id="dost.class.path">
     <pathelement location="${dita.dir}/lib/dost.jar"/>
     <pathelement location="${dita.dir}/lib/dost-configuration.jar"/>

diff --git a/src/main/plugins/org.dita.base/build_init.xml b/src/main/plugins/org.dita.base/build_init.xml
@@ -19,9 +19,6 @@ See the accompanying LICENSE file for applicable license.
     <catalogpath path="${dita.plugin.org.dita.base.dir}/catalog-dita.xml"/>
   </xmlcatalog>
 
-  <!-- Deprecated -->
-  <path id="dost.jar.path" refid="dost.class.path"/>
-
   <taskdef name="pipeline" classname="org.dita.dost.ant.ExtensibleAntInvoker"/>
   <taskdef name="dita-ot-echo" classname="org.dita.dost.ant.DITAOTEchoTask"/>
   <taskdef name="dita-ot-fail" classname="org.dita.dost.ant.DITAOTFailTask"/>

diff --git a/src/main/plugins/org.dita.pdf2.fop/build.gradle b/src/main/plugins/org.dita.pdf2.fop/build.gradle
@@ -9,9 +9,13 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    runtime group: 'org.apache.xmlgraphics', name: 'fop', version: '2.3'
+    runtime(group: 'org.apache.xmlgraphics', name: 'fop', version: '2.3') {
+        exclude group: 'xalan'
+    }
     runtime group: 'org.apache.pdfbox', name: 'fontbox', version: '2.0.7'
-    runtime group: 'org.apache.xmlgraphics', name: 'batik-all', version: '1.10'
+    runtime(group: 'org.apache.xmlgraphics', name: 'batik-all', version: '1.10') {
+        exclude group: 'xalan'
+    }
     runtime group: 'xml-apis', name: 'xml-apis-ext', version: '1.3.04'
     runtime group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.25'
 }

diff --git a/src/main/plugins/org.dita.pdf2.fop/build_fop.xml b/src/main/plugins/org.dita.pdf2.fop/build_fop.xml
@@ -141,7 +141,7 @@ See the accompanying LICENSE file for applicable license.
 
   <!--Run FOP-->
   <target name="transform.fo2pdf.fop" if="use.fop.pdf.formatter">
-    <taskdef name="fop" classname="org.apache.fop.tools.anttasks.Fop" classpathref="dost.class.path"/>
+    <taskdef name="fop" classname="org.apache.fop.tools.anttasks.Fop"/>
 
     <condition property="outputFile" value="${dita.output.dir}/${outputFile.base}${xsl.formatter.ext}">
       <not><isset property="outputFile"/></not>

diff --git a/src/main/plugins/org.dita.xhtml/build_general_template.xml b/src/main/plugins/org.dita.xhtml/build_general_template.xml
@@ -140,7 +140,6 @@ See the accompanying LICENSE file for applicable license.
       <xslt basedir="${dita.temp.dir}"
         destdir="${dita.output.dir}"
         reloadstylesheet="${dita.xhtml.reloadstylesheet}"
-        classpathref="dost.class.path"
         extension="${out.ext}" style="${args.xsl}"
         filenameparameter="FILENAME"
         filedirparameter="FILEDIR">