Updated Branches: refs/heads/1.6.x a2b1ae070 -> 49083554a
Revert "[maven-release-plugin] prepare release jclouds-labs-openstack-1.6.2-incubating-rc1" This reverts commit a2b1ae07017ce0d4137ec32fd2d9bffdfea002e7. 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/8438b117 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/tree/8438b117 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/diff/8438b117 Branch: refs/heads/1.6.x Commit: 8438b117fcd82db7de38289e5a13b670ddd4eb0e Parents: a2b1ae0 Author: Andrew Phillips <[email protected]> Authored: Sat Aug 17 16:25:20 2013 -0400 Committer: Andrew Phillips <[email protected]> Committed: Sat Aug 17 16:25:20 2013 -0400 ---------------------------------------------------------------------- openstack-glance/pom.xml | 18 +++++++----------- openstack-quantum/pom.xml | 18 +++++++----------- openstack-swift/pom.xml | 20 ++++++++------------ openstack-trove/pom.xml | 18 +++++++----------- pom.xml | 6 +++--- rackspace-clouddatabases-uk/pom.xml | 22 +++++++++------------- rackspace-clouddatabases-us/pom.xml | 22 +++++++++------------- 7 files changed, 50 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/8438b117/openstack-glance/pom.xml ---------------------------------------------------------------------- diff --git a/openstack-glance/pom.xml b/openstack-glance/pom.xml index 59c5fa8..96bda8c 100644 --- a/openstack-glance/pom.xml +++ b/openstack-glance/pom.xml @@ -22,13 +22,13 @@ <parent> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-project</artifactId> - <version>1.6.2-incubating</version> + <version>1.6.2-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.6.2-incubating</version> + <version>1.6.2-SNAPSHOT</version> <name>jclouds openstack-glance api</name> <description>jclouds components to access an implementation of OpenStack Glance</description> <packaging>bundle</packaging> @@ -56,31 +56,31 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>1.6.2-incubating</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>1.6.2-incubating</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>1.6.2-incubating</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>1.6.2-incubating</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>1.6.2-incubating</version> + <version>${project.parent.version}</version> <scope>test</scope> </dependency> <dependency> @@ -123,8 +123,4 @@ </profile> </profiles> - - <scm> - <tag>jclouds-labs-openstack-1.6.2-incubating-rc1</tag> - </scm> </project> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/8438b117/openstack-quantum/pom.xml ---------------------------------------------------------------------- diff --git a/openstack-quantum/pom.xml b/openstack-quantum/pom.xml index 01c1c5f..df5e489 100644 --- a/openstack-quantum/pom.xml +++ b/openstack-quantum/pom.xml @@ -22,13 +22,13 @@ <parent> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-project</artifactId> - <version>1.6.2-incubating</version> + <version>1.6.2-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.6.2-incubating</version> + <version>1.6.2-SNAPSHOT</version> <name>jclouds openstack-quantum api</name> <description>jclouds components to access an implementation of OpenStack Quantum</description> <packaging>bundle</packaging> @@ -55,31 +55,31 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>1.6.2-incubating</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>1.6.2-incubating</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>1.6.2-incubating</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>1.6.2-incubating</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>1.6.2-incubating</version> + <version>${project.parent.version}</version> <scope>test</scope> </dependency> <dependency> @@ -122,8 +122,4 @@ </profile> </profiles> - - <scm> - <tag>jclouds-labs-openstack-1.6.2-incubating-rc1</tag> - </scm> </project> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/8438b117/openstack-swift/pom.xml ---------------------------------------------------------------------- diff --git a/openstack-swift/pom.xml b/openstack-swift/pom.xml index 5ba4d2c..19153a1 100644 --- a/openstack-swift/pom.xml +++ b/openstack-swift/pom.xml @@ -22,13 +22,13 @@ <parent> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-project</artifactId> - <version>1.6.2-incubating</version> + <version>1.6.2-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.6.2-incubating</version> + <version>1.6.2-SNAPSHOT</version> <name>jclouds openstack-swift api</name> <description>jclouds components to access an implementation of OpenStack Swift</description> <packaging>bundle</packaging> @@ -58,38 +58,38 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>1.6.2-incubating</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-blobstore</artifactId> - <version>1.6.2-incubating</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>1.6.2-incubating</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>1.6.2-incubating</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>1.6.2-incubating</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>1.6.2-incubating</version> + <version>${project.parent.version}</version> <scope>test</scope> </dependency> <dependency> @@ -134,8 +134,4 @@ </profile> </profiles> - - <scm> - <tag>jclouds-labs-openstack-1.6.2-incubating-rc1</tag> - </scm> </project> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/8438b117/openstack-trove/pom.xml ---------------------------------------------------------------------- diff --git a/openstack-trove/pom.xml b/openstack-trove/pom.xml index f7691b5..98b83c2 100644 --- a/openstack-trove/pom.xml +++ b/openstack-trove/pom.xml @@ -22,13 +22,13 @@ <parent> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-project</artifactId> - <version>1.6.2-incubating</version> + <version>1.6.2-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.6.2-incubating</version> + <version>1.6.2-SNAPSHOT</version> <name>jclouds openstack-trove api</name> <description>jclouds components to access an implementation of OpenStack Trove</description> <packaging>bundle</packaging> @@ -56,31 +56,31 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>1.6.2-incubating</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>1.6.2-incubating</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>1.6.2-incubating</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>1.6.2-incubating</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>1.6.2-incubating</version> + <version>${project.parent.version}</version> <scope>test</scope> </dependency> <dependency> @@ -126,8 +126,4 @@ </profile> </profiles> - - <scm> - <tag>jclouds-labs-openstack-1.6.2-incubating-rc1</tag> - </scm> </project> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/8438b117/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index cc8286d..6d16f28 100644 --- a/pom.xml +++ b/pom.xml @@ -23,12 +23,12 @@ <parent> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-project</artifactId> - <version>1.6.2-incubating</version> + <version>1.6.2-SNAPSHOT</version> </parent> <groupId>org.apache.jclouds.labs</groupId> <artifactId>jclouds-labs-openstack</artifactId> - <version>1.6.2-incubating</version> + <version>1.6.2-SNAPSHOT</version> <name>Apache jclouds labs openstack</name> <packaging>pom</packaging> @@ -36,7 +36,7 @@ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack.git</connection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack.git</developerConnection> <url>https://git-wip-us.apache.org/repos/asf?p=incubator-jclouds-labs-openstack.git</url> - <tag>jclouds-labs-openstack-1.6.2-incubating-rc1</tag> + <tag>HEAD</tag> </scm> <repositories> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/8438b117/rackspace-clouddatabases-uk/pom.xml ---------------------------------------------------------------------- diff --git a/rackspace-clouddatabases-uk/pom.xml b/rackspace-clouddatabases-uk/pom.xml index 04f056d..1802671 100644 --- a/rackspace-clouddatabases-uk/pom.xml +++ b/rackspace-clouddatabases-uk/pom.xml @@ -22,14 +22,14 @@ <parent> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-project</artifactId> - <version>1.6.2-incubating</version> + <version>1.6.2-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.labs</groupId> <artifactId>rackspace-clouddatabases-uk</artifactId> - <version>1.6.2-incubating</version> + <version>1.6.2-SNAPSHOT</version> <name>jclouds Rackspace Cloud Databases UK provider</name> <description>OpenStack Trove implementation targeted to Rackspace Cloud Databases UK</description> <packaging>bundle</packaging> @@ -54,7 +54,7 @@ <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>1.6.2-incubating</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds.labs</groupId> @@ -64,17 +64,17 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>1.6.2-incubating</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>rackspace-cloudidentity</artifactId> - <version>1.6.2-incubating</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>1.6.2-incubating</version> + <version>${project.parent.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> @@ -88,21 +88,21 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>1.6.2-incubating</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>1.6.2-incubating</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>1.6.2-incubating</version> + <version>${project.parent.version}</version> <scope>test</scope> </dependency> <dependency> @@ -148,8 +148,4 @@ </profile> </profiles> - - <scm> - <tag>jclouds-labs-openstack-1.6.2-incubating-rc1</tag> - </scm> </project> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/8438b117/rackspace-clouddatabases-us/pom.xml ---------------------------------------------------------------------- diff --git a/rackspace-clouddatabases-us/pom.xml b/rackspace-clouddatabases-us/pom.xml index ef73071..5613aef 100644 --- a/rackspace-clouddatabases-us/pom.xml +++ b/rackspace-clouddatabases-us/pom.xml @@ -22,14 +22,14 @@ <parent> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-project</artifactId> - <version>1.6.2-incubating</version> + <version>1.6.2-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.labs</groupId> <artifactId>rackspace-clouddatabases-us</artifactId> - <version>1.6.2-incubating</version> + <version>1.6.2-SNAPSHOT</version> <name>jclouds Rackspace Cloud Databases US provider</name> <description>OpenStack Trove implementation targeted to Rackspace Cloud Databases US</description> <packaging>bundle</packaging> @@ -54,7 +54,7 @@ <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>1.6.2-incubating</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds.labs</groupId> @@ -64,17 +64,17 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>1.6.2-incubating</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>rackspace-cloudidentity</artifactId> - <version>1.6.2-incubating</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>1.6.2-incubating</version> + <version>${project.parent.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> @@ -88,21 +88,21 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> - <version>1.6.2-incubating</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>1.6.2-incubating</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>1.6.2-incubating</version> + <version>${project.parent.version}</version> <scope>test</scope> </dependency> <dependency> @@ -148,8 +148,4 @@ </profile> </profiles> - - <scm> - <tag>jclouds-labs-openstack-1.6.2-incubating-rc1</tag> - </scm> </project>
