You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2019/06/19 00:45:02 UTC
[maven-javadoc-plugin] branch master updated: it looks guava has
moved his javadoc...
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new b8e7768 it looks guava has moved his javadoc...
b8e7768 is described below
commit b8e776879909bf0c7739e2a14458004955477c72
Author: olivier lamy <ol...@apache.org>
AuthorDate: Tue Jun 18 21:44:04 2019 +1000
it looks guava has moved his javadoc...
curl -I https://google.github.io/guava/releases/27.0.1-jre/api/docs/com/google/common/collect/Multimap.html?is-external=true
HTTP/2 301
server: GitHub.com
content-type: text/html
location: https://guava.dev/releases/27.0.1-jre/api/docs/com/google/common/collect/Multimap.html?is-external=true
Signed-off-by: olivier lamy <ol...@apache.org>
---
src/it/projects/MJAVADOC-555_link-automatic-modules/pom.xml | 4 ++--
src/it/projects/MJAVADOC-555_link-automatic-modules/verify.groovy | 2 +-
.../java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java | 5 +----
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/it/projects/MJAVADOC-555_link-automatic-modules/pom.xml b/src/it/projects/MJAVADOC-555_link-automatic-modules/pom.xml
index 6c5522c..f6f3633 100644
--- a/src/it/projects/MJAVADOC-555_link-automatic-modules/pom.xml
+++ b/src/it/projects/MJAVADOC-555_link-automatic-modules/pom.xml
@@ -57,7 +57,7 @@
</goals>
<configuration>
<links>
- <link>https://google.github.io/guava/releases/${guava.version}/api/docs/</link>
+ <link>https://guava.dev/releases/${guava.version}/api/docs/</link>
</links>
</configuration>
</execution>
@@ -72,4 +72,4 @@
<version>${guava.version}</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/it/projects/MJAVADOC-555_link-automatic-modules/verify.groovy b/src/it/projects/MJAVADOC-555_link-automatic-modules/verify.groovy
index df3df50..1c822cc 100644
--- a/src/it/projects/MJAVADOC-555_link-automatic-modules/verify.groovy
+++ b/src/it/projects/MJAVADOC-555_link-automatic-modules/verify.groovy
@@ -30,4 +30,4 @@ def p = /<a href="([^"]+)"(?:[^>]+)>Multimap<\/a>/
def m = classFile.text =~ p
assert m.hasGroup()
-assert m[0][1] == "https://google.github.io/guava/releases/27.0.1-jre/api/docs/com/google/common/collect/Multimap.html?is-external=true"
+assert m[0][1] == "https://guava.dev/releases/27.0.1-jre/api/docs/com/google/common/collect/Multimap.html?is-external=true"
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 2abd8d1..cb68f86 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -4395,7 +4395,6 @@ public abstract class AbstractJavadocMojo
/**
* @param sourcePaths could be null
- * @param files not null
* @return the list of package names for files in the sourcePaths
*/
private List<String> getPackageNames( Map<Path, Collection<String>> sourcePaths )
@@ -4521,7 +4520,6 @@ public abstract class AbstractJavadocMojo
/**
* @param sourcePaths could be null
- * @param files not null
* @return a list files with unnamed package names for files in the sourcePaths
*/
private List<String> getFilesWithUnnamedPackages( Map<Path, Collection<String>> sourcePaths )
@@ -4561,7 +4559,6 @@ public abstract class AbstractJavadocMojo
/**
* Either return only the module descriptor or all sourcefiles per sourcepath
* @param sourcePaths could be null
- * @param files not null
* @return a list of files
*/
private List<String> getSpecialFiles( Map<Path, Collection<String>> sourcePaths )
@@ -4990,7 +4987,7 @@ public abstract class AbstractJavadocMojo
for ( Map.Entry<String, Collection<Path>> projectSourcepaths : allSourcePaths.entrySet() )
{
MavenProject aggregatedProject = reactorKeys.get( projectSourcepaths.getKey() );
- if ( aggregatedProject != null )
+ if ( aggregatedProject != null && !"pom".equals( aggregatedProject.getPackaging() ) )
{
ResolvePathResult result = null;