You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by as...@apache.org on 2011/11/09 16:18:42 UTC
svn commit: r1199791 - in /whirr/trunk: ./ build-tools/
core/src/test/java/org/apache/whirr/
core/src/test/java/org/apache/whirr/util/integration/
services/puppet/src/main/java/org/apache/whirr/service/puppet/functions/
Author: asavu
Date: Wed Nov 9 15:18:42 2011
New Revision: 1199791
URL: http://svn.apache.org/viewvc?rev=1199791&view=rev
Log:
WHIRR-352. mvn package assembly:assembly fails (David Alves via asavu)
Modified:
whirr/trunk/CHANGES.txt
whirr/trunk/build-tools/pom.xml
whirr/trunk/core/src/test/java/org/apache/whirr/ClusterControllerFactoryTest.java
whirr/trunk/core/src/test/java/org/apache/whirr/util/integration/DnsUtilTest.java
whirr/trunk/pom.xml
whirr/trunk/services/puppet/src/main/java/org/apache/whirr/service/puppet/functions/StatementToInstallModule.java
Modified: whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1199791&r1=1199790&r2=1199791&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Wed Nov 9 15:18:42 2011
@@ -86,6 +86,8 @@ Trunk (unreleased changes)
* we have discovered that we are flooding the remote machines with status
requests and a small instance like t1.micro is unable to cope with that
+ WHIRR-352. mvn package assembly:assembly fails (David Alves via asavu)
+
Release 0.6.0 - 2011-08-17
NEW FEATURES
Modified: whirr/trunk/build-tools/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/build-tools/pom.xml?rev=1199791&r1=1199790&r2=1199791&view=diff
==============================================================================
--- whirr/trunk/build-tools/pom.xml (original)
+++ whirr/trunk/build-tools/pom.xml Wed Nov 9 15:18:42 2011
@@ -17,12 +17,6 @@
<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.whirr</groupId>
- <artifactId>whirr</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
<groupId>org.apache.whirr</groupId>
<artifactId>whirr-build-tools</artifactId>
<packaging>jar</packaging>
Modified: whirr/trunk/core/src/test/java/org/apache/whirr/ClusterControllerFactoryTest.java
URL: http://svn.apache.org/viewvc/whirr/trunk/core/src/test/java/org/apache/whirr/ClusterControllerFactoryTest.java?rev=1199791&r1=1199790&r2=1199791&view=diff
==============================================================================
--- whirr/trunk/core/src/test/java/org/apache/whirr/ClusterControllerFactoryTest.java (original)
+++ whirr/trunk/core/src/test/java/org/apache/whirr/ClusterControllerFactoryTest.java Wed Nov 9 15:18:42 2011
@@ -18,7 +18,7 @@
package org.apache.whirr;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertThat;
import java.io.IOException;
Modified: whirr/trunk/core/src/test/java/org/apache/whirr/util/integration/DnsUtilTest.java
URL: http://svn.apache.org/viewvc/whirr/trunk/core/src/test/java/org/apache/whirr/util/integration/DnsUtilTest.java?rev=1199791&r1=1199790&r2=1199791&view=diff
==============================================================================
--- whirr/trunk/core/src/test/java/org/apache/whirr/util/integration/DnsUtilTest.java (original)
+++ whirr/trunk/core/src/test/java/org/apache/whirr/util/integration/DnsUtilTest.java Wed Nov 9 15:18:42 2011
@@ -18,8 +18,10 @@
package org.apache.whirr.util.integration;
-import static org.junit.Assert.*;
import static java.lang.System.out;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.net.Inet4Address;
Modified: whirr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/pom.xml?rev=1199791&r1=1199790&r2=1199791&view=diff
==============================================================================
--- whirr/trunk/pom.xml (original)
+++ whirr/trunk/pom.xml Wed Nov 9 15:18:42 2011
@@ -218,7 +218,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.6</version>
+ <version>2.8</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.whirr</groupId>
+ <artifactId>whirr-build-tools</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<phase>package</phase>
@@ -228,7 +235,7 @@
</execution>
</executions>
<configuration>
- <configLocation>./build-tools/src/main/resources/checkstyle.xml</configLocation>
+ <configLocation>checkstyle.xml</configLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<failsOnError>true</failsOnError>
<!-- HBaseServiceController fails checkstyle since Thrift TException cannot be found.
Modified: whirr/trunk/services/puppet/src/main/java/org/apache/whirr/service/puppet/functions/StatementToInstallModule.java
URL: http://svn.apache.org/viewvc/whirr/trunk/services/puppet/src/main/java/org/apache/whirr/service/puppet/functions/StatementToInstallModule.java?rev=1199791&r1=1199790&r2=1199791&view=diff
==============================================================================
--- whirr/trunk/services/puppet/src/main/java/org/apache/whirr/service/puppet/functions/StatementToInstallModule.java (original)
+++ whirr/trunk/services/puppet/src/main/java/org/apache/whirr/service/puppet/functions/StatementToInstallModule.java Wed Nov 9 15:18:42 2011
@@ -48,7 +48,7 @@ public class StatementToInstallModule im
private final PrepareRemoteFileUrl prepareRemoteFileUrl;
@VisibleForTesting
- public static interface PrepareRemoteFileUrl {
+ public interface PrepareRemoteFileUrl {
/**
* Prepare the file url for the remote machine.
*