ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject [1/2] ant-ivy git commit: Asciidoc needs to be run unnested from their jar.
Date Wed, 11 Apr 2018 17:35:38 GMT
Repository: ant-ivy
Updated Branches:
  refs/heads/master 0de17b7d2 -> 004a67fcc


Asciidoc needs to be run unnested from their jar.

cf https://github.com/spring-projects/spring-boot/issues/7399#issuecomment-260908153


Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/4470ae5e
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/4470ae5e
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/4470ae5e

Branch: refs/heads/master
Commit: 4470ae5ee84328eef38e99de839ae15df137fb9b
Parents: 0de17b7
Author: Nicolas Lalevée <nicolas.lalevee@hibnet.org>
Authored: Wed Apr 11 19:29:28 2018 +0200
Committer: Nicolas Lalevée <nicolas.lalevee@hibnet.org>
Committed: Wed Apr 11 19:29:38 2018 +0200

----------------------------------------------------------------------
 build-release.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4470ae5e/build-release.xml
----------------------------------------------------------------------
diff --git a/build-release.xml b/build-release.xml
index 71856be..b91715d 100644
--- a/build-release.xml
+++ b/build-release.xml
@@ -179,11 +179,14 @@
     </target>
 
     <target name="init-asciidoctor" depends="init-asciidoctor-extensions" unless="skip.doc">
-        <ivy:cachepath pathid="asciidoctor.path" organisation="org.asciidoctor" module="asciidoctor-ant"
revision="1.5.4" inline="true"/>
+        <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.4"
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"
/>
         <taskdef uri="antlib:org.asciidoctor.ant" resource="org/asciidoctor/ant/antlib.xml"
classpathref="asciidoctor.path">
             <classpath>
                 <pathelement location="${build.dir}/asciidoc-extensions/classes" />
-                <path refid="asciidoctor.path" />
+                <pathelement location="${build.dir}/asciidoc-lib/classes" />
             </classpath>
         </taskdef>
     </target>


Mime
View raw message