Merge pull request #1384 from nacx/abiquo-maven-central

Fix #1379: Use dependencies from Maven Central
This commit is contained in:
Adrian Cole 2013-03-06 15:56:38 -08:00
commit 750b7f928e
2 changed files with 2 additions and 13 deletions

View File

@ -15,8 +15,8 @@
<packaging>bundle</packaging>
<properties>
<abiquomodel.version>2.2.0</abiquomodel.version>
<abiquoam.version>2.1.2</abiquoam.version>
<abiquomodel.version>2.2.0.1</abiquomodel.version>
<abiquoam.version>2.1.2.1</abiquoam.version>
<test.abiquo.endpoint>http://localhost/api</test.abiquo.endpoint>
<test.abiquo.identity>FIXME</test.abiquo.identity>
<test.abiquo.credential>FIXME</test.abiquo.credential>
@ -26,15 +26,6 @@
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<!-- To be removed when the Abiquo deps are in Maven Central -->
<repositories>
<repository>
<id>abiquo-repo</id>
<name>Abiquo Maven Repository</name>
<url>http://repo.community.abiquo.com/repo</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.jclouds</groupId>

View File

@ -59,9 +59,7 @@
<module>fgcp</module>
<module>fgcp-au</module>
<module>fgcp-de</module>
<!-- Disabled until Abiquo deps are in Maven Central
<module>abiquo</module>
-->
<module>oauth</module>
<module>openstack-quantum</module>
<module>openstack-glance</module>