[java-parent-project] branch main updated: JPAR-178 - Update maven-javadoc-plugin to 3.3.0

[Phil Smart]

This is an automated email from the git hooks/post-receive script.

philsmart pushed a commit to branch main
in repository java-parent-project.

View the commit online:
http://git.shibboleth.net/view/?p=java-parent-project.git;a=commit;h=a28fc704d03ef1429edd4fcc9eb068ff092f937e

The following commit(s) were added to refs/heads/main by this push:
       new  a28fc70   JPAR-178 - Update maven-javadoc-plugin to 3.3.0
a28fc70 is described below

commit a28fc704d03ef1429edd4fcc9eb068ff092f937e
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Thu Jul 22 16:23:19 2021 +0100

    JPAR-178 - Update maven-javadoc-plugin to 3.3.0
    
    Added patch for official maven javadoc plugin V3.3.0.
    
    https://issues.shibboleth.net/jira/browse/JPAR-178
---
 ...-178-Update-maven-javadoc-plugin-to-3.3.0.patch | 110 +++++++++++++++++++++
 1 file changed, 110 insertions(+)

diff --git a/resources/maven/0001-JPAR-178-Update-maven-javadoc-plugin-to-3.3.0.patch b/resources/maven/0001-JPAR-178-Update-maven-javadoc-plugin-to-3.3.0.patch
new file mode 100644
index 0000000..4d88742
--- /dev/null
+++ b/resources/maven/0001-JPAR-178-Update-maven-javadoc-plugin-to-3.3.0.patch
@@ -0,0 +1,110 @@
+From 1c2892e2cc3eb8ab2d072a8fa53bf691e2950f62 Mon Sep 17 00:00:00 2001
+From: Phil Smart <philip.smart at jisc.ac.uk>
+Date: Thu, 22 Jul 2021 16:01:30 +0100
+Subject: [PATCH] JPAR-178 - Update maven-javadoc-plugin to 3.3.0
+
+Rebase maven-javadoc-plugin changes onto 3.3.0.
+
+- Prevent the generation of module path arguments to Javadoc. Instead
+always using the classpath argument.
+- Change POM for internal project use
+
+https://issues.shibboleth.net/jira/browse/JPAR-178
+---
+ pom.xml                                       | 28 +++++++------------
+ .../plugins/javadoc/AbstractJavadocMojo.java  | 12 ++------
+ 2 files changed, 13 insertions(+), 27 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 7e9ab315..c0baffdf 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -29,12 +29,14 @@ under the License.
+     <relativePath />
+   </parent>
+ 
++  <groupId>net.shibboleth.maven.plugins</groupId>
+   <artifactId>maven-javadoc-plugin</artifactId>
+   <version>3.3.0</version>
+   <packaging>maven-plugin</packaging>
+ 
+   <name>Apache Maven Javadoc Plugin</name>
+   <description>
++    Patched version of The Apache Maven Javadoc Plugin, see JPAR-178.
+     The Apache Maven Javadoc Plugin is a plugin that uses the javadoc tool for
+     generating javadocs for the specified project.
+   </description>
+@@ -44,25 +46,15 @@ under the License.
+     <maven>${mavenVersion}</maven>
+   </prerequisites>
+ 
+-  <scm>
+-    <connection>scm:git:https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git</connection>
+-    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git</developerConnection>
+-    <url>https://github.com/apache/maven-javadoc-plugin/tree/${project.scm.tag}</url>
+-    <tag>maven-javadoc-plugin-3.3.0</tag>
+-  </scm>
+-  <issueManagement>
+-    <system>jira</system>
+-    <url>https://issues.apache.org/jira/browse/MJAVADOC</url>
+-  </issueManagement>
+-  <ciManagement>
+-    <system>Jenkins</system>
+-    <url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-javadoc-plugin/</url>
+-  </ciManagement>
+   <distributionManagement>
+-    <site>
+-      <id>apache.website</id>
+-      <url>scm:svn:https://svn.apache.org/repos/asf/maven/website/components/${maven.site.path}</url>
+-    </site>
++     <repository>
++         <id>release</id>
++         <url>https://build.shibboleth.net/nexus/content/repositories/releases</url>
++     </repository>
++     <snapshotRepository>
++         <id>snapshot</id>
++         <url>https://build.shibboleth.net/nexus/content/repositories/snapshots</url>
++     </snapshotRepository>
+   </distributionManagement>
+ 
+   <properties>
+diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+index 0655f8a1..3bb3b413 100644
+--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
++++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+@@ -5121,15 +5121,7 @@ public abstract class AbstractJavadocMojo
+         Map<String, JavaModuleDescriptor> allModuleDescriptors = new HashMap<>();
+ 
+         
+-        boolean supportModulePath = javadocRuntimeVersion.isAtLeast( "9" );
+-        if ( release != null ) 
+-        {
+-            supportModulePath &= JavaVersion.parse( release ).isAtLeast( "9" );
+-        }
+-        else if ( source != null )
+-        {
+-            supportModulePath &= JavaVersion.parse( source ).isAtLeast( "9" );
+-        }
++        boolean supportModulePath = false;
+ 
+         if ( supportModulePath )
+         {
+@@ -5392,6 +5384,7 @@ public abstract class AbstractJavadocMojo
+         }
+         else
+         {
++            getLog().info( " Building classpath javadoc argument" );
+             String classpath = StringUtils.join( getPathElements().iterator(), File.pathSeparator );
+             addArgIfNotEmpty( arguments, "-classpath", JavadocUtil.quotedPathArgument( classpath ) , false, false );
+         }
+@@ -5989,6 +5982,7 @@ public abstract class AbstractJavadocMojo
+     private void doExecuteJavadocCommandLine( Commandline cmd, File javadocOutputDirectory )
+         throws MavenReportException
+     {
++        getLog().info( "Running patched (for flat multi-module projects) maven javadoc plugin" );
+         if ( getLog().isDebugEnabled() )
+         {
+             // no quoted arguments
+-- 
+2.30.1 (Apple Git-130)
+

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.