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/02/19 23:25:48 UTC
[1/6] accumulo git commit: ACCUMULO-3605 Suppress xerces warnings
from rat plugin
Repository: accumulo
Updated Branches:
refs/heads/1.5 a1fe8177d -> c92c3c4f6
refs/heads/1.6 5a6e85896 -> 9a1c774e1
refs/heads/master 8f4afc5a3 -> 50d351201
ACCUMULO-3605 Suppress xerces warnings from rat plugin
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c92c3c4f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c92c3c4f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c92c3c4f
Branch: refs/heads/1.5
Commit: c92c3c4f68d412ce3c2854f0d9836ac4d7336d49
Parents: a1fe817
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Feb 19 17:12:57 2015 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Feb 19 17:13:33 2015 -0500
----------------------------------------------------------------------
pom.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c92c3c4f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 869fe8c..fc3be32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1062,6 +1062,20 @@
<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>
<goals>
[3/6] accumulo git commit: ACCUMULO-3605 Suppress xerces warnings
from rat plugin
Posted by ct...@apache.org.
ACCUMULO-3605 Suppress xerces warnings from rat plugin
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c92c3c4f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c92c3c4f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c92c3c4f
Branch: refs/heads/master
Commit: c92c3c4f68d412ce3c2854f0d9836ac4d7336d49
Parents: a1fe817
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Feb 19 17:12:57 2015 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Feb 19 17:13:33 2015 -0500
----------------------------------------------------------------------
pom.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c92c3c4f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 869fe8c..fc3be32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1062,6 +1062,20 @@
<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>
<goals>
[2/6] accumulo git commit: ACCUMULO-3605 Suppress xerces warnings
from rat plugin
Posted by ct...@apache.org.
ACCUMULO-3605 Suppress xerces warnings from rat plugin
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c92c3c4f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c92c3c4f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c92c3c4f
Branch: refs/heads/1.6
Commit: c92c3c4f68d412ce3c2854f0d9836ac4d7336d49
Parents: a1fe817
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Feb 19 17:12:57 2015 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Feb 19 17:13:33 2015 -0500
----------------------------------------------------------------------
pom.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c92c3c4f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 869fe8c..fc3be32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1062,6 +1062,20 @@
<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>
<goals>
[5/6] accumulo git commit: Merge branch '1.5' into 1.6
Posted by ct...@apache.org.
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 <ct...@apache.org>
Authored: Thu Feb 19 17:24:40 2015 -0500
Committer: Christopher Tubbs <ct...@apache.org>
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>
[6/6] accumulo git commit: Merge branch '1.6'
Posted by ct...@apache.org.
Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/50d35120
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/50d35120
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/50d35120
Branch: refs/heads/master
Commit: 50d351201d416b77a554b7a67c4803761cc82320
Parents: 8f4afc5 9a1c774
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Feb 19 17:24:51 2015 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Feb 19 17:24:51 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/6] accumulo git commit: Merge branch '1.5' into 1.6
Posted by ct...@apache.org.
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/master
Commit: 9a1c774e1a18adde1f072cbf64ca8d00061432c0
Parents: 5a6e858 c92c3c4
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Feb 19 17:24:40 2015 -0500
Committer: Christopher Tubbs <ct...@apache.org>
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>