Repository: karaf Updated Branches: refs/heads/karaf-4.0.x b48f1af48 -> 16ed4bde7
[KARAF-5167] Fix filtering on the instance Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/16ed4bde Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/16ed4bde Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/16ed4bde Branch: refs/heads/karaf-4.0.x Commit: 16ed4bde749b7a0467f5fe503dc9a03e9246fdb2 Parents: b48f1af Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Jun 15 17:23:46 2017 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Jun 15 17:23:46 2017 +0200 ---------------------------------------------------------------------- instance/pom.xml | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/16ed4bde/instance/pom.xml ---------------------------------------------------------------------- diff --git a/instance/pom.xml b/instance/pom.xml index c5b0b63..2892afe 100644 --- a/instance/pom.xml +++ b/instance/pom.xml @@ -126,7 +126,9 @@ <resource> <directory>${project.basedir}/../assemblies/features/base/src/main/resources</directory> <excludes> - <exclude>**/system.properties</exclude> + <exclude>**/etc/system.properties</exclude> + <exclude>**/etc/org.apache.karaf.shell.cfg</exclude> + <exclude>**/etc/org.apache.karaf.management.cfg</exclude> </excludes> </resource> <resource> @@ -147,25 +149,6 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <configuration> - <useDefaultDelimiters>false</useDefaultDelimiters> - <delimiters> - <delimiter>@@</delimiter> - </delimiters> - </configuration> - <executions> - <execution> - <id>filter</id> - <phase>generate-resources</phase> - <goals> - <goal>resources</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.karaf.tooling</groupId> <artifactId>karaf-services-maven-plugin</artifactId> </plugin>
