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 2019/11/12 06:28:20 UTC
[sling-slingfeature-maven-plugin] branch master updated: SLING-8839
: Sensible defaults for the default set of analysers
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 2974d3c SLING-8839 : Sensible defaults for the default set of analysers
2974d3c is described below
commit 2974d3ce472c023fd47b964e113c85b5b107bf51
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Nov 12 07:28:06 2019 +0100
SLING-8839 : Sensible defaults for the default set of analysers
---
pom.xml | 2 +-
.../feature/maven/mojos/AnalyseFeaturesMojo.java | 30 ++++++++++++++++------
2 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index b3f13fe..4b1ce58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>slingfeature-maven-plugin</artifactId>
- <version>1.1.11-SNAPSHOT</version>
+ <version>1.0.9-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Sling OSGi Feature Maven Plugin</name>
diff --git a/src/main/java/org/apache/sling/feature/maven/mojos/AnalyseFeaturesMojo.java b/src/main/java/org/apache/sling/feature/maven/mojos/AnalyseFeaturesMojo.java
index 1bb74d5..d3ef86d 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/AnalyseFeaturesMojo.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/AnalyseFeaturesMojo.java
@@ -18,12 +18,15 @@ package org.apache.sling.feature.maven.mojos;
import java.io.File;
import java.io.IOException;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.MojoExecutionException;
@@ -75,13 +78,11 @@ public class AnalyseFeaturesMojo extends AbstractIncludingFeatureMojo {
@Override
public URL provide(final ArtifactId id) {
- try
- {
+ try {
return ProjectHelper.getOrResolveArtifact(project, mavenSession, artifactHandlerManager, artifactResolver, id).getFile().toURI().toURL();
- }
- catch (Exception e)
- {
- getLog().error(e);
+ } catch (final MalformedURLException e) {
+ getLog().debug("Malformed url " + e.getMessage(), e);
+ // ignore
return null;
}
}
@@ -106,9 +107,22 @@ public class AnalyseFeaturesMojo extends AbstractIncludingFeatureMojo {
getLog().debug(MessageUtils.buffer().a("Setting up the ").strong("analyser")
.a(" with following configuration:").toString());
getLog().debug(" * Task Configuration = " + taskConfiguration);
- getLog().debug(" * Include Tasks = " + an.getIncludeTasks());
+ Set<String> includedTasks = an.getIncludeTasks();
+ if (includedTasks == null) {
+ // use defaults
+ includedTasks = new HashSet<>();
+ includedTasks.add("bundle-packages");
+ includedTasks.add("requirements-capabilities");
+ if (an.getExcludeTasks() != null) {
+ includedTasks.removeAll(an.getExcludeTasks());
+ if (includedTasks.isEmpty()) {
+ includedTasks = null;
+ }
+ }
+ }
+ getLog().debug(" * Include Tasks = " + includedTasks);
getLog().debug(" * Exclude Tasks = " + an.getExcludeTasks());
- final Analyser analyser = new Analyser(scanner, taskConfiguration, an.getIncludeTasks(), an.getExcludeTasks());
+ final Analyser analyser = new Analyser(scanner, taskConfiguration, includedTasks, an.getExcludeTasks());
getLog().debug(MessageUtils.buffer().strong("Analyser").a(" successfully set up").toString());
getLog().debug("Retrieving Feature files...");