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

This commit is contained in:
Joakim Erdfelt 2020-10-02 15:49:44 -05:00
commit da39314499
2 changed files with 14 additions and 1 deletions

View File

@ -16,6 +16,19 @@
<sonar.skip>true</sonar.skip> <sonar.skip>true</sonar.skip>
</properties> </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> <modules>
<module>demo-async-rest</module> <module>demo-async-rest</module>
<module>demo-jaas-webapp</module> <module>demo-jaas-webapp</module>

View File

@ -1349,12 +1349,12 @@
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>attach-javadoc-jar</id> <id>attach-javadoc-jar</id>
<phase>package</phase>
<goals> <goals>
<goal>jar</goal> <goal>jar</goal>
</goals> </goals>