Repository: camel Updated Branches: refs/heads/camel-2.14.x 9c84398e2 -> e53e97de0 refs/heads/camel-2.15.x 517db2078 -> 5a73ecf3b
CAMEL-8467 Update camel-linkedin and camel-box components to use servicemix bundle for htmlunit Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5a73ecf3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5a73ecf3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5a73ecf3 Branch: refs/heads/camel-2.15.x Commit: 5a73ecf3b897f5cdbdc93ab1519723564efbe847 Parents: 517db20 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Wed Apr 22 22:28:51 2015 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Thu Apr 23 09:34:15 2015 +0800 ---------------------------------------------------------------------- parent/pom.xml | 3 ++- platforms/karaf/features/src/main/resources/features.xml | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5a73ecf3/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 9098fda..1cd8ece 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -210,6 +210,7 @@ <hibernate-version>4.2.16.Final</hibernate-version> <hsqldb-version>2.3.2</hsqldb-version> <htmlunit.version>2.15</htmlunit.version> + <htmlunit-bundle-version>2.15_1</htmlunit-bundle-version> <httpunit-version>1.7</httpunit-version> <httpcore4-version>4.3.3</httpcore4-version> <httpclient4-version>4.3.6</httpclient4-version> @@ -2442,7 +2443,7 @@ <groupId>org.jdom</groupId> <artifactId>jdom</artifactId> <version>${jdom-version}</version> - </dependency> + </dependency> <dependency> <groupId>commons-dbcp</groupId> <artifactId>commons-dbcp</artifactId> http://git-wip-us.apache.org/repos/asf/camel/blob/5a73ecf3/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 40a707e..bb0d217 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -196,8 +196,7 @@ <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-js/${htmlunit.version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.htmlunit/${htmlunit-bundle-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> @@ -904,9 +903,7 @@ <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-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> - <!-- TODO need to replace it with org.apache.servicemix.bundles.httpunit --> - <bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/htmlunit/${htmlunit.version}</bundle> - <bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/htmlunit-core-js/${htmlunit.version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.htmlunit/${htmlunit-bundle-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:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
