Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Aligned pom.xml files for Chef 

Conflicts:
	apis/chef/pom.xml
	providers/enterprisechef/pom.xml
This commit is contained in:
Ignasi Barrera 2014-10-10 11:27:33 +02:00
parent da34161ffa
commit ea1c772e2c
6 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
all/pom.xml
View File

@ -43,6 +43,11 @@
<artifactId>rackspace-clouddns</artifactId> <artifactId>rackspace-clouddns</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>chef</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.jclouds.provider</groupId> <groupId>org.apache.jclouds.provider</groupId>
<artifactId>aws-cloudwatch</artifactId> <artifactId>aws-cloudwatch</artifactId>
@ -103,6 +108,11 @@
<artifactId>dynect</artifactId> <artifactId>dynect</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.jclouds.provider</groupId>
<artifactId>enterprisechef</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>jclouds-allloadbalancer</artifactId> <artifactId>jclouds-allloadbalancer</artifactId>

24
apis/chef/pom.xml
View File

@ -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"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.jclouds.chef</groupId> <groupId>org.apache.jclouds</groupId>
<artifactId>chef-project</artifactId> <artifactId>jclouds-project</artifactId>
<version>1.8.2-SNAPSHOT</version> <version>1.8.2-SNAPSHOT</version>
<relativePath>../project/pom.xml</relativePath> <relativePath>../../project/pom.xml</relativePath>
</parent> </parent>
<groupId>org.apache.jclouds.api</groupId> <groupId>org.apache.jclouds.api</groupId>
<artifactId>chef</artifactId> <artifactId>chef</artifactId>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>Apache jclouds Chef :: Core</name> <name>jclouds Chef api</name>
<description>jclouds components to access Chef</description> <description>jclouds components to access Chef</description>
<properties> <properties>
@ -38,8 +38,8 @@
<test.chef.identity>chef-webui</test.chef.identity> <test.chef.identity>chef-webui</test.chef.identity>
<test.chef.credential>${user.home}/.chef/webui.pem</test.chef.credential> <test.chef.credential>${user.home}/.chef/webui.pem</test.chef.credential>
<jclouds.osgi.import> <jclouds.osgi.import>
org.jclouds;version=${jclouds.version}, org.jclouds;version=${project.version},
org.jclouds*;version=${jclouds.version}, org.jclouds*;version=${project.version},
* *
</jclouds.osgi.import> </jclouds.osgi.import>
<jclouds.osgi.export> <jclouds.osgi.export>
@ -52,24 +52,24 @@
<dependency> <dependency>
<groupId>org.apache.jclouds</groupId> <groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-core</artifactId> <artifactId>jclouds-core</artifactId>
<version>${jclouds.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.jclouds</groupId> <groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-core</artifactId> <artifactId>jclouds-core</artifactId>
<version>${jclouds.version}</version> <version>${project.version}</version>
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.jclouds</groupId> <groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-scriptbuilder</artifactId> <artifactId>jclouds-scriptbuilder</artifactId>
<version>${jclouds.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.jclouds</groupId> <groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-scriptbuilder</artifactId> <artifactId>jclouds-scriptbuilder</artifactId>
<version>${jclouds.version}</version> <version>${project.version}</version>
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@ -83,13 +83,13 @@
<dependency> <dependency>
<groupId>org.apache.jclouds</groupId> <groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-blobstore</artifactId> <artifactId>jclouds-blobstore</artifactId>
<version>${jclouds.version}</version> <version>${project.version}</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.jclouds.driver</groupId> <groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-slf4j</artifactId> <artifactId>jclouds-slf4j</artifactId>
<version>${jclouds.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

1
apis/pom.xml
View File

@ -52,6 +52,7 @@
<module>rackspace-clouddns</module> <module>rackspace-clouddns</module>
<module>sts</module> <module>sts</module>
<module>route53</module> <module>route53</module>
<module>chef</module>
</modules> </modules>
<profiles> <profiles>
<profile> <profile>

2
project/pom.xml
View File

@ -542,8 +542,10 @@
<ignoredResource>logback.xml</ignoredResource> <ignoredResource>logback.xml</ignoredResource>
<ignoredResource>amzn_images.xml</ignoredResource> <ignoredResource>amzn_images.xml</ignoredResource>
<ignoredResource>test.jks</ignoredResource> <ignoredResource>test.jks</ignoredResource>
<ignoredResource>test</ignoredResource>
<ignoredResource>CreateInternetService-options-test.xml</ignoredResource> <ignoredResource>CreateInternetService-options-test.xml</ignoredResource>
<ignoredResource>.gitattributes</ignoredResource> <ignoredResource>.gitattributes</ignoredResource>
<ignoredResource>functions/.gitattributes</ignoredResource>
<ignoredResource>OSGI-OPT/bnd.bnd</ignoredResource> <ignoredResource>OSGI-OPT/bnd.bnd</ignoredResource>
<!-- For bouncycastle --> <!-- For bouncycastle -->
<ignoredResource>META-INF/BCKEY.DSA</ignoredResource> <ignoredResource>META-INF/BCKEY.DSA</ignoredResource>

15
providers/enterprisechef/pom.xml
View File

@ -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"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.jclouds.chef</groupId> <groupId>org.apache.jclouds</groupId>
<artifactId>chef-project</artifactId> <artifactId>jclouds-project</artifactId>
<version>1.8.2-SNAPSHOT</version> <version>1.8.2-SNAPSHOT</version>
<relativePath>../project/pom.xml</relativePath> <relativePath>../../project/pom.xml</relativePath>
</parent> </parent>
<groupId>org.apache.jclouds.provider</groupId> <groupId>org.apache.jclouds.provider</groupId>
<artifactId>enterprisechef</artifactId> <artifactId>enterprisechef</artifactId>
<name>Apache jclouds Chef :: Enterprise</name> <name>jclouds Enterprise Chef provider</name>
<description>jclouds components to access Enterprise Chef</description> <description>jclouds components to access Enterprise Chef</description>
<properties> <properties>
@ -38,7 +38,7 @@
<test.enterprisechef.identity>YOUR_USER</test.enterprisechef.identity> <test.enterprisechef.identity>YOUR_USER</test.enterprisechef.identity>
<test.enterprisechef.credential>${user.home}/.chef/${test.enterprisechef.org}/${test.enterprisechef.identity}.pem</test.enterprisechef.credential> <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.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> </properties>
<dependencies> <dependencies>
@ -57,20 +57,19 @@
<dependency> <dependency>
<groupId>org.apache.jclouds</groupId> <groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-core</artifactId> <artifactId>jclouds-core</artifactId>
<version>${jclouds.version}</version> <version>${project.version}</version>
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.jclouds.driver</groupId> <groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-slf4j</artifactId> <artifactId>jclouds-slf4j</artifactId>
<version>${jclouds.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
<version>1.0.9</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

1
providers/pom.xml
View File

@ -70,5 +70,6 @@
<module>aws-route53</module> <module>aws-route53</module>
<module>ultradns-ws</module> <module>ultradns-ws</module>
<module>dynect</module> <module>dynect</module>
<module>enterprisechef</module>
</modules> </modules>
</project> </project>