accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [6/6] accumulo git commit: Merge branch '1.7'
Date Thu, 03 Mar 2016 23:26:07 GMT
Merge branch '1.7'

Conflicts:
	pom.xml


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

Branch: refs/heads/master
Commit: db21315983114f13b33c15f284c1fdfbc0799928
Parents: 0e652f1 e52d547
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Mar 3 18:25:10 2016 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Mar 3 18:25:10 2016 -0500

----------------------------------------------------------------------
 pom.xml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/db213159/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index f525287,90f6311..e4c3ea6
--- a/pom.xml
+++ b/pom.xml
@@@ -1484,31 -1490,30 +1484,57 @@@
        </build>
      </profile>
      <profile>
 +      <id>performanceTests</id>
 +      <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>
 +                    <groups>${accumulo.performanceTests}</groups>
 +                  </configuration>
 +                </execution>
 +              </executions>
 +            </plugin>
 +          </plugins>
 +        </pluginManagement>
 +      </build>
 +    </profile>
++    <profile>
+       <id>aggregate-javadocs</id>
+       <build>
+         <pluginManagement>
+           <plugins>
+             <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-javadoc-plugin</artifactId>
+               <configuration>
+                 <sourceFileIncludes>
+                   <sourceFileInclude>**/org/apache/accumulo/core/client/**/*.java</sourceFileInclude>
+                   <sourceFileInclude>**/org/apache/accumulo/core/data/**/*.java</sourceFileInclude>
+                   <sourceFileInclude>**/org/apache/accumulo/core/security/**/*.java</sourceFileInclude>
+                   <sourceFileInclude>**/org/apache/accumulo/minicluster/**/*.java</sourceFileInclude>
+                 </sourceFileIncludes>
+                 <sourceFileExcludes>
+                   <sourceFileExclude>**/crypto/**/*.java</sourceFileExclude>
+                   <sourceFileExclude>**/impl/**/*.java</sourceFileExclude>
+                   <sourceFileExclude>**/thrift/**/*.java</sourceFileExclude>
+                 </sourceFileExcludes>
+               </configuration>
+             </plugin>
+           </plugins>
+         </pluginManagement>
+       </build>
+     </profile>
    </profiles>
  </project>


Mime
View raw message