You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2016/11/30 16:13:31 UTC
karaf git commit: [KARAF-4869] Instance start failed
Repository: karaf
Updated Branches:
refs/heads/master 3059885f3 -> d6ef76feb
[KARAF-4869] Instance start failed
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d6ef76fe
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d6ef76fe
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d6ef76fe
Branch: refs/heads/master
Commit: d6ef76feb67b2250f40d1157c9b9658edf5ba0e7
Parents: 3059885
Author: Guillaume Nodet <gn...@apache.org>
Authored: Wed Nov 30 17:13:25 2016 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Wed Nov 30 17:13:25 2016 +0100
----------------------------------------------------------------------
instance/pom.xml | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/d6ef76fe/instance/pom.xml
----------------------------------------------------------------------
diff --git a/instance/pom.xml b/instance/pom.xml
index 09eaa69..f10bc75 100644
--- a/instance/pom.xml
+++ b/instance/pom.xml
@@ -129,6 +129,10 @@
</goals>
<configuration>
<outputDirectory>${project.build.directory}/generated-resources/org/apache/karaf/instance/</outputDirectory>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ <delimiters>
+ <delimiter>@@</delimiter>
+ </delimiters>
<resources>
<resource>
<directory>${project.basedir}/../assemblies/features/base/src/main/resources</directory>
@@ -150,13 +154,6 @@
</includes>
</resource>
<resource>
- <directory>${project.basedir}/../assemblies/features/base/src/main/snapshot</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.cfg</include>
- </includes>
- </resource>
- <resource>
<directory>${project.basedir}/../assemblies/features/framework/src/main/resources</directory>
<includes>
<include>**/*.cfg</include>