Fixes issue piranhacloud#3253 - Fix generating aggregate JavaDoc JAR

mnriem · Feb 28, 2023 · 4baf336 · 4baf336
1 parent 921b160
commit 4baf336
Show file tree

Hide file tree

Showing 8 changed files with 116 additions and 46 deletions.
diff --git a/arquillian/server/.gitignore b/arquillian/server/.gitignore
diff --git a/dist/coreprofile/Dockerfile.arm32v7 b/dist/coreprofile/Dockerfile.arm32v7
@@ -0,0 +1,7 @@
+FROM eclipse-temurin:17
+RUN useradd -m piranha
+ADD target/piranha-dist-coreprofile.jar /home/piranha
+WORKDIR /home/piranha
+RUN chown piranha:piranha piranha-dist-coreprofile.jar
+USER piranha
+CMD ["java", "-jar", "piranha-dist-coreprofile.jar"]
diff --git a/dist/coreprofile/pom.xml b/dist/coreprofile/pom.xml
@@ -45,6 +45,17 @@
     <build>
         <finalName>piranha-dist-coreprofile</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>cloud.piranha.dist.coreprofile</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

diff --git a/dist/micro/pom.xml b/dist/micro/pom.xml
@@ -119,6 +119,17 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>cloud.piranha.dist.micro</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>

diff --git a/dist/microprofile/pom.xml b/dist/microprofile/pom.xml
@@ -63,17 +63,13 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <!-- 
-                
-                        set to false because of 'Modules
-                        org.eclipse.persistence.core and eclipselink export package 
-                        org.eclipse.persistence.internal.descriptors.changetracking
-                        to module grizzly.http
-                        
-                        -->
-                    <useModulePath>false</useModulePath>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>cloud.piranha.dist.microprofile</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
                 </configuration>
             </plugin>
             <plugin>
@@ -99,6 +95,22 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- 
+                
+                        set to false because of 'Modules
+                        org.eclipse.persistence.core and eclipselink export package 
+                        org.eclipse.persistence.internal.descriptors.changetracking
+                        to module grizzly.http
+                        
+                        -->
+                    <useModulePath>false</useModulePath>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/dist/servlet/pom.xml b/dist/servlet/pom.xml
@@ -52,6 +52,17 @@
     <build>
         <finalName>piranha-dist-servlet</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>cloud.piranha.dist.servlet</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

diff --git a/dist/webprofile/pom.xml b/dist/webprofile/pom.xml
@@ -63,17 +63,13 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <!-- 
-                
-                        set to false because of 'Modules
-                        org.eclipse.persistence.core and eclipselink export package 
-                        org.eclipse.persistence.internal.descriptors.changetracking
-                        to module grizzly.http
-                        
-                        -->
-                    <useModulePath>false</useModulePath>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>cloud.piranha.dist.webprofile</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
                 </configuration>
             </plugin>
             <plugin>
@@ -99,6 +95,21 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- 
+                
+                        set to false because of 'Modules
+                        org.eclipse.persistence.core and eclipselink export package 
+                        org.eclipse.persistence.internal.descriptors.changetracking
+                        to module grizzly.http
+                        
+                        -->
+                    <useModulePath>false</useModulePath>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -144,7 +144,7 @@
         <maven-install-plugin.version>3.1.0</maven-install-plugin.version>
         <maven-invoker-plugin.version>3.3.0</maven-invoker-plugin.version>
         <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
-        <maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
         <maven-plugin-plugin.version>3.7.0</maven-plugin-plugin.version>
         <maven-replacer-plugin.version>1.5.3</maven-replacer-plugin.version>
         <maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>
@@ -936,31 +936,39 @@
                         </configuration>
                     </execution>
                     <!--
-            <execution>
-                <id>attach-aggregate-javadocs</id>
-                <goals>
-                    <goal>aggregate-jar</goal>
-                </goals>
-                <configuration>
-                    <docfilessubdirs>true</docfilessubdirs>
-                    <!- - 
-                     
-                      Once a Jakarta namespaced Apache Commons 
-                      FileUpload can be used this should be removed.
-                     
-                    - ->
-                    <excludePackageNames>org.apache.*</excludePackageNames>
-                    <tags>
-                        <tag>
-                            <name>assertion</name>
-                            <placement>a</placement>
-                            <head>Assertion: </head>
-                        </tag>
-                    </tags>
-                </configuration>
-                <inherited>false</inherited>
-            </execution>
+          
+                      Maven 3.9.0 is unable to have this run using 
+                      <goal>aggregate-jar</goal> as part of a regular
+                      clean install cycle so the <goal> section is removed
+                      and invocation now is at end using 
+                      javadoc:aggregate-jar@attach-aggregate-javadocs
+      
                     -->
+                    <execution>
+                        <id>attach-aggregate-javadocs</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>aggregate-jar</goal>
+                        </goals>
+                        <configuration>
+                            <docfilessubdirs>true</docfilessubdirs>
+                            <!-- 
+                           
+                            Once a Jakarta namespaced Apache Commons 
+                            FileUpload can be used this should be removed.
+                           
+                            -->
+                            <excludePackageNames>org.apache.*</excludePackageNames>
+                            <tags>
+                                <tag>
+                                    <name>assertion</name>
+                                    <placement>a</placement>
+                                    <head>Assertion: </head>
+                                </tag>
+                            </tags>
+                        </configuration>
+                        <inherited>false</inherited>
+                    </execution>
                 </executions>
                 <configuration>
                     <additionalOptions>-html5</additionalOptions>