Updated Branches: refs/heads/master 0d9dd39ad -> d9acba69e
Change labs to have their own parent POMs https://issues.apache.org/jira/browse/JCLOUDS-104 Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/commit/d9acba69 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/tree/d9acba69 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/diff/d9acba69 Branch: refs/heads/master Commit: d9acba69e0cff4128f412213e91b8ce8cb7d13a7 Parents: 0d9dd39 Author: zack-shoylev <[email protected]> Authored: Fri Jun 28 14:45:56 2013 -0500 Committer: Everett Toews <[email protected]> Committed: Wed Jul 3 19:21:17 2013 -0500 ---------------------------------------------------------------------- openstack-glance/pom.xml | 15 ++++++++------- openstack-quantum/pom.xml | 15 ++++++++------- openstack-swift/pom.xml | 17 +++++++++-------- openstack-trove/pom.xml | 16 +++++++++------- pom.xml | 9 ++++----- rackspace-clouddatabases-uk/pom.xml | 27 ++++++++++++++------------- rackspace-clouddatabases-us/pom.xml | 27 ++++++++++++++------------- 7 files changed, 66 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/d9acba69/openstack-glance/pom.xml ---------------------------------------------------------------------- diff --git a/openstack-glance/pom.xml b/openstack-glance/pom.xml index 8e1e6fd..3b9da08 100644 --- a/openstack-glance/pom.xml +++ b/openstack-glance/pom.xml @@ -20,14 +20,15 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>jclouds-labs-openstack</artifactId> + <groupId>org.apache.jclouds</groupId> + <artifactId>jclouds-project</artifactId> <version>1.7.0-SNAPSHOT</version> </parent> <!-- TODO: when out of labs, switch to org.jclouds.api --> <groupId>org.apache.jclouds.labs</groupId> <artifactId>openstack-glance</artifactId> + <version>1.7.0-SNAPSHOT</version> <name>jclouds openstack-glance api</name> <description>jclouds components to access an implementation of OpenStack Glance</description> <packaging>bundle</packaging> @@ -55,31 +56,31 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jclouds.driver</groupId> <artifactId>jclouds-slf4j</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/d9acba69/openstack-quantum/pom.xml ---------------------------------------------------------------------- diff --git a/openstack-quantum/pom.xml b/openstack-quantum/pom.xml index 76aa0e4..c8db6ee 100644 --- a/openstack-quantum/pom.xml +++ b/openstack-quantum/pom.xml @@ -20,14 +20,15 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>jclouds-labs-openstack</artifactId> + <groupId>org.apache.jclouds</groupId> + <artifactId>jclouds-project</artifactId> <version>1.7.0-SNAPSHOT</version> </parent> <!-- TODO: when out of labs, switch to org.jclouds.api --> <groupId>org.apache.jclouds.labs</groupId> <artifactId>openstack-quantum</artifactId> + <version>1.7.0-SNAPSHOT</version> <name>jclouds openstack-quantum api</name> <description>jclouds components to access an implementation of OpenStack Quantum</description> <packaging>bundle</packaging> @@ -54,31 +55,31 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jclouds.driver</groupId> <artifactId>jclouds-slf4j</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/d9acba69/openstack-swift/pom.xml ---------------------------------------------------------------------- diff --git a/openstack-swift/pom.xml b/openstack-swift/pom.xml index 3f445ea..b40a106 100644 --- a/openstack-swift/pom.xml +++ b/openstack-swift/pom.xml @@ -20,14 +20,15 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>jclouds-labs-openstack</artifactId> + <groupId>org.apache.jclouds</groupId> + <artifactId>jclouds-project</artifactId> <version>1.7.0-SNAPSHOT</version> </parent> <!-- TODO: when out of labs, switch to org.jclouds.api --> <groupId>org.apache.jclouds.labs</groupId> <artifactId>openstack-swift</artifactId> + <version>1.7.0-SNAPSHOT</version> <name>jclouds openstack-swift api</name> <description>jclouds components to access an implementation of OpenStack Swift</description> <packaging>bundle</packaging> @@ -57,38 +58,38 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-blobstore</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-blobstore</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jclouds.driver</groupId> <artifactId>jclouds-slf4j</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/d9acba69/openstack-trove/pom.xml ---------------------------------------------------------------------- diff --git a/openstack-trove/pom.xml b/openstack-trove/pom.xml index ec02eb2..6b5f4db 100644 --- a/openstack-trove/pom.xml +++ b/openstack-trove/pom.xml @@ -20,13 +20,15 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>jclouds-labs-openstack</artifactId> + <groupId>org.apache.jclouds</groupId> + <artifactId>jclouds-project</artifactId> <version>1.7.0-SNAPSHOT</version> </parent> <!-- TODO: when out of labs, switch to org.jclouds.api --> + <groupId>org.apache.jclouds.labs</groupId> <artifactId>openstack-trove</artifactId> + <version>1.7.0-SNAPSHOT</version> <name>jclouds openstack-trove api</name> <description>jclouds components to access an implementation of OpenStack Trove</description> <packaging>bundle</packaging> @@ -54,31 +56,31 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jclouds.driver</groupId> <artifactId>jclouds-slf4j</artifactId> - <version>${jclouds.version}</version> + <version>${project.parent.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/d9acba69/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index eed889c..814b44e 100644 --- a/pom.xml +++ b/pom.xml @@ -19,15 +19,18 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-project</artifactId> <version>1.7.0-SNAPSHOT</version> </parent> + <groupId>org.apache.jclouds.labs</groupId> <artifactId>jclouds-labs-openstack</artifactId> - <packaging>pom</packaging> + <version>1.7.0-SNAPSHOT</version> <name>Apache jclouds labs openstack</name> + <packaging>pom</packaging> <scm> <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack.git</connection> @@ -36,10 +39,6 @@ <tag>HEAD</tag> </scm> - <properties> - <jclouds.version>1.7.0-SNAPSHOT</jclouds.version> - </properties> - <repositories> <repository> <id>apache-snapshots</id> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/d9acba69/rackspace-clouddatabases-uk/pom.xml ---------------------------------------------------------------------- diff --git a/rackspace-clouddatabases-uk/pom.xml b/rackspace-clouddatabases-uk/pom.xml index dc08876..acbb0e2 100644 --- a/rackspace-clouddatabases-uk/pom.xml +++ b/rackspace-clouddatabases-uk/pom.xml @@ -20,15 +20,16 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>jclouds-labs-openstack</artifactId> - <version>1.7.0-SNAPSHOT</version> + <groupId>org.apache.jclouds</groupId> + <artifactId>jclouds-project</artifactId> + <version>1.7.0-SNAPSHOT</version> </parent> <!-- TODO: when out of labs, switch to org.jclouds.provider; update dependencies when Trove is moved to jclouds --> - <groupId>org.apache.jclouds.provider</groupId> + <groupId>org.apache.jclouds.labs</groupId> <artifactId>rackspace-clouddatabases-uk</artifactId> + <version>1.7.0-SNAPSHOT</version> <name>jclouds Rackspace Cloud Databases UK provider</name> <description>OpenStack Trove implementation targeted to Rackspace Cloud Databases UK</description> <packaging>bundle</packaging> @@ -53,55 +54,55 @@ <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds.labs</groupId> <artifactId>openstack-trove</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>rackspace-cloudidentity</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jclouds.labs</groupId> <artifactId>openstack-trove</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>rackspace-cloudidentity</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jclouds.driver</groupId> <artifactId>jclouds-slf4j</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/d9acba69/rackspace-clouddatabases-us/pom.xml ---------------------------------------------------------------------- diff --git a/rackspace-clouddatabases-us/pom.xml b/rackspace-clouddatabases-us/pom.xml index 8d6ab03..d89e790 100644 --- a/rackspace-clouddatabases-us/pom.xml +++ b/rackspace-clouddatabases-us/pom.xml @@ -20,15 +20,16 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>jclouds-labs-openstack</artifactId> - <version>1.7.0-SNAPSHOT</version> + <groupId>org.apache.jclouds</groupId> + <artifactId>jclouds-project</artifactId> + <version>1.7.0-SNAPSHOT</version> </parent> <!-- TODO: when out of labs, switch to org.jclouds.provider; update dependencies when Trove is moved to jclouds --> - <groupId>org.apache.jclouds.provider</groupId> + <groupId>org.apache.jclouds.labs</groupId> <artifactId>rackspace-clouddatabases-us</artifactId> + <version>1.7.0-SNAPSHOT</version> <name>jclouds Rackspace Cloud Databases US provider</name> <description>OpenStack Trove implementation targeted to Rackspace Cloud Databases US</description> <packaging>bundle</packaging> @@ -53,55 +54,55 @@ <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds.labs</groupId> <artifactId>openstack-trove</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>rackspace-cloudidentity</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jclouds.labs</groupId> <artifactId>openstack-trove</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>rackspace-cloudidentity</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jclouds.driver</groupId> <artifactId>jclouds-slf4j</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> <scope>test</scope> </dependency> <dependency>
