You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/04/22 16:41:08 UTC
camel git commit: CAMEL-8467 Update camel-linkedin and camel-box
components to use servicemix bundle for htmlunit
Repository: camel
Updated Branches:
refs/heads/master c03876bcf -> b5f05a366
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/b5f05a36
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b5f05a36
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b5f05a36
Branch: refs/heads/master
Commit: b5f05a3669ce4135dad2e2fe9cb21cb18bca4764
Parents: c03876b
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Apr 22 22:28:51 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Apr 22 22:40:52 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/b5f05a36/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 683d586..789e586 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -211,6 +211,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>
@@ -2467,7 +2468,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/b5f05a36/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 bca4526..7d0e60e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -201,8 +201,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>
@@ -906,9 +905,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>