Skip to content

Commit b8e7768

Browse files
committed
1 parent 43906f1 commit b8e7768

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

src/it/projects/MJAVADOC-555_link-automatic-modules/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</goals>
5858
<configuration>
5959
<links>
60-
<link>https://google.github.io/guava/releases/${guava.version}/api/docs/</link>
60+
<link>https://guava.dev/releases/${guava.version}/api/docs/</link>
6161
</links>
6262
</configuration>
6363
</execution>
@@ -72,4 +72,4 @@
7272
<version>${guava.version}</version>
7373
</dependency>
7474
</dependencies>
75-
</project>
75+
</project>

src/it/projects/MJAVADOC-555_link-automatic-modules/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ def p = /<a href="([^"]+)"(?:[^>]+)>Multimap<\/a>/
3030
def m = classFile.text =~ p
3131

3232
assert m.hasGroup()
33-
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"
33+
assert m[0][1] == "https://guava.dev/releases/27.0.1-jre/api/docs/com/google/common/collect/Multimap.html?is-external=true"

src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4395,7 +4395,6 @@ private void copyAdditionalJavadocResources( File anOutputDirectory )
43954395

43964396
/**
43974397
* @param sourcePaths could be null
4398-
* @param files not null
43994398
* @return the list of package names for files in the sourcePaths
44004399
*/
44014400
private List<String> getPackageNames( Map<Path, Collection<String>> sourcePaths )
@@ -4521,7 +4520,6 @@ private List<String> getPackageNamesRespectingJavaModules( Map<String, Collectio
45214520

45224521
/**
45234522
* @param sourcePaths could be null
4524-
* @param files not null
45254523
* @return a list files with unnamed package names for files in the sourcePaths
45264524
*/
45274525
private List<String> getFilesWithUnnamedPackages( Map<Path, Collection<String>> sourcePaths )
@@ -4561,7 +4559,6 @@ private List<String> getFilesWithUnnamedPackages( Map<Path, Collection<String>>
45614559
/**
45624560
* Either return only the module descriptor or all sourcefiles per sourcepath
45634561
* @param sourcePaths could be null
4564-
* @param files not null
45654562
* @return a list of files
45664563
*/
45674564
private List<String> getSpecialFiles( Map<Path, Collection<String>> sourcePaths )
@@ -4990,7 +4987,7 @@ private void addJavadocOptions( File javadocOutputDirectory,
49904987
for ( Map.Entry<String, Collection<Path>> projectSourcepaths : allSourcePaths.entrySet() )
49914988
{
49924989
MavenProject aggregatedProject = reactorKeys.get( projectSourcepaths.getKey() );
4993-
if ( aggregatedProject != null )
4990+
if ( aggregatedProject != null && !"pom".equals( aggregatedProject.getPackaging() ) )
49944991
{
49954992
ResolvePathResult result = null;
49964993

0 commit comments

Comments
 (0)