From 5830d6536ff3f77a70b2ef65d15723257f70d1f4 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Wed, 8 Aug 2012 09:30:20 +0000
Subject: NO-JIRA: use a single property to define the maven repository url
 being used to source dependencies

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1370715 13f79535-47bb-0310-9956-ffa450edef68
---
 java/common.xml               | 3 ++-
 java/ivysettings.retrieve.xml | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/common.xml b/java/common.xml
index 7e7b9c0c07..2b61ef08c2 100644
--- a/java/common.xml
+++ b/java/common.xml
@@ -97,7 +97,8 @@
   <property name="ivy.jar.dir"         value="${project.root}/lib/ivy" />
   <property name="ivy.install.version" value="2.2.0" />
   <property name="ivy.jar.file"        value="${ivy.jar.dir}/ivy-${ivy.install.version}.jar" />
-  <property name="ivy.repo.url"        value="http://repo1.maven.org/maven2/org/apache/ivy/ivy"/>
+  <property name="ivy.m2repo.url"      value="http://repo1.maven.org/maven2"/>
+  <property name="ivy.repo.url"        value="${ivy.m2repo.url}/org/apache/ivy/ivy"/>
   <property name="ivy.jar.url"         value="${ivy.repo.url}/${ivy.install.version}/ivy-${ivy.install.version}.jar"/>
 
   <available property="ivy.jar.file.exists" file="${ivy.jar.file}"/>
diff --git a/java/ivysettings.retrieve.xml b/java/ivysettings.retrieve.xml
index 8faf23c2d1..e31af1e5b5 100644
--- a/java/ivysettings.retrieve.xml
+++ b/java/ivysettings.retrieve.xml
@@ -18,7 +18,6 @@
   <property name="ivy.default.resolver" value="chain" override="false"/>
   <property name="ivy.localfs.root" value="${project.root}/localfs_repo" override="false"/>
   <property name="ivy.localfs.pattern" value="[artifact]-[revision](-[classifier]).[ext]" override="false"/>
-  <property name="ivy.m2repo.url" value="http://repo1.maven.org/maven2" override="false"/>
 
   <settings defaultResolver="${ivy.default.resolver}"/>
   <resolvers>
-- 
cgit v1.2.1