Repository: camel Updated Branches: refs/heads/master 3511f1e3c -> 18d5c3c61
Adding a camel-box karaf feature. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2936f191 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2936f191 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2936f191 Branch: refs/heads/master Commit: 2936f1918e95d8ed655af109c866b712c8c2535d Parents: 3511f1e Author: Hiram Chirino <hi...@hiramchirino.com> Authored: Thu Jul 3 12:05:01 2014 -0400 Committer: Hiram Chirino <hi...@hiramchirino.com> Committed: Thu Jul 3 12:05:01 2014 -0400 ---------------------------------------------------------------------- components/camel-box/pom.xml | 2 -- parent/pom.xml | 2 ++ .../features/src/main/resources/features.xml | 21 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2936f191/components/camel-box/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-box/pom.xml b/components/camel-box/pom.xml index aee2b38..c65e9b1 100644 --- a/components/camel-box/pom.xml +++ b/components/camel-box/pom.xml @@ -20,8 +20,6 @@ <componentName>Box</componentName> <componentPackage>org.apache.camel.component.box</componentPackage> <outPackage>org.apache.camel.component.box.internal</outPackage> - <boxjavalibv2.version>3.0.9</boxjavalibv2.version> - <htmlunit.version>2.15</htmlunit.version> <camel.osgi.export.pkg>${componentPackage}</camel.osgi.export.pkg> <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg> http://git-wip-us.apache.org/repos/asf/camel/blob/2936f191/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index d68fd41..67a25de 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -69,6 +69,7 @@ <bsh-version>2.0b5</bsh-version> <!-- bouncycastle 1.50 does not work in OSGi - http://www.bouncycastle.org/jira/browse/BJA-476 --> <bouncycastle-version>1.49</bouncycastle-version> + <boxjavalibv2.version>3.0.9</boxjavalibv2.version> <build-helper-maven-plugin-version>1.8</build-helper-maven-plugin-version> <c3p0-version>0.9.1.2</c3p0-version> <castor-bundle-version>1.3.2_2</castor-bundle-version> @@ -184,6 +185,7 @@ <!-- Spring 3.2.x and 4.0.x still stick to JPA 2.0. Hibernate 4.3.x upgraded to JPA 2.1. --> <hibernate-version>4.2.13.Final</hibernate-version> <hsqldb-version>2.3.2</hsqldb-version> + <htmlunit.version>2.15</htmlunit.version> <httpunit-version>1.7</httpunit-version> <httpcore4-version>4.3.2</httpcore4-version> <httpclient4-version>4.3.3</httpclient4-version> http://git-wip-us.apache.org/repos/asf/camel/blob/2936f191/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 a4ec9f6..0113901 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -172,6 +172,27 @@ <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-bindy/${project.version}</bundle> </feature> + <feature name='camel-box' version='${project.version}' resolver='(obr)' start-level='50'> + <feature version='${project.version}'>camel-core</feature> + <bundle>mvn:org.apache.camel/camel-box/${project.version}</bundle> + <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> + <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> + <bundle dependency='true'>wrap:mvn:org.apache.httpcomponents/httpmime-osgi/${httpclient4-version}</bundle> + <bundle dependency='true'>wrap:mvn:org.apache.httpcomponents/httpclient-cache-osgi/${httpclient4-version}</bundle> + <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle> + <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle> + <bundle dependency='true'>wrap:mvn:net.box/boxjavalibv2/${boxjavalibv2.version}</bundle> + <bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/htmlunit/${htmlunit.version}</bundle> + <bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/htmlunit-core/${htmlunit.version}</bundle> + <bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/htmlunit-core-js/${htmlunit.version}</bundle> + <bundle dependency='true'>wrap:mvn:net.sourceforge.cssparser/cssparser/0.9.14</bundle> + <bundle dependency='true'>wrap:mvn:org.w3c.css/sac/1.3</bundle> + <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> + </feature> <feature name='camel-cache' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:net.sf.ehcache/ehcache/${ehcache-version}</bundle>
