[accumulo] branch main updated: Prepare for automatic module names

[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


The following commit(s) were added to refs/heads/main by this push:
     new ad6a7958c3 Prepare for automatic module names
ad6a7958c3 is described below

commit ad6a7958c3399aaa208831edb430d8e735071906
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Mon Apr 11 20:24:02 2022 -0400

    Prepare for automatic module names
    
    * Prepare the pom.xml to populate the jar manifest with automatic module
      names, but don't actually activate it, due to the bug reported in the
      maven-javadoc-plugin: https://issues.apache.org/jira/browse/MJAVADOC-707
    * This relates to #2498 (helps make that PR more minimal)
---
 pom.xml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1128299023..a12db46738 100644
--- a/pom.xml
+++ b/pom.xml
@@ -821,8 +821,10 @@
           <configuration>
             <archive>
               <manifestEntries>
-                <Sealed>true</Sealed>
+                <!-- 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>
             </archive>
             <excludes>
@@ -833,6 +835,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
+          <version>3.3.2</version>
           <configuration>
             <quiet>true</quiet>
             <additionalJOption>-J-Xmx512m</additionalJOption>
@@ -1023,10 +1026,16 @@
         <artifactId>build-helper-maven-plugin</artifactId>
         <executions>
           <execution>
-            <id>parse-project-version</id>
+            <id>create-automatic-module-name</id>
             <goals>
-              <goal>parse-version</goal>
+              <goal>regex-property</goal>
             </goals>
+            <configuration>
+              <name>accumulo.module.name</name>
+              <regex>-</regex>
+              <replacement>.</replacement>
+              <value>org-apache-${project.artifactId}</value>
+            </configuration>
           </execution>
         </executions>
       </plugin>