Amend poms after promoting DigitalOcean v2
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/edacad2b Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/edacad2b Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/edacad2b Branch: refs/heads/master Commit: edacad2b6e01ff94cdf4c5733f847cd9374110b9 Parents: 886aa15 Author: Ignasi Barrera <[email protected]> Authored: Thu Jan 21 00:08:42 2016 +0100 Committer: Ignasi Barrera <[email protected]> Committed: Thu Jan 21 01:02:58 2016 +0100 ---------------------------------------------------------------------- allcompute/pom.xml | 5 + project/pom.xml | 1 + providers/digitalocean2/pom.xml | 263 ++++++++++++++++++----------------- providers/pom.xml | 1 + 4 files changed, 142 insertions(+), 128 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/edacad2b/allcompute/pom.xml ---------------------------------------------------------------------- diff --git a/allcompute/pom.xml b/allcompute/pom.xml index 04edaa6..cf6b4e0 100644 --- a/allcompute/pom.xml +++ b/allcompute/pom.xml @@ -123,5 +123,10 @@ <artifactId>google-compute-engine</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.jclouds.provider</groupId> + <artifactId>digitalocean2</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/jclouds/blob/edacad2b/project/pom.xml ---------------------------------------------------------------------- diff --git a/project/pom.xml b/project/pom.xml index ed38a8f..7909e93 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -490,6 +490,7 @@ <!-- SSH keys --> <exclude>**/test</exclude> <exclude>**/test.pub</exclude> + <exclude>**/src/test/resources/**/ssh-*.pub</exclude> <!-- temporary files or those generated by IDE or SCM --> <exclude>**/target/**</exclude> http://git-wip-us.apache.org/repos/asf/jclouds/blob/edacad2b/providers/digitalocean2/pom.xml ---------------------------------------------------------------------- diff --git a/providers/digitalocean2/pom.xml b/providers/digitalocean2/pom.xml index 5b211d4..c1dd83d 100644 --- a/providers/digitalocean2/pom.xml +++ b/providers/digitalocean2/pom.xml @@ -18,135 +18,142 @@ --> <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.labs</groupId> - <artifactId>jclouds-labs</artifactId> - <version>2.0.0-SNAPSHOT</version> - </parent> + 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</groupId> + <artifactId>jclouds-project</artifactId> + <version>2.0.0-SNAPSHOT</version> + <relativePath>../../project/pom.xml</relativePath> + </parent> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>digitalocean2</artifactId> - <name>jclouds DigitalOcean v2 API Provider</name> - <description>jclouds provider for Digital Ocean v2 Compute API</description> + <groupId>org.apache.jclouds.provider</groupId> + <artifactId>digitalocean2</artifactId> + <name>jclouds DigitalOcean v2 API Provider</name> + <description>jclouds provider for Digital Ocean v2 Compute API</description> - <properties> - <test.digitalocean2.endpoint>https://api.digitalocean.com/v2/</test.digitalocean2.endpoint> - <test.digitalocean2.api-version>2</test.digitalocean2.api-version> - <test.digitalocean2.identity>FIXME</test.digitalocean2.identity> - <test.digitalocean2.credential>FIXME</test.digitalocean2.credential> - <test.digitalocean2.template>osFamily=UBUNTU,os64Bit=true</test.digitalocean2.template> - </properties> + <properties> + <test.digitalocean2.endpoint>https://api.digitalocean.com/v2/</test.digitalocean2.endpoint> + <test.digitalocean2.api-version>2</test.digitalocean2.api-version> + <test.digitalocean2.identity>FIXME</test.digitalocean2.identity> + <test.digitalocean2.credential>FIXME</test.digitalocean2.credential> + <test.digitalocean2.template>osFamily=UBUNTU,os64Bit=true</test.digitalocean2.template> + <jclouds.osgi.export>org.jclouds.digitalocean2*;version="${project.version}"</jclouds.osgi.export> + <jclouds.osgi.import> + org.jclouds.rest.internal;version="${project.version}", + org.jclouds*;version="${project.version}", + * + </jclouds.osgi.import> + </properties> - <dependencies> - <dependency> - <groupId>org.apache.jclouds</groupId> - <artifactId>jclouds-core</artifactId> - <version>${jclouds.version}</version> - </dependency> - <dependency> - <groupId>org.apache.jclouds.api</groupId> - <artifactId>oauth</artifactId> - <version>${jclouds.version}</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.apache.jclouds.api</groupId> - <artifactId>oauth</artifactId> - <version>${jclouds.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jclouds</groupId> - <artifactId>jclouds-compute</artifactId> - <version>${jclouds.version}</version> - </dependency> - <dependency> - <groupId>org.apache.jclouds</groupId> - <artifactId>jclouds-compute</artifactId> - <version>${jclouds.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jclouds</groupId> - <artifactId>jclouds-core</artifactId> - <version>${jclouds.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> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jclouds.driver</groupId> - <artifactId>jclouds-sshj</artifactId> - <version>${jclouds.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.squareup.okhttp</groupId> - <artifactId>mockwebserver</artifactId> - <scope>test</scope> - <exclusions> - <!-- Already provided by jclouds-sshj --> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.google.auto.value</groupId> - <artifactId>auto-value</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.auto.service</groupId> - <artifactId>auto-service</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - <profiles> - <profile> - <id>live</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>integration</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <systemPropertyVariables> - <test.digitalocean2.endpoint>${test.digitalocean2.endpoint}</test.digitalocean2.endpoint> - <test.digitalocean2.api-version>${test.digitalocean2.api-version}</test.digitalocean2.api-version> - <test.digitalocean2.build-version>${test.digitalocean2.build-version}</test.digitalocean2.build-version> - <test.digitalocean2.identity>${test.digitalocean2.identity}</test.digitalocean2.identity> - <test.digitalocean2.credential>${test.digitalocean2.credential}</test.digitalocean2.credential> - <test.digitalocean2.template>${test.digitalocean2.template}</test.digitalocean2.template> - </systemPropertyVariables> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <dependencies> + <dependency> + <groupId>org.apache.jclouds</groupId> + <artifactId>jclouds-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jclouds.api</groupId> + <artifactId>oauth</artifactId> + <version>${project.version}</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.apache.jclouds.api</groupId> + <artifactId>oauth</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.jclouds</groupId> + <artifactId>jclouds-compute</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jclouds</groupId> + <artifactId>jclouds-compute</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.jclouds</groupId> + <artifactId>jclouds-core</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.jclouds.driver</groupId> + <artifactId>jclouds-slf4j</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.jclouds.driver</groupId> + <artifactId>jclouds-sshj</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.squareup.okhttp</groupId> + <artifactId>mockwebserver</artifactId> + <scope>test</scope> + <exclusions> + <!-- Already provided by jclouds-sshj --> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.google.auto.value</groupId> + <artifactId>auto-value</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <profiles> + <profile> + <id>live</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <executions> + <execution> + <id>integration</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <systemPropertyVariables> + <test.digitalocean2.endpoint>${test.digitalocean2.endpoint}</test.digitalocean2.endpoint> + <test.digitalocean2.api-version>${test.digitalocean2.api-version}</test.digitalocean2.api-version> + <test.digitalocean2.build-version>${test.digitalocean2.build-version}</test.digitalocean2.build-version> + <test.digitalocean2.identity>${test.digitalocean2.identity}</test.digitalocean2.identity> + <test.digitalocean2.credential>${test.digitalocean2.credential}</test.digitalocean2.credential> + <test.digitalocean2.template>${test.digitalocean2.template}</test.digitalocean2.template> + </systemPropertyVariables> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/jclouds/blob/edacad2b/providers/pom.xml ---------------------------------------------------------------------- diff --git a/providers/pom.xml b/providers/pom.xml index ec6fffe..353c2f4 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -36,6 +36,7 @@ <module>aws-ec2</module> <module>aws-sqs</module> <module>aws-cloudwatch</module> + <module>digitalocean2</module> <module>elastichosts-lon-p</module> <module>elastichosts-sat-p</module> <module>elastichosts-lon-b</module>
