Aligned pom.xml files for Chef
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/c9dfb07d Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/c9dfb07d Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/c9dfb07d Branch: refs/heads/master Commit: c9dfb07d02522e6a3e5552e55de3761f42d62892 Parents: 8a2de9a Author: Ignasi Barrera <[email protected]> Authored: Fri Oct 10 11:27:33 2014 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Fri Oct 10 15:11:27 2014 +0200 ---------------------------------------------------------------------- all/pom.xml | 10 ++++++++++ apis/chef/pom.xml | 24 ++++++++++++------------ apis/pom.xml | 1 + project/pom.xml | 2 ++ providers/enterprisechef/pom.xml | 15 +++++++-------- providers/pom.xml | 1 + 6 files changed, 33 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/c9dfb07d/all/pom.xml ---------------------------------------------------------------------- diff --git a/all/pom.xml b/all/pom.xml index 0510b0a..ce0fd2e 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -44,6 +44,11 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.jclouds.api</groupId> + <artifactId>chef</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.apache.jclouds.provider</groupId> <artifactId>aws-cloudwatch</artifactId> <version>${project.version}</version> @@ -104,6 +109,11 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.jclouds.provider</groupId> + <artifactId>enterprisechef</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>jclouds-allloadbalancer</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/jclouds/blob/c9dfb07d/apis/chef/pom.xml ---------------------------------------------------------------------- diff --git a/apis/chef/pom.xml b/apis/chef/pom.xml index 0744ba3..865d30a 100644 --- a/apis/chef/pom.xml +++ b/apis/chef/pom.xml @@ -20,15 +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.chef</groupId> - <artifactId>chef-project</artifactId> + <groupId>org.apache.jclouds</groupId> + <artifactId>jclouds-project</artifactId> <version>2.0.0-SNAPSHOT</version> - <relativePath>../project/pom.xml</relativePath> + <relativePath>../../project/pom.xml</relativePath> </parent> <groupId>org.apache.jclouds.api</groupId> <artifactId>chef</artifactId> <packaging>bundle</packaging> - <name>Apache jclouds Chef :: Core</name> + <name>jclouds Chef api</name> <description>jclouds components to access Chef</description> <properties> @@ -38,8 +38,8 @@ <test.chef.identity>chef-webui</test.chef.identity> <test.chef.credential>${user.home}/.chef/webui.pem</test.chef.credential> <jclouds.osgi.import> - org.jclouds;version=${jclouds.version}, - org.jclouds*;version=${jclouds.version}, + org.jclouds;version=${project.version}, + org.jclouds*;version=${project.version}, * </jclouds.osgi.import> <jclouds.osgi.export> @@ -52,24 +52,24 @@ <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>${jclouds.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>${jclouds.version}</version> + <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-scriptbuilder</artifactId> - <version>${jclouds.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-scriptbuilder</artifactId> - <version>${jclouds.version}</version> + <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> @@ -83,13 +83,13 @@ <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-blobstore</artifactId> - <version>${jclouds.version}</version> + <version>${project.version}</version> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.jclouds.driver</groupId> <artifactId>jclouds-slf4j</artifactId> - <version>${jclouds.version}</version> + <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/jclouds/blob/c9dfb07d/apis/pom.xml ---------------------------------------------------------------------- diff --git a/apis/pom.xml b/apis/pom.xml index 5226afe..b8efcda 100644 --- a/apis/pom.xml +++ b/apis/pom.xml @@ -54,5 +54,6 @@ <module>rackspace-clouddns</module> <module>sts</module> <module>route53</module> + <module>chef</module> </modules> </project> http://git-wip-us.apache.org/repos/asf/jclouds/blob/c9dfb07d/project/pom.xml ---------------------------------------------------------------------- diff --git a/project/pom.xml b/project/pom.xml index 933bb51..0bea1a0 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -532,8 +532,10 @@ <ignoredResource>logback.xml</ignoredResource> <ignoredResource>amzn_images.xml</ignoredResource> <ignoredResource>test.jks</ignoredResource> + <ignoredResource>test</ignoredResource> <ignoredResource>CreateInternetService-options-test.xml</ignoredResource> <ignoredResource>.gitattributes</ignoredResource> + <ignoredResource>functions/.gitattributes</ignoredResource> <ignoredResource>OSGI-OPT/bnd.bnd</ignoredResource> <!-- For bouncycastle --> <ignoredResource>META-INF/BCKEY.DSA</ignoredResource> http://git-wip-us.apache.org/repos/asf/jclouds/blob/c9dfb07d/providers/enterprisechef/pom.xml ---------------------------------------------------------------------- diff --git a/providers/enterprisechef/pom.xml b/providers/enterprisechef/pom.xml index adce960..d256601 100644 --- a/providers/enterprisechef/pom.xml +++ b/providers/enterprisechef/pom.xml @@ -20,14 +20,14 @@ <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.chef</groupId> - <artifactId>chef-project</artifactId> + <groupId>org.apache.jclouds</groupId> + <artifactId>jclouds-project</artifactId> <version>2.0.0-SNAPSHOT</version> - <relativePath>../project/pom.xml</relativePath> + <relativePath>../../project/pom.xml</relativePath> </parent> <groupId>org.apache.jclouds.provider</groupId> <artifactId>enterprisechef</artifactId> - <name>Apache jclouds Chef :: Enterprise</name> + <name>jclouds Enterprise Chef provider</name> <description>jclouds components to access Enterprise Chef</description> <properties> @@ -38,7 +38,7 @@ <test.enterprisechef.identity>YOUR_USER</test.enterprisechef.identity> <test.enterprisechef.credential>${user.home}/.chef/${test.enterprisechef.org}/${test.enterprisechef.identity}.pem</test.enterprisechef.credential> <jclouds.osgi.export>org.jclouds.enterprisechef*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import>org.jclouds*;version="${jclouds.version}",*</jclouds.osgi.import> + <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> </properties> <dependencies> @@ -57,20 +57,19 @@ <dependency> <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-core</artifactId> - <version>${jclouds.version}</version> + <version>${project.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.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>1.0.9</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/jclouds/blob/c9dfb07d/providers/pom.xml ---------------------------------------------------------------------- diff --git a/providers/pom.xml b/providers/pom.xml index d1ef987..5a3dcec 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -72,5 +72,6 @@ <module>aws-route53</module> <module>ultradns-ws</module> <module>dynect</module> + <module>enterprisechef</module> </modules> </project>
