Repository: ant-antlibs-common Updated Branches: refs/heads/master 2204d47eb -> 52d9e824f
there are two different Ivy files now, unify them Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/commit/52d9e824 Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/tree/52d9e824 Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/diff/52d9e824 Branch: refs/heads/master Commit: 52d9e824f73c0145665a9b18ecf31d9285d75f39 Parents: 2204d47 Author: Stefan Bodewig <[email protected]> Authored: Tue May 23 20:44:05 2017 +0200 Committer: Stefan Bodewig <[email protected]> Committed: Tue May 23 20:44:05 2017 +0200 ---------------------------------------------------------------------- fetch.xml | 3 +-- ivy.xml | 14 +++++--------- 2 files changed, 6 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/blob/52d9e824/fetch.xml ---------------------------------------------------------------------- diff --git a/fetch.xml b/fetch.xml index be8b57e..38662d1 100644 --- a/fetch.xml +++ b/fetch.xml @@ -18,10 +18,9 @@ <project name="fetch" xmlns:ivy="antlib:org.apache.ivy.ant"> <target name="fetch-dependencies" depends="ivy.xml"> - <ivy:configure file="${common.basedir}/ivysettings-nexus.xml"/> <ivy:resolve file="${target.ivy.xml}"/> <ivy:retrieve type="jar" pattern="${build.deps}/[artifact]-[revision].[ext]"/> </target> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/blob/52d9e824/ivy.xml ---------------------------------------------------------------------- diff --git a/ivy.xml b/ivy.xml index 51d540b..ea0cb11 100644 --- a/ivy.xml +++ b/ivy.xml @@ -28,15 +28,11 @@ <!-- ========================================================== --> <target name="ivy-init" depends="setup"> - <property name="ivy.organization" value="org/apache"/> <property name="target.ivy.xml" location="${build.lib}/${artifact.stub}-ivy.xml"/> - <tstamp> - <format property="publication.datetime" pattern="yyyyMMddHHmmss"/> - </tstamp> <!--look for a template Ivy file --> - <property name="project.ivy.xml" location="project-template.ivy.xml"/> + <property name="project.ivy.xml" location="ivy.xml"/> <available property="project.has-ivy.xml?" file="${project.ivy.xml}"/> <condition property="generate-default-ivy.xml?"> <and> @@ -75,10 +71,10 @@ <echo message="Creating ivy.xml ${target.ivy.xml}" level="verbose"/> <echo file="${target.ivy.xml}"><