Fix merge
authorGintas Grigelionis <gintas@apache.org>
Wed, 29 Aug 2018 06:52:03 +0000 (08:52 +0200)
committerGintas Grigelionis <gintas@apache.org>
Wed, 29 Aug 2018 06:52:03 +0000 (08:52 +0200)
build-release.xml

index 11cc932..12a4778 100644 (file)
     </target>
 
     <target name="init-asciidoctor" depends="init-asciidoctor-extensions" unless="skip.doc">
-        <mkdir dir="${build.dir}/asciidoc-lib/jars" />
-        <mkdir dir="${build.dir}/asciidoc-lib/classes" />
-        <ivy:retrieve organisation="org.asciidoctor" module="asciidoctor-ant" revision="1.5.5" conf="default" inline="true" pattern="${build.dir}/asciidoc-lib/jars/[artifact].[ext]" conf="default" />
-        <unzip src="${build.dir}/asciidoc-lib/jars/asciidoctor-ant.jar" dest="${build.dir}/asciidoc-lib/classes" />
+        <mkdir dir="${build.dir}/asciidoc-lib/jars"/>
+        <mkdir dir="${build.dir}/asciidoc-lib/classes"/>
+        <ivy:retrieve organisation="org.asciidoctor" module="asciidoctor-ant" revision="1.5.5" conf="default" inline="true" pattern="${build.dir}/asciidoc-lib/jars/[artifact].[ext]"/>
+        <unzip src="${build.dir}/asciidoc-lib/jars/asciidoctor-ant.jar" dest="${build.dir}/asciidoc-lib/classes"/>
         <taskdef uri="antlib:org.asciidoctor.ant" resource="org/asciidoctor/ant/antlib.xml">
             <classpath>
                 <pathelement location="${build.dir}/asciidoc-extensions/classes"/>
         </exec>
         <mkdir dir="${distrib.dir}/dist/${build.version}"/>
         <zip destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.zip" defaultexcludes="no">
-            <zipfileset dir="${build.dir}/snapshot-src" prefix="${snapshot.full.name}" defaultexcludes="no" excludes=".git/**" />
+            <zipfileset dir="${build.dir}/snapshot-src" prefix="${snapshot.full.name}" defaultexcludes="no" excludes=".git/**"/>
         </zip>
         <tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.tar.gz"
              compression="gzip" longfile="gnu" defaultexcludes="no">
-            <zipfileset dir="${build.dir}/snapshot-src" prefix="${snapshot.full.name}" defaultexcludes="no" excludes=".git/**" />
+            <zipfileset dir="${build.dir}/snapshot-src" prefix="${snapshot.full.name}" defaultexcludes="no" excludes=".git/**"/>
         </tar>
     </target>