From 1235539637bb3675a3f3029c0405e2cc9bae8ded Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Fri, 2 Oct 2020 15:42:02 -0500
Subject: [PATCH] Addressing a fault in demo-*-javadoc.jar generated files
 during deploy

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 demos/pom.xml | 13 +++++++++++++
 pom.xml       |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/demos/pom.xml b/demos/pom.xml
index c947037e5d3..14fbdb3f5b1 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -16,6 +16,19 @@
     <sonar.skip>true</sonar.skip>
   </properties>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <!-- otherwise javadoc jars for these demos will not be created due to top level pom exclusions on "com.acme" -->
+          <excludePackageNames>bogus.*</excludePackageNames>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <modules>
     <module>demo-async-rest</module>
     <module>demo-jaas-webapp</module>
diff --git a/pom.xml b/pom.xml
index 0ced6361477..398e719492e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1308,12 +1308,12 @@
             </executions>
           </plugin>
           <plugin>
+            <inherited>true</inherited>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <executions>
               <execution>
                 <id>attach-javadoc-jar</id>
-                <phase>package</phase>
                 <goals>
                   <goal>jar</goal>
                 </goals>