You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2015/03/30 23:33:22 UTC
[1/2] camel git commit: CAMEL-8573: Feature camel-hbase doesn't
install all required dependencies
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 50017e615 -> ce0ffeeec
CAMEL-8573: Feature camel-hbase doesn't install all required dependencies
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/be93eb2f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/be93eb2f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/be93eb2f
Branch: refs/heads/camel-2.15.x
Commit: be93eb2fb8bba7783156dcbe29445101feb86bff
Parents: 50017e6
Author: Christian Mueller <cm...@apache.org>
Authored: Mon Mar 30 23:28:13 2015 +0200
Committer: Christian Mueller <cm...@apache.org>
Committed: Mon Mar 30 23:28:13 2015 +0200
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/be93eb2f/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 c02f5c1..7a19f03 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -526,6 +526,7 @@
<details>Hadoop does not currently work properly in OSGi environment.</details>
<feature version='${project.version}'>camel-core</feature>
<feature version='${cxf-version-range}'>cxf-specs</feature>
+ <bundle dependency="true">wrap:mvn:javax.servlet.jsp/jsp-api/2.1</bundle>
<feature>war</feature>
<bundle dependency='true'>mvn:org.osgi/org.osgi.compendium/${osgi-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-interceptor_1.1_spec/1.0</bundle>
[2/2] camel git commit: CAMEL-8574: Feature camel-hdfs doesn't
install all required dependencies
Posted by cm...@apache.org.
CAMEL-8574: Feature camel-hdfs doesn't install all required dependencies
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ce0ffeee
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ce0ffeee
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ce0ffeee
Branch: refs/heads/camel-2.15.x
Commit: ce0ffeeec8c30b45c1b213990816b522031a856c
Parents: be93eb2
Author: Christian Mueller <cm...@apache.org>
Authored: Mon Mar 30 23:33:09 2015 +0200
Committer: Christian Mueller <cm...@apache.org>
Committed: Mon Mar 30 23:33:09 2015 +0200
----------------------------------------------------------------------
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ce0ffeee/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a5561d6..9144dd6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -177,6 +177,7 @@
<geronimo-jsp-spec-version>1.1</geronimo-jsp-spec-version>
<geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version>
<geronimo-servlet-spec-version>1.0</geronimo-servlet-spec-version>
+ <geronimo-servlet-2.5-spec-version>1.2</geronimo-servlet-2.5-spec-version>
<geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
<gmaven-plugin-version>1.4</gmaven-plugin-version>
<gmetric4j-version>1.0.10</gmetric4j-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/ce0ffeee/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 7a19f03..d9d3f7d 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -588,6 +588,8 @@
<!-- see https://issues.apache.org/jira/browse/HADOOP-7101 -->
<details>Hadoop does not currently work properly in OSGi environment.</details>
<feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet-2.5-spec-version}</bundle>
+ <bundle dependency="true">wrap:mvn:javax.servlet.jsp/jsp-api/2.1</bundle>
<feature>war</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle dependency='true'>mvn:javax.mail/mail/${javax-mail-version}</bundle>