accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [3/3] accumulo git commit: Merge branch '1.8'
Date Thu, 01 Sep 2016 22:39:57 GMT
Merge branch '1.8'


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

Branch: refs/heads/master
Commit: f644fb630673dd12b9a80eb76e5535fa2e8d2fc1
Parents: 762c148 be5c433
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Sep 1 18:39:34 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Sep 1 18:39:34 2016 -0400

----------------------------------------------------------------------
 TESTING.md                                      | 22 +++++---------
 pom.xml                                         | 32 +-------------------
 .../accumulo/test/AssignmentThreadsIT.java      |  7 +++--
 .../apache/accumulo/test/BalanceFasterIT.java   |  7 +++--
 .../org/apache/accumulo/test/ManySplitIT.java   |  5 +--
 .../apache/accumulo/test/PerformanceTest.java   | 27 -----------------
 .../test/categories/PerformanceTests.java       | 25 +++++++++++++++
 .../functional/DeleteTableDuringSplitIT.java    |  5 +--
 .../accumulo/test/functional/DurabilityIT.java  |  5 +--
 .../test/performance/RollWALPerformanceIT.java  |  5 +--
 10 files changed, 54 insertions(+), 86 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f644fb63/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 4492e92,ca1c560..54e4a72
--- a/pom.xml
+++ b/pom.xml
@@@ -128,8 -127,9 +126,8 @@@
      <eclipseFormatterStyle>${project.parent.basedir}/contrib/Eclipse-Accumulo-Codestyle.xml</eclipseFormatterStyle>
      <!-- extra release args for testing -->
      <extraReleaseArgs />
-     <failsafe.excludedGroups>${accumulo.performanceTests}</failsafe.excludedGroups>
+     <failsafe.excludedGroups />
      <failsafe.groups />
 -    <!-- findbugs-maven-plugin won't work on jdk8 or later; set to 3.0.0 or newer -->
      <findbugs.version>3.0.3</findbugs.version>
      <!-- surefire/failsafe plugin option -->
      <forkCount>1</forkCount>
@@@ -1343,34 -1347,28 +1341,6 @@@
        </properties>
      </profile>
      <profile>
-       <id>performanceTests</id>
 -      <id>jdk8</id>
 -      <activation>
 -        <jdk>[1.8,1.9)</jdk>
 -      </activation>
--      <build>
--        <pluginManagement>
--          <plugins>
-             <!-- Add an additional execution for performance tests -->
--            <plugin>
--              <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-failsafe-plugin</artifactId>
-               <executions>
-                 <execution>
-                   <!-- Run only the performance tests -->
-                   <id>run-performance-tests</id>
-                   <goals>
-                     <goal>integration-test</goal>
-                     <goal>verify</goal>
-                   </goals>
-                   <configuration>
-                     <excludedGroups />
-                     <groups>${accumulo.performanceTests}</groups>
-                   </configuration>
-                 </execution>
-               </executions>
 -              <artifactId>maven-javadoc-plugin</artifactId>
 -              <configuration>
 -                <quiet>true</quiet>
 -                <javadocVersion>1.8</javadocVersion>
 -                <additionalJOption>-J-Xmx512m</additionalJOption>
 -                <additionalparam>-Xdoclint:all,-Xdoclint:-missing</additionalparam>
 -              </configuration>
--            </plugin>
--          </plugins>
--        </pluginManagement>
--      </build>
--    </profile>
--    <profile>
        <id>aggregate-javadocs</id>
        <build>
          <pluginManagement>


Mime
View raw message