You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2020/06/12 12:23:37 UTC
[sling-slingfeature-maven-plugin] branch master updated: SLING-9516
: Allow to specify execution environment as part of the feature model
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 f8ecf54 SLING-9516 : Allow to specify execution environment as part of the feature model
f8ecf54 is described below
commit f8ecf54f5de05922d9b2452fa6a23480b98da5cf
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jun 12 14:23:21 2020 +0200
SLING-9516 : Allow to specify execution environment as part of the feature model
---
pom.xml | 4 ++--
.../org/apache/sling/feature/maven/mojos/ApisJarMojo.java | 5 ++++-
.../apache/sling/feature/maven/mojos/apis/JavadocLinks.java | 13 ++++++++++++-
3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index fd91383..f6170d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,12 +170,12 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.analyser</artifactId>
- <version>1.2.6</version>
+ <version>1.2.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
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 497de96..8bd7aad 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
@@ -81,6 +81,7 @@ import org.apache.maven.shared.utils.io.FileUtils;
import org.apache.maven.shared.utils.logging.MessageUtils;
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.ArtifactId;
+import org.apache.sling.feature.ExecutionEnvironmentExtension;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.Extensions;
import org.apache.sling.feature.Feature;
@@ -579,8 +580,10 @@ public class ApisJarMojo extends AbstractIncludingFeatureMojo {
if (generateJavadocJar) {
final File javadocsDir = new File(regionDir, ArtifactType.JAVADOC.getId());
+ final ExecutionEnvironmentExtension ext = ExecutionEnvironmentExtension.getExecutionEnvironmentExtension(feature);
final JavadocLinks links = new JavadocLinks();
- links.calculateLinks(this.javadocLinks, ctx.getArtifactInfos(apiRegion, false));
+ links.calculateLinks(this.javadocLinks, ctx.getArtifactInfos(apiRegion, false), ext != null ? ext.getFramework() : null);
+
final Collection<ArtifactInfo> infos = generateJavadoc(ctx, apiRegion, links, javadocsDir);
if ( infos != null ) {
ctx.setJavadocDir(javadocsDir);
diff --git a/src/main/java/org/apache/sling/feature/maven/mojos/apis/JavadocLinks.java b/src/main/java/org/apache/sling/feature/maven/mojos/apis/JavadocLinks.java
index f67e9a5..dca3f53 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/apis/JavadocLinks.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/apis/JavadocLinks.java
@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.maven.mojos.apis.ApisJarContext.ArtifactInfo;
public class JavadocLinks {
@@ -33,7 +34,8 @@ public class JavadocLinks {
private final Set<String> docLinks = new HashSet<>();
public void calculateLinks(final String[] globalJavaDocLinks,
- final Collection<ArtifactInfo> infos) throws MojoExecutionException {
+ final Collection<ArtifactInfo> infos,
+ final Artifact framework) throws MojoExecutionException {
final Map<String, Set<String>> linkedPackagesMap = new HashMap<>();
this.docLinks.clear();
this.linkedGlobalPackages.clear();
@@ -52,6 +54,15 @@ public class JavadocLinks {
}
}
}
+ if ( framework != null ) {
+ final List<String> links = ApisUtil.getJavadocLinks(framework);
+ if ( links != null ) {
+ for(final String v : links) {
+ ApisUtil.getPackageList(v, linkedGlobalPackages, linkedPackagesMap);
+ docLinks.add(v);
+ }
+ }
+ }
}
public Set<String> getJavadocLinks() {