Repository: camel Updated Branches: refs/heads/master 17fd873cc -> d01e51f02
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/d01e51f0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d01e51f0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d01e51f0 Branch: refs/heads/master Commit: d01e51f02bf692b8c13c07474952e652147be99f Parents: 99d44de Author: Christian Mueller <cmuel...@apache.org> Authored: Mon Mar 30 22:59:16 2015 +0200 Committer: Christian Mueller <cmuel...@apache.org> Committed: Mon Mar 30 23:06:00 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/d01e51f0/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 99815d8..8840541 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -178,6 +178,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/d01e51f0/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 8953bc5..d44eb20 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -593,6 +593,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>
