You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/10/26 13:10:49 UTC
[2/2] camel git commit: CAMEL-9113: Added detail about java8 in karaf
feature. This fixed #661.
CAMEL-9113: Added detail about java8 in karaf feature. This fixed #661.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/84a7a053
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/84a7a053
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/84a7a053
Branch: refs/heads/master
Commit: 84a7a053617e6bf2540a5a2d3fa0caa54d0ba937
Parents: be9fbae
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Oct 26 13:13:38 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Oct 26 13:13:38 2015 +0100
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/84a7a053/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 66144a3..2900728 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -690,7 +690,7 @@
</feature>
<feature name='camel-ibatis' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <feature>transaction</feature>
+ <feature>transaction</feature>
<bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle>
<bundle dependency='true'>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle>
@@ -708,6 +708,8 @@
<bundle>mvn:org.apache.camel/camel-ical/${project.version}</bundle>
</feature>
<feature name='camel-infinispan' version='${project.version}' resolver='(obr)' start-level='50'>
+ <details>The camel-infinispan feature requires Java 8</details>
+ <feature>transaction</feature>
<bundle dependency='true'>mvn:org.infinispan/infinispan-core/${infinispan-version}</bundle>
<bundle dependency='true'>mvn:org.infinispan/infinispan-commons/${infinispan-version}</bundle>
<bundle dependency='true'>mvn:org.infinispan/infinispan-client-hotrod/${infinispan-version}</bundle>
@@ -888,7 +890,7 @@
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jt400/${jt400-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
- <feature>transaction</feature>
+ <feature>transaction</feature>
<bundle>mvn:org.apache.camel/camel-jt400/${project.version}</bundle>
</feature>
<feature name='camel-juel' version='${project.version}' resolver='(obr)' start-level='50'>