Updated Branches: refs/heads/1.6.x a07ffce93 -> 519200b34
Revert "[maven-release-plugin] prepare release jclouds-karaf-1.6.1-incubating-rc1" This reverts commit 964f2694b5198c7916869308c2c644a2f71927ff. Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/commit/24d8317a Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/tree/24d8317a Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/diff/24d8317a Branch: refs/heads/1.6.x Commit: 24d8317a444072626584d33b81dca71fb96217f5 Parents: a07ffce Author: Andrew Bayer <[email protected]> Authored: Fri May 31 15:13:53 2013 -0700 Committer: Andrew Bayer <[email protected]> Committed: Fri May 31 15:13:53 2013 -0700 ---------------------------------------------------------------------- cache/pom.xml | 2 +- chef/cache/pom.xml | 4 ++-- chef/commands/pom.xml | 4 ++-- chef/core/pom.xml | 4 ++-- chef/pom.xml | 8 +++++--- chef/services/pom.xml | 4 ++-- commands/pom.xml | 2 +- core/pom.xml | 2 +- feature/pom.xml | 2 +- itests/pom.xml | 2 +- pom.xml | 4 ++-- recipe/pom.xml | 2 +- services/pom.xml | 2 +- urlhandler/pom.xml | 2 +- utils/pom.xml | 2 +- 15 files changed, 24 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/24d8317a/cache/pom.xml ---------------------------------------------------------------------- diff --git a/cache/pom.xml b/cache/pom.xml index d81990c..8c14daa 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -20,7 +20,7 @@ limitations under the License. <parent> <artifactId>jclouds-karaf</artifactId> <groupId>org.apache.jclouds</groupId> - <version>1.6.1-incubating</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/24d8317a/chef/cache/pom.xml ---------------------------------------------------------------------- diff --git a/chef/cache/pom.xml b/chef/cache/pom.xml index 9fb1c15..abbddde 100644 --- a/chef/cache/pom.xml +++ b/chef/cache/pom.xml @@ -20,13 +20,13 @@ limitations under the License. <parent> <artifactId>chef</artifactId> <groupId>org.apache.jclouds.karaf</groupId> - <version>1.6.1-incubating</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.jclouds.karaf.chef</groupId> <artifactId>cache</artifactId> - <version>1.6.1-incubating</version> + <version>1.6.1-SNAPSHOT</version> <packaging>bundle</packaging> <name>JClouds :: Karaf :: Chef :: Cache</name> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/24d8317a/chef/commands/pom.xml ---------------------------------------------------------------------- diff --git a/chef/commands/pom.xml b/chef/commands/pom.xml index 5f3f120..9f7136d 100644 --- a/chef/commands/pom.xml +++ b/chef/commands/pom.xml @@ -20,13 +20,13 @@ limitations under the License. <parent> <artifactId>chef</artifactId> <groupId>org.apache.jclouds.karaf</groupId> - <version>1.6.1-incubating</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.jclouds.karaf.chef</groupId> <artifactId>commands</artifactId> - <version>1.6.1-incubating</version> + <version>1.6.1-SNAPSHOT</version> <packaging>bundle</packaging> <name>JClouds :: Karaf :: Chef :: Commands</name> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/24d8317a/chef/core/pom.xml ---------------------------------------------------------------------- diff --git a/chef/core/pom.xml b/chef/core/pom.xml index 066eeec..8de195a 100644 --- a/chef/core/pom.xml +++ b/chef/core/pom.xml @@ -20,13 +20,13 @@ limitations under the License. <parent> <artifactId>chef</artifactId> <groupId>org.apache.jclouds.karaf</groupId> - <version>1.6.1-incubating</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.jclouds.karaf.chef</groupId> <artifactId>core</artifactId> - <version>1.6.1-incubating</version> + <version>1.6.1-SNAPSHOT</version> <name>JClouds :: Karaf :: Chef :: Core</name> <dependencies> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/24d8317a/chef/pom.xml ---------------------------------------------------------------------- diff --git a/chef/pom.xml b/chef/pom.xml index 09eb3c3..d9a183e 100644 --- a/chef/pom.xml +++ b/chef/pom.xml @@ -17,18 +17,20 @@ See the License for the specific language governing permissions and limitations under the License. --> -<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/xsd/maven-4.0.0.xsd";> +<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/xsd/maven-4.0.0.xsd";> <parent> <artifactId>jclouds-karaf</artifactId> <groupId>org.apache.jclouds</groupId> - <version>1.6.1-incubating</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.jclouds.karaf</groupId> <artifactId>chef</artifactId> <packaging>pom</packaging> - <version>1.6.1-incubating</version> + <version>1.6.1-SNAPSHOT</version> <name>JClouds :: Karaf :: Chef</name> <modules> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/24d8317a/chef/services/pom.xml ---------------------------------------------------------------------- diff --git a/chef/services/pom.xml b/chef/services/pom.xml index 7f2fbde..997aec6 100644 --- a/chef/services/pom.xml +++ b/chef/services/pom.xml @@ -20,13 +20,13 @@ limitations under the License. <parent> <artifactId>chef</artifactId> <groupId>org.apache.jclouds.karaf</groupId> - <version>1.6.1-incubating</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.jclouds.karaf.chef</groupId> <artifactId>services</artifactId> - <version>1.6.1-incubating</version> + <version>1.6.1-SNAPSHOT</version> <packaging>bundle</packaging> <name>JClouds :: Karaf :: Chef :: Services</name> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/24d8317a/commands/pom.xml ---------------------------------------------------------------------- diff --git a/commands/pom.xml b/commands/pom.xml index ddf8f28..9d233ed 100644 --- a/commands/pom.xml +++ b/commands/pom.xml @@ -19,7 +19,7 @@ limitations under the License. <parent> <artifactId>jclouds-karaf</artifactId> <groupId>org.apache.jclouds</groupId> - <version>1.6.1-incubating</version> + <version>1.6.1-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/24d8317a/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 8cb4618..d7ad086 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -20,7 +20,7 @@ limitations under the License. <parent> <artifactId>jclouds-karaf</artifactId> <groupId>org.apache.jclouds</groupId> - <version>1.6.1-incubating</version> + <version>1.6.1-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/24d8317a/feature/pom.xml ---------------------------------------------------------------------- diff --git a/feature/pom.xml b/feature/pom.xml index a672570..3df1046 100644 --- a/feature/pom.xml +++ b/feature/pom.xml @@ -19,7 +19,7 @@ limitations under the License. <parent> <artifactId>jclouds-karaf</artifactId> <groupId>org.apache.jclouds</groupId> - <version>1.6.1-incubating</version> + <version>1.6.1-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/24d8317a/itests/pom.xml ---------------------------------------------------------------------- diff --git a/itests/pom.xml b/itests/pom.xml index ebae90d..0b2bd94 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -20,7 +20,7 @@ limitations under the License. <parent> <artifactId>jclouds-karaf</artifactId> <groupId>org.apache.jclouds</groupId> - <version>1.6.1-incubating</version> + <version>1.6.1-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/24d8317a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8a76631..0910c68 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ limitations under the License. <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-karaf</artifactId> <packaging>pom</packaging> - <version>1.6.1-incubating</version> + <version>1.6.1-SNAPSHOT</version> <name>JClouds :: Karaf</name> <description>Jclouds Karaf Integration Project</description> @@ -44,7 +44,7 @@ limitations under the License. <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf.git</connection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf.git</developerConnection> <url>https://git-wip-us.apache.org/repos/asf?p=incubator-jclouds-karaf.git</url> - <tag>jclouds-karaf-1.6.1-incubating-rc1</tag> + <tag>HEAD</tag> </scm> <developers> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/24d8317a/recipe/pom.xml ---------------------------------------------------------------------- diff --git a/recipe/pom.xml b/recipe/pom.xml index 762d6ce..9761ad5 100644 --- a/recipe/pom.xml +++ b/recipe/pom.xml @@ -20,7 +20,7 @@ limitations under the License. <parent> <artifactId>jclouds-karaf</artifactId> <groupId>org.apache.jclouds</groupId> - <version>1.6.1-incubating</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/24d8317a/services/pom.xml ---------------------------------------------------------------------- diff --git a/services/pom.xml b/services/pom.xml index 883fd8d..78f64d8 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -20,7 +20,7 @@ limitations under the License. <parent> <artifactId>jclouds-karaf</artifactId> <groupId>org.apache.jclouds</groupId> - <version>1.6.1-incubating</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/24d8317a/urlhandler/pom.xml ---------------------------------------------------------------------- diff --git a/urlhandler/pom.xml b/urlhandler/pom.xml index bee8a3e..5289ac7 100644 --- a/urlhandler/pom.xml +++ b/urlhandler/pom.xml @@ -20,7 +20,7 @@ limitations under the License. <parent> <artifactId>jclouds-karaf</artifactId> <groupId>org.apache.jclouds</groupId> - <version>1.6.1-incubating</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/24d8317a/utils/pom.xml ---------------------------------------------------------------------- diff --git a/utils/pom.xml b/utils/pom.xml index c79e2be..76ba319 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -20,7 +20,7 @@ limitations under the License. <parent> <artifactId>jclouds-karaf</artifactId> <groupId>org.apache.jclouds</groupId> - <version>1.6.1-incubating</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
