Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

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>

pom.xml

@@ -1349,12 +1349,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>