externalize versions (ivy.xml-->versions.properties)
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/a00e85f9 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/a00e85f9 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/a00e85f9 Branch: refs/heads/master Commit: a00e85f93cfa36cc697a26c5b31a282a0d12f8d5 Parents: 889ed9e Author: Jan Matèrne <j...@apache.org> Authored: Mon Sep 25 11:43:40 2017 +0200 Committer: Jan Matèrne <j...@apache.org> Committed: Mon Sep 25 11:43:40 2017 +0200 ---------------------------------------------------------------------- ivy.xml | 33 +++++++++++++++++---------------- version.properties | 17 +++++++++++++++++ 2 files changed, 34 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a00e85f9/ivy.xml ---------------------------------------------------------------------- diff --git a/ivy.xml b/ivy.xml index 3ba878a..e6ee31f 100644 --- a/ivy.xml +++ b/ivy.xml @@ -42,25 +42,26 @@ <artifact name="ivy" type="jar" conf="core"/> <artifact name="ivy" type="source" ext="jar" conf="source"/> </publications> + <!-- Definition of the version is done in version.properties --> <dependencies> - <dependency org="org.apache.ant" name="ant" rev="1.9.9" conf="default,ant"/> - <dependency org="org.apache.httpcomponents" name="httpclient" rev="4.5.3" conf="default,httpclient->runtime,master"/> - <dependency org="oro" name="oro" rev="2.0.8" conf="default,oro"/> - <dependency org="org.apache.commons" name="commons-vfs2" rev="2.1" conf="default,vfs"/> - <dependency org="com.jcraft" name="jsch" rev="0.1.54" conf="default,sftp"/> - <dependency org="com.jcraft" name="jsch.agentproxy" rev="0.0.9" conf="default,sftp"/> - <dependency org="com.jcraft" name="jsch.agentproxy.connector-factory" rev="0.0.9" conf="default,sftp"/> - <dependency org="com.jcraft" name="jsch.agentproxy.jsch" rev="0.0.9" conf="default,sftp"/> - <dependency org="org.bouncycastle" name="bcpg-jdk15on" rev="1.58" conf="default"/> - <dependency org="org.bouncycastle" name="bcprov-jdk15on" rev="1.58" conf="default"/> + <dependency org="org.apache.ant" name="ant" rev="${apache-ant.version}" conf="default,ant"/> + <dependency org="org.apache.httpcomponents" name="httpclient" rev="${httpclient.version}" conf="default,httpclient->runtime,master"/> + <dependency org="oro" name="oro" rev="${oro.version}" conf="default,oro"/> + <dependency org="org.apache.commons" name="commons-vfs2" rev="${commons-vfs2.version}" conf="default,vfs"/> + <dependency org="com.jcraft" name="jsch" rev="${jsch.version}" conf="default,sftp"/> + <dependency org="com.jcraft" name="jsch.agentproxy" rev="${jsch.agentproxy.version}" conf="default,sftp"/> + <dependency org="com.jcraft" name="jsch.agentproxy.connector-factory" rev="${jsch.agentproxy.version}" conf="default,sftp"/> + <dependency org="com.jcraft" name="jsch.agentproxy.jsch" rev="${jsch.agentproxy.version}" conf="default,sftp"/> + <dependency org="org.bouncycastle" name="bcpg-jdk15on" rev="${bouncycastle.version}" conf="default"/> + <dependency org="org.bouncycastle" name="bcprov-jdk15on" rev="${bouncycastle.version}" conf="default"/> <!-- Test dependencies --> - <dependency org="junit" name="junit" rev="4.12" conf="test"/> - <dependency org="org.hamcrest" name="hamcrest-core" rev="1.3" conf="test"/> - <dependency org="org.apache.ant" name="ant-testutil" rev="1.9.9" conf="test" transitive="false"/> - <dependency org="org.apache.ant" name="ant-launcher" rev="1.9.9" conf="test" transitive="false"/> - <dependency org="ant-contrib" name="ant-contrib" rev="1.0b3" conf="test" transitive="false"/> - <dependency org="xmlunit" name="xmlunit" rev="1.6" conf="test" transitive="false"/> + <dependency org="junit" name="junit" rev="${junit.version}" conf="test"/> + <dependency org="org.hamcrest" name="hamcrest-core" rev="${hamcrest.version}" conf="test"/> + <dependency org="org.apache.ant" name="ant-testutil" rev="${apache-ant.version}" conf="test" transitive="false"/> + <dependency org="org.apache.ant" name="ant-launcher" rev="${apache-ant.version}" conf="test" transitive="false"/> + <dependency org="ant-contrib" name="ant-contrib" rev="${ant-contrib.version}" conf="test" transitive="false"/> + <dependency org="xmlunit" name="xmlunit" rev="${xmlunit.version}" conf="test" transitive="false"/> <!-- Global excludes --> <exclude org="junit" module="junit" conf="core,default,httpclient,oro,vfs,sftp,standalone,ant"/> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a00e85f9/version.properties ---------------------------------------------------------------------- diff --git a/version.properties b/version.properties index 394de0f..7b1a0ba 100644 --- a/version.properties +++ b/version.properties @@ -22,3 +22,20 @@ target.ivy.bundle.version=2.5.0 # in case we want to add a qualifier such as alpha, beta, etc... # if non empty, add a '_' at the end of the qualifier, so the version would look like 1.2.3.alpha_200901011200 target.ivy.bundle.version.qualifier=alpha_ + + +# Versions of dependencies +#---------------------------------- +# 'ant.version' is a built in name containing the version of the current +# running Ant, so we could not use that name here. +apache-ant.version=1.9.9 +ant-contrib.version=1.0b3 +bouncycastle.version=1.58 +commons-vfs2.version=2.1 +hamcrest.version=1.3 +httpclient.version=4.5.3 +jsch.agentproxy.version=0.0.9 +jsch.version=0.1.54 +junit.version=4.12 +oro.version=2.0.8 +xmlunit.version=1.6 \ No newline at end of file
