[accumulo] branch main updated (9aa08ef6fa -> 5488a7c74b)

[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 9aa08ef6fa Remove unused variable in FencedRFileTest
     add f5bbd894bc Apply automatic module names (#2498)
     new 27b76c70b8 Revert "Apply automatic module names (#2498)"
     new 5488a7c74b Merge branch '2.1'

The 2 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 | 5 +++--
 1 file changed, 3 insertions(+), 2 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 5488a7c74b8b1dc29df37be5dcaa7bace658ba10
Merge: 9aa08ef6fa 27b76c70b8
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Thu Sep 28 17:10:03 2023 -0400

    Merge branch '2.1'
    
    This merge retains the changes for automatic module names from commit
    f5bbd894bc2248f7d6eb2e99f94c154b8f9097eb for PR #2498 that were reverted
    by commit 27b76c70b8290f0354c2a8719f0658aa89281a1d in the 2.1 branch, as
    explained in that commit.

 pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --cc pom.xml
index 38a5a5f920,68ed4d64ad..a92287c8f9
--- a/pom.xml
+++ b/pom.xml
@@@ -151,6 -152,6 +151,7 @@@
      <version.curator>5.5.0</version.curator>
      <version.errorprone>2.20.0</version.errorprone>
      <version.hadoop>3.3.6</version.hadoop>
++    <version.maven-javadoc-plugin>3.6.0</version.maven-javadoc-plugin>
      <version.opentelemetry>1.27.0</version.opentelemetry>
      <version.powermock>2.0.9</version.powermock>
      <version.slf4j>2.0.7</version.slf4j>
@@@ -803,8 -821,8 +804,7 @@@
            <configuration>
              <archive>
                <manifestEntries>
--                <!-- Automatic modules do not work with the javadoc plugin - see MJAVADOC-707 -->
--                <!-- Automatic-Module-Name>${accumulo.module.name}</Automatic-Module-Name -->
++                <Automatic-Module-Name>${accumulo.module.name}</Automatic-Module-Name>
                  <Implementation-Build>${mvngit.commit.id}</Implementation-Build>
                  <Sealed>true</Sealed>
                </manifestEntries>
@@@ -821,6 -839,6 +821,7 @@@
              <quiet>true</quiet>
              <additionalJOption>-J-Xmx512m</additionalJOption>
              <doclint>all,-missing</doclint>
++            <legacyMode>true</legacyMode>
            </configuration>
          </plugin>
          <plugin>