[sling-slingfeature-maven-plugin] branch master updated: SLING-9435 : Take configured javadoc links into account

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 237ce63  SLING-9435 : Take configured javadoc links into account
237ce63 is described below

commit 237ce63f8e396e763a90a44d086c096be31b3551
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Fri May 8 18:15:42 2020 +0200

    SLING-9435 : Take configured javadoc links into account
---
 .../java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java 
b/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
index a52569d..48eae92 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
@@ -1199,7 +1199,7 @@ public class ApisJarMojo extends 
AbstractIncludingFeatureMojo {
         ArtifactId artifactId = artifact.getId();
         getLog().debug("Downloading sources for " + artifactId.toMvnId() + 
"...");
 
-        List<ArtifactId> scmIds = ApisUtil.getApiIds(artifact);
+        List<ArtifactId> scmIds = ApisUtil.getSourceIds(artifact);
         String scmLocation = artifact.getMetadata().get(ApisUtil.SCM_LOCATION);
         if ( scmIds != null && scmLocation != null) {
             throw new MojoExecutionException("Both " + ApisUtil.SCM_IDS + " 
and " + ApisUtil.SCM_LOCATION + " are defined for " + artifactId);
@@ -1647,19 +1647,22 @@ public class ApisJarMojo extends 
AbstractIncludingFeatureMojo {
      */
     private boolean generateJavadoc(final ApisJarContext ctx, final ApiRegion 
region, final File javadocDir)
             throws MojoExecutionException {
+        final Map<String, Set<String>> linkedPackagesMap = new HashMap<>();
+        final Set<String> linkedGlobalPackages = new HashSet<>();
+
         final List<String> docLinks = new ArrayList<>();
         if ( this.javadocLinks != null ) {
             for(final String val : this.javadocLinks) {
                 docLinks.add(val);
+                ApisUtil.getPackageList(val, linkedGlobalPackages, 
linkedPackagesMap);
             }
         }
 
-        final Map<String, Set<String>> linkedPackagesMap = new HashMap<>();
 
         final List<String> sourceDirectories = new ArrayList<>();
         final Set<String> javadocPackages = new HashSet<>();
         for(final ArtifactInfo info : ctx.getArtifactInfos(region, false)) {
-            final Set<String> linkedPackages = new HashSet<>();
+            final Set<String> linkedPackages = new 
HashSet<>(linkedGlobalPackages);
             final List<String> links = 
ApisUtil.getJavadocLinks(info.getArtifact());
             if ( links != null ) {
                 for(final String v : links) {