From ea1c772e2c9ac749fe65b4d7068d1f2f15e1a748 Mon Sep 17 00:00:00 2001
From: Ignasi Barrera <nacx@apache.org>
Date: Fri, 10 Oct 2014 11:27:33 +0200
Subject: [PATCH] Aligned pom.xml files for Chef

Conflicts:
	apis/chef/pom.xml
	providers/enterprisechef/pom.xml
---
 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(-)

diff --git a/all/pom.xml b/all/pom.xml
index 85418eb25d..f6e2225103 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -43,6 +43,11 @@
       <artifactId>rackspace-clouddns</artifactId>
       <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>
@@ -103,6 +108,11 @@
       <artifactId>dynect</artifactId>
       <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>
diff --git a/apis/chef/pom.xml b/apis/chef/pom.xml
index fee7190729..2c6c02a06a 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>1.8.2-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>
diff --git a/apis/pom.xml b/apis/pom.xml
index 89888e7944..1e94bb56da 100644
--- a/apis/pom.xml
+++ b/apis/pom.xml
@@ -52,6 +52,7 @@
     <module>rackspace-clouddns</module>
     <module>sts</module>
     <module>route53</module>
+    <module>chef</module>
   </modules>
   <profiles>
     <profile>
diff --git a/project/pom.xml b/project/pom.xml
index 27625fd726..e1669d049a 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -542,8 +542,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>
diff --git a/providers/enterprisechef/pom.xml b/providers/enterprisechef/pom.xml
index 1d608adf13..283c5399b8 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>1.8.2-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>
diff --git a/providers/pom.xml b/providers/pom.xml
index b8f412f5aa..4c6f0716bf 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -70,5 +70,6 @@
     <module>aws-route53</module>
     <module>ultradns-ws</module>
     <module>dynect</module>
+    <module>enterprisechef</module>
   </modules>
 </project>