mirror of https://github.com/apache/jclouds.git
Amend poms after promoting DigitalOcean v2
This commit is contained in:
Ignasi Barrera
parent
886aa156b4
commit
edacad2b6e
|
|
@ -123,5 +123,10 @@
|
||||||
<artifactId>google-compute-engine</artifactId>
|
<artifactId>google-compute-engine</artifactId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.jclouds.provider</groupId>
|
||||||
|
<artifactId>digitalocean2</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
|
|
|
||||||
|
|
@ -490,6 +490,7 @@
|
||||||
<!-- SSH keys -->
|
<!-- SSH keys -->
|
||||||
<exclude>**/test</exclude>
|
<exclude>**/test</exclude>
|
||||||
<exclude>**/test.pub</exclude>
|
<exclude>**/test.pub</exclude>
|
||||||
|
<exclude>**/src/test/resources/**/ssh-*.pub</exclude>
|
||||||
|
|
||||||
<!-- temporary files or those generated by IDE or SCM -->
|
<!-- temporary files or those generated by IDE or SCM -->
|
||||||
<exclude>**/target/**</exclude>
|
<exclude>**/target/**</exclude>
|
||||||
|
|
|
||||||
|
|
@ -18,135 +18,142 @@
|
||||||
|
|
||||||
-->
|
-->
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<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">
|
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.labs</groupId>
|
<groupId>org.apache.jclouds</groupId>
|
||||||
<artifactId>jclouds-labs</artifactId>
|
<artifactId>jclouds-project</artifactId>
|
||||||
<version>2.0.0-SNAPSHOT</version>
|
<version>2.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
<relativePath>../../project/pom.xml</relativePath>
|
||||||
|
</parent>
|
||||||
|
|
||||||
<groupId>org.apache.jclouds.labs</groupId>
|
<groupId>org.apache.jclouds.provider</groupId>
|
||||||
<artifactId>digitalocean2</artifactId>
|
<artifactId>digitalocean2</artifactId>
|
||||||
<name>jclouds DigitalOcean v2 API Provider</name>
|
<name>jclouds DigitalOcean v2 API Provider</name>
|
||||||
<description>jclouds provider for Digital Ocean v2 Compute API</description>
|
<description>jclouds provider for Digital Ocean v2 Compute API</description>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<test.digitalocean2.endpoint>https://api.digitalocean.com/v2/</test.digitalocean2.endpoint>
|
<test.digitalocean2.endpoint>https://api.digitalocean.com/v2/</test.digitalocean2.endpoint>
|
||||||
<test.digitalocean2.api-version>2</test.digitalocean2.api-version>
|
<test.digitalocean2.api-version>2</test.digitalocean2.api-version>
|
||||||
<test.digitalocean2.identity>FIXME</test.digitalocean2.identity>
|
<test.digitalocean2.identity>FIXME</test.digitalocean2.identity>
|
||||||
<test.digitalocean2.credential>FIXME</test.digitalocean2.credential>
|
<test.digitalocean2.credential>FIXME</test.digitalocean2.credential>
|
||||||
<test.digitalocean2.template>osFamily=UBUNTU,os64Bit=true</test.digitalocean2.template>
|
<test.digitalocean2.template>osFamily=UBUNTU,os64Bit=true</test.digitalocean2.template>
|
||||||
</properties>
|
<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>
|
<dependencies>
|
||||||
<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.api</groupId>
|
<groupId>org.apache.jclouds.api</groupId>
|
||||||
<artifactId>oauth</artifactId>
|
<artifactId>oauth</artifactId>
|
||||||
<version>${jclouds.version}</version>
|
<version>${project.version}</version>
|
||||||
<type>jar</type>
|
<type>jar</type>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.jclouds.api</groupId>
|
<groupId>org.apache.jclouds.api</groupId>
|
||||||
<artifactId>oauth</artifactId>
|
<artifactId>oauth</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-compute</artifactId>
|
<artifactId>jclouds-compute</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-compute</artifactId>
|
<artifactId>jclouds-compute</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-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>org.apache.jclouds.driver</groupId>
|
<groupId>org.apache.jclouds.driver</groupId>
|
||||||
<artifactId>jclouds-sshj</artifactId>
|
<artifactId>jclouds-sshj</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>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.squareup.okhttp</groupId>
|
<groupId>com.squareup.okhttp</groupId>
|
||||||
<artifactId>mockwebserver</artifactId>
|
<artifactId>mockwebserver</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
<exclusions>
|
<exclusions>
|
||||||
<!-- Already provided by jclouds-sshj -->
|
<!-- Already provided by jclouds-sshj -->
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>org.bouncycastle</groupId>
|
<groupId>org.bouncycastle</groupId>
|
||||||
<artifactId>bcprov-jdk15on</artifactId>
|
<artifactId>bcprov-jdk15on</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.auto.value</groupId>
|
<groupId>com.google.auto.value</groupId>
|
||||||
<artifactId>auto-value</artifactId>
|
<artifactId>auto-value</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.auto.service</groupId>
|
<groupId>com.google.auto.service</groupId>
|
||||||
<artifactId>auto-service</artifactId>
|
<artifactId>auto-service</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>live</id>
|
<id>live</id>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>integration</id>
|
<id>integration</id>
|
||||||
<phase>integration-test</phase>
|
<phase>integration-test</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>test</goal>
|
<goal>test</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<systemPropertyVariables>
|
<systemPropertyVariables>
|
||||||
<test.digitalocean2.endpoint>${test.digitalocean2.endpoint}</test.digitalocean2.endpoint>
|
<test.digitalocean2.endpoint>${test.digitalocean2.endpoint}</test.digitalocean2.endpoint>
|
||||||
<test.digitalocean2.api-version>${test.digitalocean2.api-version}</test.digitalocean2.api-version>
|
<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.build-version>${test.digitalocean2.build-version}</test.digitalocean2.build-version>
|
||||||
<test.digitalocean2.identity>${test.digitalocean2.identity}</test.digitalocean2.identity>
|
<test.digitalocean2.identity>${test.digitalocean2.identity}</test.digitalocean2.identity>
|
||||||
<test.digitalocean2.credential>${test.digitalocean2.credential}</test.digitalocean2.credential>
|
<test.digitalocean2.credential>${test.digitalocean2.credential}</test.digitalocean2.credential>
|
||||||
<test.digitalocean2.template>${test.digitalocean2.template}</test.digitalocean2.template>
|
<test.digitalocean2.template>${test.digitalocean2.template}</test.digitalocean2.template>
|
||||||
</systemPropertyVariables>
|
</systemPropertyVariables>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</profile>
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,7 @@
|
||||||
<module>aws-ec2</module>
|
<module>aws-ec2</module>
|
||||||
<module>aws-sqs</module>
|
<module>aws-sqs</module>
|
||||||
<module>aws-cloudwatch</module>
|
<module>aws-cloudwatch</module>
|
||||||
|
<module>digitalocean2</module>
|
||||||
<module>elastichosts-lon-p</module>
|
<module>elastichosts-lon-p</module>
|
||||||
<module>elastichosts-sat-p</module>
|
<module>elastichosts-sat-p</module>
|
||||||
<module>elastichosts-lon-b</module>
|
<module>elastichosts-lon-b</module>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue