385317 - Adjusts to new commons.pool and dbcp versions
diff --git a/build.versions b/build.versions index ef5d266..9011c76 100644 --- a/build.versions +++ b/build.versions
@@ -41,8 +41,8 @@ # Test org.springframework.old=2.5.6.SEC01 -commons.dbcp=1.2.2.osgi -commons.pool=1.3.0 +org.apache.commons.dbcp=1.4.0.v201204271417 +org.apache.commons.pool=1.6.0.v201204271246 org.aopalliance=1.0.0 com.mchange.c3p0=0.9.1.2 com.opensymphony.quartz=1.6.0
diff --git a/org.eclipse.virgo.kernel.artifact/ivy.xml b/org.eclipse.virgo.kernel.artifact/ivy.xml index 4064aa9..e95c001 100644 --- a/org.eclipse.virgo.kernel.artifact/ivy.xml +++ b/org.eclipse.virgo.kernel.artifact/ivy.xml
@@ -23,7 +23,7 @@ <dependency org="org.slf4j" name="com.springsource.slf4j.nop" rev="${org.slf4j}" conf="test->runtime"/> <dependency org="org.eclipse.virgo.mirrored" name="javax.servlet" rev="${javax.servlet}" conf="test->runtime"/> - <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.dbcp" rev="${commons.dbcp}" conf="test->runtime" /> + <dependency org="org.eclipse.virgo.mirrored" name="org.apache.commons.dbcp" rev="${org.apache.commons.dbcp}" conf="test->runtime" /> <dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="${org.aopalliance}" conf="test->runtime" /> <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="compile->runtime"/>
diff --git a/org.eclipse.virgo.kernel.deployer.test/ivy.xml b/org.eclipse.virgo.kernel.deployer.test/ivy.xml index 9cc54b8..e9b2f26 100644 --- a/org.eclipse.virgo.kernel.deployer.test/ivy.xml +++ b/org.eclipse.virgo.kernel.deployer.test/ivy.xml
@@ -29,8 +29,8 @@ <dependency org="org.eclipse.virgo.mirrored" name="javax.transaction" rev="${javax.transaction}" conf="test->runtime"/> <dependency org="org.eclipse.virgo.mirrored" name="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="compile->runtime"/> <dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="${org.hsqldb}" conf="test->runtime"/> - <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.dbcp" rev="${commons.dbcp}" conf="test->runtime"/> - <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="${commons.pool}" conf="test->runtime"/> + <dependency org="org.eclipse.virgo.mirrored" name="org.apache.commons.dbcp" rev="${org.apache.commons.dbcp}" conf="test->runtime"/> + <dependency org="org.eclipse.virgo.mirrored" name="org.apache.commons.pool" rev="${org.apache.commons.pool}" conf="test->runtime"/> <dependency org="org.eclipse.virgo.mirrored" name="org.apache.felix.gogo.runtime" rev="${org.apache.felix.gogo.runtime}" conf="test->runtime"/> <dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic.core" rev="${org.eclipse.virgo.medic}" conf="test->runtime"/>