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/04/28 17:38:28 UTC
[1/3] accumulo git commit: ACCUMULO-2712 Update to apache-17 parent
POM
Repository: accumulo
Updated Branches:
refs/heads/1.7 481b11922 -> 7891404e1
refs/heads/master e9ad5345f -> 5bf2dab25
ACCUMULO-2712 Update to apache-17 parent POM
* eliminates need to suppress xerces warnings from rat plugin ourselves
* verify with `mvn clean verify -DskipITs -Psortpom`
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7891404e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7891404e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7891404e
Branch: refs/heads/1.7
Commit: 7891404e16e710d4a39424dfdeb72cb265157311
Parents: 481b119
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Apr 28 11:36:15 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Apr 28 11:36:15 2015 -0400
----------------------------------------------------------------------
core/pom.xml | 8 ++++----
pom.xml | 16 +---------------
2 files changed, 5 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7891404e/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 15a52fd..12e3c1d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -179,7 +179,7 @@
<include>org[.]apache[.]accumulo[.]core[.]client[.].*</include>
<include>org[.]apache[.]accumulo[.]core[.]data[.].*</include>
<include>org[.]apache[.]accumulo[.]core[.]security[.].*</include>
- <!-- The following types are not advertised as in API, but are
+ <!-- The following types are not advertised as in API, but are
used in a such a way by API classes that we want to
ensure they do not reference non public API types.
Ideally no new uses of these classes would occur in the
@@ -196,17 +196,17 @@
<exclude>org[.]apache[.]accumulo[.]core[.]client[.]mock[.].*</exclude>
</excludes>
<allows>
- <!--Allow API data types to reference thrift types, but do not
+ <!--Allow API data types to reference thrift types, but do not
analyze thrift types -->
<allow>org[.]apache[.]accumulo[.].*[.]thrift[.].*</allow>
- <!--ClientConfiguration indirectly extends
+ <!--ClientConfiguration indirectly extends
AbstractConfiguration and EventSource. These two types
bring in many types from apache commons. Added these two
types instead of all of the types they reference.-->
<allow>org[.]apache[.]commons[.]configuration[.]Configuration</allow>
<allow>org[.]apache[.]commons[.]configuration[.]AbstractConfiguration</allow>
<allow>org[.]apache[.]commons[.]configuration[.]event[.]EventSource</allow>
- <!--Type from hadoop used in API. If adding a new type from
+ <!--Type from hadoop used in API. If adding a new type from
Hadoop to the Accumulo API ensure its annotated as
stable.-->
<allow>org[.]apache[.]hadoop[.]conf[.]Configuration</allow>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7891404e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fff66aa..0bcc689 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>16</version>
+ <version>17</version>
</parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
@@ -1093,20 +1093,6 @@
<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>
[3/3] accumulo git commit: Merge branch '1.7'
Posted by ct...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5bf2dab2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5bf2dab2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5bf2dab2
Branch: refs/heads/master
Commit: 5bf2dab257bfb27c3b8b5a52f85c1c19d8ba5c8b
Parents: e9ad534 7891404
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Apr 28 11:38:05 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Apr 28 11:38:05 2015 -0400
----------------------------------------------------------------------
core/pom.xml | 8 ++++----
pom.xml | 16 +---------------
2 files changed, 5 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5bf2dab2/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5bf2dab2/pom.xml
----------------------------------------------------------------------
[2/3] accumulo git commit: ACCUMULO-2712 Update to apache-17 parent
POM
Posted by ct...@apache.org.
ACCUMULO-2712 Update to apache-17 parent POM
* eliminates need to suppress xerces warnings from rat plugin ourselves
* verify with `mvn clean verify -DskipITs -Psortpom`
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7891404e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7891404e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7891404e
Branch: refs/heads/master
Commit: 7891404e16e710d4a39424dfdeb72cb265157311
Parents: 481b119
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Apr 28 11:36:15 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Apr 28 11:36:15 2015 -0400
----------------------------------------------------------------------
core/pom.xml | 8 ++++----
pom.xml | 16 +---------------
2 files changed, 5 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7891404e/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 15a52fd..12e3c1d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -179,7 +179,7 @@
<include>org[.]apache[.]accumulo[.]core[.]client[.].*</include>
<include>org[.]apache[.]accumulo[.]core[.]data[.].*</include>
<include>org[.]apache[.]accumulo[.]core[.]security[.].*</include>
- <!-- The following types are not advertised as in API, but are
+ <!-- The following types are not advertised as in API, but are
used in a such a way by API classes that we want to
ensure they do not reference non public API types.
Ideally no new uses of these classes would occur in the
@@ -196,17 +196,17 @@
<exclude>org[.]apache[.]accumulo[.]core[.]client[.]mock[.].*</exclude>
</excludes>
<allows>
- <!--Allow API data types to reference thrift types, but do not
+ <!--Allow API data types to reference thrift types, but do not
analyze thrift types -->
<allow>org[.]apache[.]accumulo[.].*[.]thrift[.].*</allow>
- <!--ClientConfiguration indirectly extends
+ <!--ClientConfiguration indirectly extends
AbstractConfiguration and EventSource. These two types
bring in many types from apache commons. Added these two
types instead of all of the types they reference.-->
<allow>org[.]apache[.]commons[.]configuration[.]Configuration</allow>
<allow>org[.]apache[.]commons[.]configuration[.]AbstractConfiguration</allow>
<allow>org[.]apache[.]commons[.]configuration[.]event[.]EventSource</allow>
- <!--Type from hadoop used in API. If adding a new type from
+ <!--Type from hadoop used in API. If adding a new type from
Hadoop to the Accumulo API ensure its annotated as
stable.-->
<allow>org[.]apache[.]hadoop[.]conf[.]Configuration</allow>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7891404e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fff66aa..0bcc689 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>16</version>
+ <version>17</version>
</parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
@@ -1093,20 +1093,6 @@
<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>