Merge branch '1.5' into 1.6
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/9a1c774e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9a1c774e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9a1c774e
Branch: refs/heads/1.6
Commit: 9a1c774e1a18adde1f072cbf64ca8d00061432c0
Parents: 5a6e858 c92c3c4
Author: Christopher Tubbs <[email protected]>
Authored: Thu Feb 19 17:24:40 2015 -0500
Committer: Christopher Tubbs <[email protected]>
Committed: Thu Feb 19 17:24:40 2015 -0500
----------------------------------------------------------------------
pom.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9a1c774e/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 57591a0,fc3be32..b7408cb
--- a/pom.xml
+++ b/pom.xml
@@@ -1039,18 -877,6 +1039,32 @@@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
++ <dependencies>
++ <!-- workaround for RAT-158 -->
++ <dependency>
++ <groupId>org.apache.maven.doxia</groupId>
++ <artifactId>doxia-core</artifactId>
++ <version>1.6</version>
++ <exclusions>
++ <exclusion>
++ <groupId>xerces</groupId>
++ <artifactId>xercesImpl</artifactId>
++ </exclusion>
++ </exclusions>
++ </dependency>
++ </dependencies>
+ <executions>
+ <execution>
+ <id>check-licenses</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<extensions>
<extension>
