You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/05/12 16:33:21 UTC
[1/2] karaf-cellar git commit: Removed line breaks from features.xml
Repository: karaf-cellar
Updated Branches:
refs/heads/master 05f755942 -> 3044652f9
Removed line breaks from features.xml
Removed line breaks from features.xml so that karaf-maven-plugin can create a custom karaf distributable without triggering
Invalid char in schema at position 0: error.
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/608a973e
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/608a973e
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/608a973e
Branch: refs/heads/master
Commit: 608a973e90b3dddbc5bd655c3b3fb34fb1979d19
Parents: 05f7559
Author: Isszul <is...@gmail.com>
Authored: Fri May 8 09:55:36 2015 +0100
Committer: Isszul <is...@gmail.com>
Committed: Fri May 8 09:55:36 2015 +0100
----------------------------------------------------------------------
assembly/src/main/resources/features.xml | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/608a973e/assembly/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/features.xml b/assembly/src/main/resources/features.xml
index 1907156..dbe9480 100644
--- a/assembly/src/main/resources/features.xml
+++ b/assembly/src/main/resources/features.xml
@@ -19,20 +19,14 @@
<repository>mvn:io.fabric8/karaf-features/${fabric8.version}/xml/features</repository>
<feature name="cellar-core" description="Karaf clustering core" version="${project.version}" resolver="(obr)">
- <configfile finalname="/etc/org.apache.karaf.cellar.groups.cfg">
- mvn:org.apache.karaf.cellar/apache-karaf-cellar/${project.version}/cfg/groups
- </configfile>
- <configfile finalname="/etc/org.apache.karaf.cellar.node.cfg">
- mvn:org.apache.karaf.cellar/apache-karaf-cellar/${project.version}/cfg/node
- </configfile>
+ <configfile finalname="/etc/org.apache.karaf.cellar.groups.cfg">mvn:org.apache.karaf.cellar/apache-karaf-cellar/${project.version}/cfg/groups</configfile>
+ <configfile finalname="/etc/org.apache.karaf.cellar.node.cfg">mvn:org.apache.karaf.cellar/apache-karaf-cellar/${project.version}/cfg/node</configfile>
<bundle start-level="30">mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.core/${project.version}</bundle>
<bundle start-level="31">mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.utils/${project.version}</bundle>
</feature>
<feature name="hazelcast" description="In memory data grid" version="${hazelcast.version}" resolver="(obr)">
- <configfile finalname="/etc/hazelcast.xml">
- mvn:org.apache.karaf.cellar/apache-karaf-cellar/${project.version}/xml/hazelcast
- </configfile>
+ <configfile finalname="/etc/hazelcast.xml">mvn:org.apache.karaf.cellar/apache-karaf-cellar/${project.version}/xml/hazelcast</configfile>
<bundle start-level="30" dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
<bundle start-level="30" dependency="true">mvn:com.eclipsesource.minimal-json/minimal-json/0.9.2</bundle>
<bundle start-level="70">mvn:com.hazelcast/hazelcast/${hazelcast.version}</bundle>
[2/2] karaf-cellar git commit: Merge pull request #1 from
Isszul/features-xml-line-break
Posted by jb...@apache.org.
Merge pull request #1 from Isszul/features-xml-line-break
Removed line breaks from features.xml
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/3044652f
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/3044652f
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/3044652f
Branch: refs/heads/master
Commit: 3044652f9a1b55f858c04a68ea00daff82e119cc
Parents: 05f7559 608a973
Author: Isszul <is...@gmail.com>
Authored: Fri May 8 09:56:18 2015 +0100
Committer: Isszul <is...@gmail.com>
Committed: Fri May 8 09:56:18 2015 +0100
----------------------------------------------------------------------
assembly/src/main/resources/features.xml | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------