You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2015/07/24 00:35:08 UTC

accumulo git commit: ACCUMULO-3942 Fix failing PluginIT

Repository: accumulo
Updated Branches:
  refs/heads/master 7a9c20ab3 -> ea45dc518


ACCUMULO-3942 Fix failing PluginIT

* Keep debug output in build.log for PluginIT to help debug (make ignored by rat)
* Override excludedGroups property for maven-failsafe-plugin in PluginIT
* Remove unused/dead property from parent pom to avoid confusion over category configuration


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

Branch: refs/heads/master
Commit: ea45dc518421936c8e0677250e99fb4d508db3e2
Parents: 7a9c20a
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jul 23 18:31:22 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jul 23 18:31:22 2015 -0400

----------------------------------------------------------------------
 maven-plugin/pom.xml                    |  3 ++-
 maven-plugin/src/it/plugin-test/pom.xml | 20 ++++++++++++++++++++
 pom.xml                                 |  3 ---
 3 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ea45dc51/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 9d4d7d9..317f962 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -87,8 +87,9 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
         <configuration>
-          <noLog>true</noLog>
+          <cloneClean>true</cloneClean>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+          <debug>true</debug>
           <pomIncludes>
             <pomInclude>*/pom.xml</pomInclude>
           </pomIncludes>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/ea45dc51/maven-plugin/src/it/plugin-test/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin/src/it/plugin-test/pom.xml b/maven-plugin/src/it/plugin-test/pom.xml
index 7654c96..19f59b9 100644
--- a/maven-plugin/src/it/plugin-test/pom.xml
+++ b/maven-plugin/src/it/plugin-test/pom.xml
@@ -30,6 +30,10 @@
 
   <description>A simple IT verifying the basic use case.</description>
 
+  <properties>
+    <rat.skip>true</rat.skip>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>commons-cli</groupId>
@@ -113,6 +117,22 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>run-integration-tests</id>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+            <configuration>
+              <excludedGroups combine.self="override" />
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/ea45dc51/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 12f3ba8..fa28fcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,9 +115,6 @@
     </site>
   </distributionManagement>
   <properties>
-    <!-- No second group of tests run by default (performance tests).
-         Setting this to something that doesn't exist results in nothing being tested. -->
-    <accumulo.extraFailsafeGroups>no.such.tests</accumulo.extraFailsafeGroups>
     <!-- Interface used to separate tests with JUnit category -->
     <accumulo.performanceTests>org.apache.accumulo.test.PerformanceTest</accumulo.performanceTests>
     <!-- used for filtering the java source with the current version -->