accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [11/14] accumulo git commit: Merge branch '1.7' into 1.8
Date Fri, 22 Jul 2016 00:07:55 GMT
Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: 227bfe886988121453e37acf60ec752757d92867
Parents: 394ad08 7109640
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Jul 21 20:00:07 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Jul 21 20:00:07 2016 -0400

----------------------------------------------------------------------
 pom.xml | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/227bfe88/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index c797bcc,5f7caae..63ee7a8
--- a/pom.xml
+++ b/pom.xml
@@@ -773,8 -739,27 +773,15 @@@
                <requireMavenVersion>
                  <version>[${maven.min-version},)</version>
                </requireMavenVersion>
 -              <requireProperty>
 -                <property>hadoop.profile</property>
 -                <regex>(2)</regex>
 -                <regexMessage>You should specify the Hadoop profile by major Hadoop
generation, i.e. 1 or 2, not by a version number.
 -  Use hadoop.version to use a particular Hadoop version within that generation. See README
for more details.</regexMessage>
 -              </requireProperty>
 -              <requireProperty>
 -                <property>thrift.version</property>
 -                <regex>0[.]9[.]1</regex>
 -                <regexMessage>Thrift version must be 0.9.1; Any alteration requires
a review of ACCUMULO-1691
 -                  (See server/base/src/main/java/org/apache/accumulo/server/util/CustomNonBlockingServer.java)</regexMessage>
 -              </requireProperty>
              </rules>
            </configuration>
+           <dependencies>
+             <dependency>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>animal-sniffer-enforcer-rule</artifactId>
+               <version>1.15</version>
+             </dependency>
+           </dependencies>
          </plugin>
          <plugin>
            <!-- Allows us to get the apache-ds bundle artifacts -->


Mime
View raw message