Brings back "380765 - Adopts a shared ivy-cache concept"" This reverts commit 43839266b248fcb1bccf670d5ea7bed0a02dfed0.
diff --git a/build.properties b/build.properties index 42f53e1..4016bbb 100644 --- a/build.properties +++ b/build.properties
@@ -1,8 +1,9 @@ version=3.6.0 release.type=integration javadoc.exclude.package.names=**/internal/**,**/internal -ivy.cache.dir=${basedir}/../ivy-cache -integration.repo.dir=${basedir}/../integration-repo +ivy.cache.dir=${user.home}/ivy/ivy-cache +integration.repo.dir=${ivy.cache.dir}/repository +project.organisation=org.eclipse.virgo.kernel.tools findbugs.enforce=true clover.enforce=true clover.coverage=76%
diff --git a/org.eclipse.virgo.kernel.tools/ivy.xml b/org.eclipse.virgo.kernel.tools/ivy.xml index 283f3d8..0ac45b2 100644 --- a/org.eclipse.virgo.kernel.tools/ivy.xml +++ b/org.eclipse.virgo.kernel.tools/ivy.xml
@@ -2,7 +2,7 @@ <?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?> <ivy-module xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='http://incubator.apache.org/ivy/schemas/ivy.xsd' version='1.3'> - <info module='${ant.project.name}' organisation='org.eclipse.virgo.kernel.tools'/> +<info module='${ant.project.name}' organisation='${project.organisation}'/> <configurations> <include file='${virgo.build.dir}/common/default-ivy-configurations.xml'/> @@ -31,7 +31,6 @@ <override org="org.eclipse.virgo.repository" module="org.eclipse.virgo.repository" rev="${org.eclipse.virgo.repository}"/> <override org="org.eclipse.virgo.util" rev="${org.eclipse.virgo.util}"/> - </dependencies> </ivy-module>