mirror of https://github.com/apache/jclouds.git
Merge pull request #852 from abiquo/fix-version-1.5
Remove SNAPSHOT deps and pom cleanup
This commit is contained in:
Adrian Cole
commit
8891aa8b27
|
|
@ -1,29 +0,0 @@
|
||||||
====
|
|
||||||
Licensed to jclouds, Inc. (jclouds) under one or more
|
|
||||||
contributor license agreements. See the NOTICE file
|
|
||||||
distributed with this work for additional information
|
|
||||||
regarding copyright ownership. jclouds licenses this file
|
|
||||||
to you under the Apache License, Version 2.0 (the
|
|
||||||
"License"); you may not use this file except in compliance
|
|
||||||
with the License. You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing,
|
|
||||||
software distributed under the License is distributed on an
|
|
||||||
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
KIND, either express or implied. See the License for the
|
|
||||||
specific language governing permissions and limitations
|
|
||||||
under the License.
|
|
||||||
====
|
|
||||||
|
|
||||||
jclouds
|
|
||||||
Copyright 2009-2011 jclouds, Inc.
|
|
||||||
|
|
||||||
This product includes software developed at
|
|
||||||
Abiquo Holdings S.L. (http://www.abiquo.com/).
|
|
||||||
|
|
||||||
The following Abiquo dependencies are distributed under
|
|
||||||
the GNU Lesser General Public License version 3:
|
|
||||||
com.abiquo:api-model-transport
|
|
||||||
com.abiquo:am-model
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
<packaging>bundle</packaging>
|
<packaging>bundle</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<abiquo.version>2.1-SNAPSHOT</abiquo.version>
|
<abiquo.version>2.1.0</abiquo.version>
|
||||||
<test.abiquo.endpoint>http://localhost/api</test.abiquo.endpoint>
|
<test.abiquo.endpoint>http://localhost/api</test.abiquo.endpoint>
|
||||||
<test.abiquo.identity>FIXME</test.abiquo.identity>
|
<test.abiquo.identity>FIXME</test.abiquo.identity>
|
||||||
<test.abiquo.credential>FIXME</test.abiquo.credential>
|
<test.abiquo.credential>FIXME</test.abiquo.credential>
|
||||||
|
|
@ -229,84 +229,5 @@
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</profile>
|
</profile>
|
||||||
<profile>
|
|
||||||
<id>jenkins</id>
|
|
||||||
<build>
|
|
||||||
<filters>
|
|
||||||
<filter>src/test/resources/filters/filters_jenkins.properties</filter>
|
|
||||||
</filters>
|
|
||||||
<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>
|
|
||||||
<threadCount>1</threadCount>
|
|
||||||
<excludes>
|
|
||||||
<exclude>none</exclude>
|
|
||||||
</excludes>
|
|
||||||
<includes>
|
|
||||||
<include>**/*Live*.java</include>
|
|
||||||
</includes>
|
|
||||||
<systemPropertyVariables>
|
|
||||||
<test.abiquo.identity>${test.abiquo.idenfity}</test.abiquo.identity>
|
|
||||||
<test.abiquo.credential>${test.abiquo.credential}</test.abiquo.credential>
|
|
||||||
<test.abiquo.api-version>${test.abiquo.api-version}</test.abiquo.api-version>
|
|
||||||
<test.abiquo.build-version>${test.abiquo.build-version}</test.abiquo.build-version>
|
|
||||||
</systemPropertyVariables>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</profile>
|
|
||||||
<!--
|
|
||||||
<profile>
|
|
||||||
<id>ucs</id>
|
|
||||||
<build>
|
|
||||||
<filters>
|
|
||||||
<filter>src/test/resources/filters/filters.properties</filter>
|
|
||||||
</filters>
|
|
||||||
<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>
|
|
||||||
<threadCount>1</threadCount>
|
|
||||||
<excludes>
|
|
||||||
<exclude>none</exclude>
|
|
||||||
</excludes>
|
|
||||||
<includes>
|
|
||||||
<include>**/*LiveApiTest.java</include>
|
|
||||||
<include>**/*LiveUcsTest.java</include>
|
|
||||||
</includes>
|
|
||||||
<systemPropertyVariables>
|
|
||||||
<test.abiquo.identity>${test.abiquo.idenfity}</test.abiquo.identity>
|
|
||||||
<test.abiquo.credential>${test.abiquo.credential}</test.abiquo.credential>
|
|
||||||
<test.abiquo.api-version>${test.abiquo.api-version}</test.abiquo.api-version>
|
|
||||||
<test.abiquo.build-version>${test.abiquo.build-version}</test.abiquo.build-version>
|
|
||||||
</systemPropertyVariables>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</profile>
|
|
||||||
-->
|
|
||||||
</profiles>
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue