You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/08/29 06:50:49 UTC
ant-ivy git commit: Fix merge
Repository: ant-ivy
Updated Branches:
refs/heads/master cbb0714f2 -> 969ba77e9
Fix merge
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/969ba77e
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/969ba77e
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/969ba77e
Branch: refs/heads/master
Commit: 969ba77e959577e1cb4e2acc5852863805324955
Parents: cbb0714
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Wed Aug 29 08:52:03 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Wed Aug 29 08:52:03 2018 +0200
----------------------------------------------------------------------
build-release.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/969ba77e/build-release.xml
----------------------------------------------------------------------
diff --git a/build-release.xml b/build-release.xml
index 11cc932..12a4778 100644
--- a/build-release.xml
+++ b/build-release.xml
@@ -183,10 +183,10 @@
</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"/>
@@ -291,11 +291,11 @@
</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>