Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.artifact-repository into 380765-shared-ivycache
Conflicts:
build.versions
diff --git a/build.properties b/build.properties
index 6096574..0d15339 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.repository
findbugs.enforce=true
clover.enforce=true
clover.coverage=84%
diff --git a/build.versions b/build.versions
index 2350581..53c3467 100644
--- a/build.versions
+++ b/build.versions
@@ -5,7 +5,6 @@
org.eclipse.osgi=3.8.0.v20120508-2119
org.eclipse.virgo.medic=3.6.0.D-20120813141556
org.eclipse.virgo.util=3.6.0.D-20120813140754
-
org.junit=4.7.0
org.easymock=2.3.0
org.eclipse.virgo.test=3.6.0.D-20120813141236
diff --git a/org.eclipse.virgo.repository/ivy.xml b/org.eclipse.virgo.repository/ivy.xml
index c34aa57..04e2f6d 100644
--- a/org.eclipse.virgo.repository/ivy.xml
+++ b/org.eclipse.virgo.repository/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.virgo.repository" module="${ant.project.name}"/>
+ <info organisation="${project.organisation}" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/virgo-build b/virgo-build
index a56426f..f059977 160000
--- a/virgo-build
+++ b/virgo-build
@@ -1 +1 @@
-Subproject commit a56426f086c0b7031b80a1c0b08a925784b08524
+Subproject commit f0599774df7a99db114a760070cd42607796c386
