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

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


The following commit(s) were added to refs/heads/2.1 by this push:
     new 27b76c70b8 Revert "Apply automatic module names (#2498)"
27b76c70b8 is described below

commit 27b76c70b8290f0354c2a8719f0658aa89281a1d
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Thu Sep 28 16:26:30 2023 -0400

    Revert "Apply automatic module names (#2498)"
    
    This reverts commit f5bbd894bc2248f7d6eb2e99f94c154b8f9097eb.
    This reverts the commit from the 2.1 branch only. It will still be
    included in the 3.1.0 branch. That makes it less disruptive, in case
    users have tooling for 2.1 that doesn't work with the Java module
    system.
---
 pom.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index a5a81c37b4..68ed4d64ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,6 @@
     <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>
@@ -822,7 +821,8 @@
           <configuration>
             <archive>
               <manifestEntries>
-                
<Automatic-Module-Name>${accumulo.module.name}</Automatic-Module-Name>
+                <!-- Automatic modules do not work with the javadoc plugin - 
see MJAVADOC-707 -->
+                <!-- 
Automatic-Module-Name>${accumulo.module.name}</Automatic-Module-Name -->
                 
<Implementation-Build>${mvngit.commit.id}</Implementation-Build>
                 <Sealed>true</Sealed>
               </manifestEntries>
@@ -839,7 +839,6 @@
             <quiet>true</quiet>
             <additionalJOption>-J-Xmx512m</additionalJOption>
             <doclint>all,-missing</doclint>
-            <legacyMode>true</legacyMode>
           </configuration>
         </plugin>
         <plugin>

Reply via email to