Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #5264 - Addressing (some) aggregate-javadoc issues 

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2020-09-23 20:20:27 -05:00
parent 3dbedd8347
commit 35bca82e35
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
6 changed files with 75 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -59,7 +59,7 @@ pipeline {
container( 'jetty-build' ) {
timeout( time: 30, unit: 'MINUTES' ) {
mavenBuild( "jdk11",
"package source:jar javadoc:jar javadoc:aggregate-jar -Peclipse-release -DskipTests -Dpmd.skip=true -Dcheckstyle.skip=true",
"package source:jar javadoc:jar -Peclipse-release -DskipTests -Dpmd.skip=true -Dcheckstyle.skip=true",
"maven3", true )
warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'JavaDoc'], [parserName: 'Java']]
}

4
demos/demo-async-rest/demo-async-rest-webapp/pom.xml
View File

@ -10,10 +10,6 @@
<packaging>war</packaging>
<name>Demo Async Rest :: Webapp</name>
<build>
<finalName>async-rest</finalName>
</build>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>

20
demos/pom.xml
View File

@ -16,6 +16,26 @@
<sonar.skip>true</sonar.skip>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>default-cli</id>
<goals>
<goal>aggregate-jar</goal>
</goals>
<configuration>
<skip>true</skip>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<modules>
<module>demo-async-rest</module>
<module>demo-jaas-webapp</module>

18
jetty-ant/pom.xml
View File

@ -19,13 +19,13 @@
<executions>
<execution>
<id>copy-lib-deps</id>
<phase>generate-resources</phase>
<phase>process-test-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty</includeGroupIds>
<excludeGroupIds>org.eclipse.jetty.orbit,org.eclipse.jetty.websocket,org.eclipse.jetty.drafts</excludeGroupIds>
<excludeGroupIds>org.eclipse.jetty.orbit,org.eclipse.jetty.websocket</excludeGroupIds>
<excludeArtifactIds>jetty-start</excludeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${project.build.directory}/test-lib</outputDirectory>
@ -40,6 +40,20 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>aggregate-jar</goal>
</goals>
<configuration>
<skip>true</skip>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>

58
jetty-home/pom.xml
View File

@ -24,7 +24,7 @@
<executions>
<execution>
<id>copy-base-assembly-tree</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
@ -46,7 +46,7 @@
<executions>
<execution>
<id>copy</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy</goal>
</goals>
@ -78,7 +78,7 @@
</execution>
<execution>
<id>copy-setuid-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy</goal>
</goals>
@ -116,7 +116,7 @@
<execution>
<id>copy-lib-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -134,7 +134,7 @@
</execution>
<execution>
<id>copy-lib-src-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -153,7 +153,7 @@
</execution>
<execution>
<id>copy-lib-logging-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -166,7 +166,7 @@
</execution>
<execution>
<id>copy-lib-logging-src-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -180,7 +180,7 @@
</execution>
<execution>
<id>copy-lib-websocket-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -192,7 +192,7 @@
</execution>
<execution>
<id>copy-lib-websocket-src-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -205,7 +205,7 @@
</execution>
<execution>
<id>copy-lib-javax-websocket-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -218,7 +218,7 @@
</execution>
<execution>
<id>copy-lib-javax-websocket-src-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -232,7 +232,7 @@
</execution>
<execution>
<id>copy-lib-http2-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -245,7 +245,7 @@
</execution>
<execution>
<id>copy-lib-http2-src-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -259,7 +259,7 @@
</execution>
<execution>
<id>copy-lib-fcgi-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -271,7 +271,7 @@
</execution>
<execution>
<id>copy-lib-fcgi-src-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -284,7 +284,7 @@
</execution>
<execution>
<id>copy-lib-spring-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -297,7 +297,7 @@
</execution>
<execution>
<id>copy-lib-spring-src-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -311,7 +311,7 @@
</execution>
<execution>
<id>copy-servlet-api-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy</goal>
</goals>
@ -330,7 +330,7 @@
</execution>
<execution>
<id>copy-servlet-src-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -343,7 +343,7 @@
</execution>
<execution>
<id>copy-annotations-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -356,7 +356,7 @@
</execution>
<execution>
<id>copy-annotations-src-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -370,7 +370,7 @@
</execution>
<execution>
<id>copy-apache-jsp-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -386,7 +386,7 @@
</execution>
<execution>
<id>copy-apache-jsp-src-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -403,7 +403,7 @@
</execution>
<execution>
<id>copy-apache-jstl-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -417,7 +417,7 @@
</execution>
<execution>
<id>copy-apache-jstl-src-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -432,7 +432,7 @@
</execution>
<execution>
<id>copy-jaspi-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -445,7 +445,7 @@
</execution>
<execution>
<id>copy-jaspi-src-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -459,7 +459,7 @@
</execution>
<execution>
<id>unpack-config-deps</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
@ -476,7 +476,7 @@
</execution>
<execution>
<id>unpack-infinispan-config</id>
<phase>generate-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>unpack</goal>
</goals>

30
pom.xml
View File

@ -577,27 +577,6 @@
<attach>true</attach>
<isOffline>true</isOffline>
<excludePackageNames>com.*:org.slf4j*:org.mortbay*:*.jmh*:org.eclipse.jetty.embedded*:org.eclipse.jetty.example.asyncrest*:org.eclipse.jetty.test*</excludePackageNames>
<skippedModules>
apache-jstl,
jetty-osgi-alpn,
infinispan-common,
infinispan-embedded,
infinispan-embedded-query,
infinispan-remote,
infinispan-remote-query,
jetty-plus,
jetty-jndi,
jetty-documentation,
jetty-home,
jetty-bom,
jetty-runner,
demo-async-rest-webapp,
demo-jaas-webapp,
demo-jetty-webapp,
demo-jndi-webapp,
demo-proxy-webapp,
demo-spec-webapp
</skippedModules>
</configuration>
</plugin>
<plugin>
@ -1336,6 +1315,15 @@
<goal>jar</goal>
</goals>
</execution>
<execution>
<id>aggregate-javadocs</id>
<goals>
<goal>aggregate-jar</goal>
</goals>
<configuration>
<skippedModules>apache-jstl,jetty-osgi-alpn,infinispan-common,infinispan-embedded,infinispan-embedded-query,infinispan-remote,infinispan-remote-query,jetty-ant,jetty-maven-plugin,jetty-plus,jetty-jndi,jetty-documentation,jetty-home,jetty-bom,jetty-runner,demo-async-rest-webapp,demo-jaas-webapp,demo-jetty-webapp,demo-jndi-webapp,demo-proxy-webapp,demo-spec-webapp,demo-async-rest-jar,demo-async-rest-server,jetty-jspc-maven-plugin,jetty-start,jetty-osgi-boot,jetty-osgi-boot-jsp,jetty-osgi-boot-warurl,jetty-httpservice</skippedModules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>