Repository: karaf Updated Branches: refs/heads/karaf-4.0.x 128ba5296 -> e4c8b2cfd
[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/e4c8b2cf Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e4c8b2cf Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e4c8b2cf Branch: refs/heads/karaf-4.0.x Commit: e4c8b2cfdfb2593b0d78a9700c86f36151603264 Parents: 128ba52 Author: lburgazzoli <[email protected]> Authored: Mon Aug 8 12:45:22 2016 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon Aug 8 21:28:34 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/karaf/tooling/AssemblyMojo.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/e4c8b2cf/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 7a89b83..9ba2c22 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; @@ -143,7 +152,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
