You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/10/25 05:50:34 UTC
[maven-plugin-tools] branch javadocs-npe updated (e2500f3f -> 660c06bc)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a change to branch javadocs-npe
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
discard e2500f3f [MPLUGIN-432] Improve site build
new 660c06bc [MPLUGIN-432] Improve site build
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (e2500f3f)
\
N -- N -- N refs/heads/javadocs-npe (660c06bc)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 1 -
1 file changed, 1 deletion(-)
[maven-plugin-tools] 01/01: [MPLUGIN-432] Improve site build
Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch javadocs-npe
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 660c06bcffc53f71fc2d817860b14e2c93ea579f
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Mon Oct 24 21:19:28 2022 +0200
[MPLUGIN-432] Improve site build
- rename duplicate packages - cause NPE in javadoc on clean project
- remove reports defined in parent pom
- aggregate reports should be not inherited
---
.mvn/maven.config | 0
.../plugin/plugin/DescriptorGeneratorMojo.java | 3 +--
.../{report => report_old}/PluginReport.java | 4 +--
.../{report => report_old}/Requirements.java | 2 +-
.../RequirementsHistory.java | 2 +-
.../EnhancedPluginDescriptorBuilder.java | 5 ++--
pom.xml | 29 ++++++++--------------
7 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 00000000..e69de29b
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
index 5044c893..84388041 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
@@ -34,7 +34,6 @@ import org.apache.maven.artifact.resolver.filter.IncludesArtifactFilter;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.descriptor.InvalidPluginDescriptorException;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugin.plugin.report.PluginReport;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
@@ -195,7 +194,7 @@ public class DescriptorGeneratorMojo
* This may be relative to the root of the generated Maven site.
* It does not need to exist yet at the time when this goal is executed.
* Must end with a slash.
- * <b>In case this is set the javadoc reporting goal should be executed prior to {@link PluginReport}.</b>
+ * <b>In case this is set the javadoc reporting goal should be executed prior to Plugin Report.</b>
* @since 3.7.0
*/
@Parameter( property = "internalJavadocBaseUrl" )
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/PluginReport.java
similarity index 99%
rename from maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java
rename to maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/PluginReport.java
index 2a700f7f..bc34746d 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/PluginReport.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.plugin.report;
+package org.apache.maven.plugin.plugin.report_old;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -41,7 +41,7 @@ import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.plugin.descriptor.EnhancedPluginDescriptorBuilder;
+import org.apache.maven.plugins.plugin.descriptor_old.EnhancedPluginDescriptorBuilder;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.AbstractMavenReportRenderer;
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report/Requirements.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/Requirements.java
similarity index 97%
rename from maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report/Requirements.java
rename to maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/Requirements.java
index 1cc68b7d..cb420995 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report/Requirements.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/Requirements.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.plugin.report;
+package org.apache.maven.plugin.plugin.report_old;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report/RequirementsHistory.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/RequirementsHistory.java
similarity index 97%
rename from maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report/RequirementsHistory.java
rename to maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/RequirementsHistory.java
index 5b373d7d..438d8d74 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report/RequirementsHistory.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/RequirementsHistory.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.plugin.report;
+package org.apache.maven.plugin.plugin.report_old;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor/EnhancedPluginDescriptorBuilder.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor_old/EnhancedPluginDescriptorBuilder.java
similarity index 96%
rename from maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor/EnhancedPluginDescriptorBuilder.java
rename to maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor_old/EnhancedPluginDescriptorBuilder.java
index 211f85c9..75515656 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor/EnhancedPluginDescriptorBuilder.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor_old/EnhancedPluginDescriptorBuilder.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.plugin.descriptor;
+package org.apache.maven.plugins.plugin.descriptor_old;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,6 +25,7 @@ import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
+import org.apache.maven.plugin.plugin.report_old.PluginReport;
import org.apache.maven.rtinfo.RuntimeInformation;
import org.apache.maven.tools.plugin.EnhancedParameterWrapper;
import org.codehaus.plexus.configuration.PlexusConfiguration;
@@ -33,7 +34,7 @@ import org.codehaus.plexus.configuration.PlexusConfigurationException;
/**
* Reads enhanced plugin.xml files as generated by
* {@link org.apache.maven.tools.plugin.generator.PluginDescriptorFilesGenerator} and
- * used by {@link org.apache.maven.plugin.plugin.report.PluginReport}.
+ * used by {@link PluginReport}.
* Populates the slightly extended {@link Parameter} object {@link EnhancedParameterWrapper}.
*/
@Deprecated
diff --git a/pom.xml b/pom.xml
index 7a1d55ae..07e914a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -291,6 +291,15 @@
<build>
<pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <sourceFileExcludes>
+ <exclude>HelpMojo.*</exclude>
+ </sourceFileExcludes>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
@@ -362,14 +371,9 @@
</groups>
</configuration>
<reportSets>
- <reportSet>
- <id>non-aggregate</id>
- <reports>
- <report>javadoc</report>
- </reports>
- </reportSet>
<reportSet>
<id>aggregate</id>
+ <inherited>false</inherited>
<reports>
<report>aggregate</report>
</reports>
@@ -380,14 +384,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<reportSets>
- <reportSet>
- <id>non-aggregate</id>
- <reports>
- <report>jxr</report>
- </reports>
- </reportSet>
<reportSet>
<id>aggregate</id>
+ <inherited>false</inherited>
<reports>
<report>aggregate</report>
</reports>
@@ -398,12 +397,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<reportSets>
- <reportSet>
- <id>non-aggregate</id>
- <reports>
- <report>checkstyle</report>
- </reports>
- </reportSet>
<reportSet>
<id>aggregate</id>
<inherited>false</inherited>