Repository: karaf Updated Branches: refs/heads/master 86290690d -> 065fb489c
[KARAF-4649] In the AssemblyMojo, set blacklistPolicy to null if not defined in pom Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/120bbb5e Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/120bbb5e Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/120bbb5e Branch: refs/heads/master Commit: 120bbb5e37de94453eff7c062c462faf00ca1137 Parents: 8629069 Author: lburgazzoli <[email protected]> Authored: Mon Aug 8 12:45:22 2016 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon Aug 8 20:58:57 2016 +0200 ---------------------------------------------------------------------- .../org/apache/karaf/tooling/AssemblyMojo.java | 23 ++++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/120bbb5e/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java index 46c79dd..8620c30 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java @@ -18,11 +18,20 @@ */ package org.apache.karaf.tooling; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.attribute.PosixFilePermissions; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.apache.karaf.profile.assembly.Builder; import org.apache.karaf.tooling.utils.IoUtils; import org.apache.karaf.tooling.utils.MavenUtil; import org.apache.karaf.tooling.utils.MojoSupport; -import org.apache.karaf.tools.utils.KarafPropertiesEditor; import org.apache.karaf.tools.utils.model.KarafPropertyEdits; import org.apache.karaf.tools.utils.model.io.stax.KarafPropertyInstructionsModelStaxReader; import org.apache.maven.artifact.Artifact; @@ -33,16 +42,6 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.attribute.PosixFilePermissions; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * Creates a customized Karaf distribution by installing features and setting up * configuration files. The plugin gets features from feature.xml files and KAR @@ -144,7 +143,7 @@ public class AssemblyMojo extends MojoSupport { private List<String> blacklistedProfiles; @Parameter - private Builder.BlacklistPolicy blacklistPolicy; + private Builder.BlacklistPolicy blacklistPolicy = Builder.BlacklistPolicy.Discard; /** * Ignore the dependency attribute (dependency="[true|false]") on bundle
