Addressing javadoc aggregate issues under JPMS

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2020-09-24 09:04:28 -05:00
parent 9bce085291
commit f7dedd8e7d
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
5 changed files with 146 additions and 56 deletions

View File

@ -16,26 +16,6 @@
<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>

142
javadoc/pom.xml Normal file
View File

@ -0,0 +1,142 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>10.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>javadoc</artifactId>
<name>Jetty :: Javadoc Build</name>
<packaging>jar</packaging>
<properties>
<sources-directory>${project.build.directory}/jetty-sources</sources-directory>
<sonar.skip>true</sonar.skip>
</properties>
<build>
<sourceDirectory>${sources-directory}</sourceDirectory>
<plugins>
<!-- No point performing Checkstyle in javadoc project -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<!-- No point performing PMD in javadoc project -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<!-- No point performing Findbugs in javadoc project -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>init-jetty-sources-dir</id>
<phase>generate-sources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<mkdir dir="${sources-directory}" />
</tasks>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-sources</id>
<phase>prepare-package</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>
org.eclipse.jetty, org.eclipse.jetty.websocket
</includeGroupIds>
<excludeArtifactIds>
infinispan-embedded,
infinispan-remote,
jetty-test-helper,
alpn-api,
javax.servlet,
jetty-servlet-api,
javax.mail.glassfish
</excludeArtifactIds>
<classifier>sources</classifier>
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
<excludes>META-INF/**,module-info.java</excludes>
<outputDirectory>${sources-directory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>build-javadoc</id>
<phase>prepare-package</phase>
<goals>
<goal>javadoc</goal>
</goals>
<configuration>
<excludePackageNames>javax.mail,javax.servlet</excludePackageNames>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.mail.glassfish</artifactId>
<version>1.4.1.v201005082020</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.activation</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>

View File

@ -40,20 +40,6 @@
<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>

24
pom.xml
View File

@ -1276,6 +1276,9 @@
</profile>
<profile>
<id>eclipse-release</id>
<modules>
<module>javadoc</module>
</modules>
<build>
<plugins>
<plugin>
@ -1305,27 +1308,6 @@
<updateReleaseInfo>true</updateReleaseInfo>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<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,jetty-gcloud-session-manager</skippedModules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>

View File

@ -167,7 +167,7 @@ if proceedyn "Are you sure you want to release using above? (y/N)" n; then
# This is equivalent to 'mvn release:perform'
if proceedyn "Build/Deploy from tag $TAG_NAME? (Y/n)" y; then
git checkout $TAG_NAME
mvn clean package javadoc:aggregate-jar deploy \
mvn clean package deploy \
-Peclipse-release $DEPLOY_OPTS
reportMavenTestFailures
git checkout $GIT_BRANCH_ID