[accumulo] branch main updated (ca4d43f6df -> 639e83549f)

[ct...@apache.org]

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

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


    from ca4d43f6df Merge branch '2.1'
     add 0f27c32ac9 Set root location property for paths to contrib files (#3266)
     new 639e83549f Merge branch '2.1'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

[accumulo] 01/01: Merge branch '2.1'

[ct...@apache.org]

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

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

commit 639e83549f8995c0a994e69155666daab6237c46
Merge: ca4d43f6df 0f27c32ac9
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Wed Mar 29 17:40:19 2023 -0400

    Merge branch '2.1'

 pom.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --cc pom.xml
index 2b16adf001,4de29a89fb..22c43c4ecd
--- a/pom.xml
+++ b/pom.xml
@@@ -910,9 -926,10 +908,9 @@@
            <artifactId>formatter-maven-plugin</artifactId>
            <version>2.21.0</version>
            <configuration>
-             <configFile>${eclipseFormatterStyle}</configFile>
+             <configFile>${rootlocation}/contrib/Eclipse-Accumulo-Codestyle.xml</configFile>
              <excludes>
                <exclude>**/thrift/*.java</exclude>
 -              <exclude>**/proto/*.java</exclude>
              </excludes>
              <lineEnding>LF</lineEnding>
              <skipCssFormatting>true</skipCssFormatting>