You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by to...@apache.org on 2010/09/02 00:45:20 UTC
svn commit: r991744 - in /incubator/whirr/trunk: BUILD.txt CHANGES.txt
pom.xml
Author: tomwhite
Date: Wed Sep 1 22:45:19 2010
New Revision: 991744
URL: http://svn.apache.org/viewvc?rev=991744&view=rev
Log:
WHIRR-82. Integration tests should not run on "mvn install".
Modified:
incubator/whirr/trunk/BUILD.txt
incubator/whirr/trunk/CHANGES.txt
incubator/whirr/trunk/pom.xml
Modified: incubator/whirr/trunk/BUILD.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/BUILD.txt?rev=991744&r1=991743&r2=991744&view=diff
==============================================================================
--- incubator/whirr/trunk/BUILD.txt (original)
+++ incubator/whirr/trunk/BUILD.txt Wed Sep 1 22:45:19 2010
@@ -10,8 +10,8 @@ BUILDING
To run unit tests and install artifacts locally:
-mvn clean install -DskipITs
+mvn clean install
To build a source package:
-mvn package
\ No newline at end of file
+mvn package -Ppackage
\ No newline at end of file
Modified: incubator/whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/CHANGES.txt?rev=991744&r1=991743&r2=991744&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Wed Sep 1 22:45:19 2010
@@ -72,3 +72,5 @@ Trunk (unreleased changes)
WHIRR-71. Only allow access to clusters from defined networks. (tomwhite)
WHIRR-79. Hadoop service is broken. (tomwhite)
+
+ WHIRR-82. Integration tests should not run on "mvn install". (tomwhite)
Modified: incubator/whirr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/pom.xml?rev=991744&r1=991743&r2=991744&view=diff
==============================================================================
--- incubator/whirr/trunk/pom.xml (original)
+++ incubator/whirr/trunk/pom.xml Wed Sep 1 22:45:19 2010
@@ -140,29 +140,6 @@
<!-- Plugins in alphabetical order: by group then artifact -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
- <configuration>
- <descriptors>
- <descriptor>build-tools/src/assemble.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>dist-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <tarLongFileFormat>gnu</tarLongFileFormat>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.5</version>
<dependencies>
@@ -196,25 +173,18 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.5</version>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
<configuration>
- <includes>
- <include>**/integration/*Test.java</include>
- </includes>
+ <excludePackageNames>org.jclouds.*</excludePackageNames>
</configuration>
<executions>
<execution>
- <id>integration-test</id>
+ <id>aggregate</id>
<goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
+ <goal>aggregate</goal>
</goals>
+ <phase>site</phase>
</execution>
</executions>
</plugin>
@@ -510,7 +480,7 @@
</properties>
</profile>
<profile>
- <!-- Only enable Javadoc when the javadoc profile is active, since it is slow. -->
+ <!-- Only bind Javadoc JARs when the javadoc profile is active, since it is slow. -->
<id>javadoc</id>
<build>
<plugins>
@@ -540,5 +510,69 @@
</plugins>
</build>
</profile>
+ <profile>
+ <!-- Run integration tests against real cloud providers. -->
+ <id>integration</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <includes>
+ <include>**/integration/*Test.java</include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <!-- Build the source distribution. This is written as a profile
+ since it doesn't work in child modules. -->
+ <id>package</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <configuration>
+ <descriptors>
+ <descriptor>build-tools/src/assemble.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>dist-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <tarLongFileFormat>gnu</tarLongFileFormat>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file