[accumulo] 01/04: Merge commit 'fc20be34d6984114e7240c4eba276a3fe87a347b'

[ct...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 19dc538d54e4ac021de9531bf23f3c8a2f4ac24b
Merge: add1c4c fc20be3
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Fri Apr 6 00:59:56 2018 -0400

    Merge commit 'fc20be34d6984114e7240c4eba276a3fe87a347b'

 contrib/Eclipse-Accumulo-Codestyle.xml |  4 +--
 pom.xml                                | 50 ++++++++++++++--------------------
 2 files changed, 22 insertions(+), 32 deletions(-)

diff --cc pom.xml
index 08dc77e,f4b46bb..904e2b6
--- a/pom.xml
+++ b/pom.xml
@@@ -1017,10 -811,24 +1017,11 @@@
            <version>1.2.0</version>
          </plugin>
          <plugin>
 -          <groupId>org.apache.rat</groupId>
 -          <artifactId>apache-rat-plugin</artifactId>
 -          <configuration>
 -            <excludes combine.children="append">
 -              <exclude>src/main/resources/META-INF/services/*</exclude>
 -              <exclude>nbproject/**</exclude>
 -              <exclude>nb-configuration.xml</exclude>
 -              <exclude>nbactions.xml</exclude>
 -            </excludes>
 -          </configuration>
 -        </plugin>
 -        <plugin>
 -          <!-- this plugin requires java 1.8 and should only be used in a jdk8 profile -->
            <groupId>net.revelc.code.formatter</groupId>
            <artifactId>formatter-maven-plugin</artifactId>
-           <version>2.7.1</version>
+           <version>2.7.2</version>
            <configuration>
+             <configFile>${eclipseFormatterStyle}</configFile>
              <compilerCompliance>${maven.compiler.source}</compilerCompliance>
              <compilerSource>${maven.compiler.source}</compilerSource>
              <compilerTargetPlatform>${maven.compiler.target}</compilerTargetPlatform>
@@@ -1036,40 -844,9 +1037,25 @@@
              <skipJsonFormatting>true</skipJsonFormatting>
              <skipCssFormatting>true</skipCssFormatting>
            </configuration>
-           <dependencies>
-             <dependency>
-               <groupId>org.eclipse.tycho</groupId>
-               <artifactId>org.eclipse.jdt.core</artifactId>
-               <version>3.10.0.v20140604-1726</version>
-             </dependency>
-           </dependencies>
-           <executions>
-             <execution>
-               <id>format-java-source</id>
-               <goals>
-                 <goal>format</goal>
-               </goals>
-             </execution>
-           </executions>
          </plugin>
          <plugin>
 -          <!-- this plugin requires java 1.8 and should only be used in a jdk8 profile -->
 +          <groupId>org.apache.rat</groupId>
 +          <artifactId>apache-rat-plugin</artifactId>
 +          <configuration>
 +            <excludes combine.children="append">
 +              <exclude>src/main/resources/META-INF/services/*</exclude>
 +              <exclude>nbproject/**</exclude>
 +              <exclude>nb-configuration.xml</exclude>
 +              <exclude>nbactions.xml</exclude>
 +            </excludes>
 +          </configuration>
 +        </plugin>
 +        <plugin>
 +          <groupId>net.revelc.code</groupId>
 +          <artifactId>warbucks-maven-plugin</artifactId>
 +          <version>1.0.0</version>
 +        </plugin>
 +        <plugin>
            <groupId>net.revelc.code</groupId>
            <artifactId>impsort-maven-plugin</artifactId>
            <version>1.0.1</version>

-- 
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.