[karaf] branch master updated: inline prop edits support

[jb...@apache.org]

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

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new dd5c209  inline prop edits support
     new 826f4ee  Merge pull request #1204 from rmannibucau/rmannibucau/enable-inline-prop-edits-in-karaf-plugin
dd5c209 is described below

commit dd5c209cfe7d184fbee8ac4d118c83a7bd4f2152
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Mon Sep 28 12:09:27 2020 +0200

    inline prop edits support
---
 .../src/main/java/org/apache/karaf/tooling/AssemblyMojo.java      | 8 ++++++++
 1 file changed, 8 insertions(+)

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 83ce28b..141d0ba 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
@@ -423,6 +423,9 @@ public class AssemblyMojo extends MojoSupport {
     @Parameter(defaultValue = "${project.basedir}/src/main/karaf/assembly-property-edits.xml")
     protected String propertyFileEdits;
 
+    @Parameter
+    protected KarafPropertyEdits propertyEdits;
+
     /**
      * Glob specifying which configuration PIDs in the selected boot features
      * should be extracted to <code>${karaf.etc}</code> directory. By default all PIDs are extracted.
@@ -721,6 +724,11 @@ public class AssemblyMojo extends MojoSupport {
                 }
             }
         }
+        if (edits == null && propertyEdits != null) {
+            edits = propertyEdits;
+        } else if (edits != null && propertyEdits != null && !propertyEdits.getEdits().isEmpty()) {
+            edits.getEdits().addAll(propertyEdits.getEdits());
+        }
         return edits;
     }