accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [1/2] git commit: ACCUMULO-2171 Create sunny profile for bare-minimum tests
Date Wed, 16 Apr 2014 00:34:03 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT d77cd3fa1 -> 73fae6368


ACCUMULO-2171 Create sunny profile for bare-minimum tests

  Also sort poms, and remove unneeded dependency from tests
  Be more tolerant of test timing


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/93aee766
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/93aee766
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/93aee766

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 93aee7662b7fce724e3ad65184c65882b3fda837
Parents: d77cd3f
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Tue Apr 15 13:58:26 2014 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Tue Apr 15 17:11:36 2014 -0400

----------------------------------------------------------------------
 pom.xml       | 10 +++++++++-
 start/pom.xml |  2 ++
 test/pom.xml  | 23 +++++++++--------------
 3 files changed, 20 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/93aee766/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f769a71..10dfcc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -549,7 +549,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
           <configuration>
-            <arguments>-P apache-release,thrift,assemble,docs -Dit.test=ReadWriteIT,SimpleProxyIT,ExamplesIT
-DfailIfNoTests=false</arguments>
+            <arguments>-P apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2</arguments>
             <autoVersionSubmodules>true</autoVersionSubmodules>
             <goals>clean deploy</goals>
             <preparationGoals>clean verify</preparationGoals>
@@ -1031,6 +1031,14 @@
       </properties>
     </profile>
     <profile>
+      <!-- Minimal testing profile. (a.k.a. SunnyDay) -->
+      <id>sunny</id>
+      <properties>
+        <failIfNoTests>false</failIfNoTests>
+        <it.test>ReadWriteIT,SimpleProxyIT,ExamplesIT</it.test>
+      </properties>
+    </profile>
+    <profile>
       <!-- Generate cobertura reports with site.
            Activate with -P cobertura -->
       <id>cobertura</id>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/93aee766/start/pom.xml
----------------------------------------------------------------------
diff --git a/start/pom.xml b/start/pom.xml
index 8747930..fb0a5ed 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -50,7 +50,9 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
+      <?SORTPOM IGNORE?>
       <version>14.0.1</version><!--$NO-MVN-MAN-VER$-->
+      <?SORTPOM RESUME?>
       <scope>test</scope>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/93aee766/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 6ebce1a..ed46117 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -147,11 +147,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-maven-plugin</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-minicluster</artifactId>
       <scope>test</scope>
@@ -190,15 +185,15 @@
             </excludes>
           </configuration>
         </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <timeout.factor>${timeout.factor}</timeout.factor>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <configuration>
+            <systemPropertyVariables>
+              <timeout.factor>${timeout.factor}</timeout.factor>
+            </systemPropertyVariables>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>


Mime
View raw message