You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/06/14 07:13:48 UTC
camel git commit: Upgrade Htmlunit and related bundle to version 2.22
Repository: camel
Updated Branches:
refs/heads/master 1cecacf9b -> 6b3a55aee
Upgrade Htmlunit and related bundle to version 2.22
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6b3a55ae
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6b3a55ae
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6b3a55ae
Branch: refs/heads/master
Commit: 6b3a55aee98e1c5c0a42d0b0e5d228d258f1e393
Parents: 1cecacf
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Jun 14 09:12:48 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Jun 14 09:12:48 2016 +0200
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
platforms/karaf/features/src/main/resources/features.xml | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6b3a55ae/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5fa12c9..a04c5a0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -237,8 +237,8 @@
<hk2-version>2.3.0</hk2-version>
<hk2-osgi-resource-version>1.0.1</hk2-osgi-resource-version>
<hsqldb-version>2.3.4</hsqldb-version>
- <htmlunit.version>2.20</htmlunit.version>
- <htmlunit-bundle-version>2.20_1</htmlunit-bundle-version>
+ <htmlunit.version>2.22</htmlunit.version>
+ <htmlunit-bundle-version>2.22_1</htmlunit-bundle-version>
<htrace-version>3.1.0-incubating</htrace-version>
<httpunit-version>1.7</httpunit-version>
<httpcore4-version>4.4.4</httpcore4-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/6b3a55ae/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 7ed8366..15ec379 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -234,6 +234,7 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency='true'>wrap:mvn:net.sourceforge.nekohtml/nekohtml/1.9.22</bundle>
+ <bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/neko-htmlunit/2.21</bundle>
<bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/htmlunit-core-js/2.17</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
@@ -1064,6 +1065,7 @@
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle dependency='true'>wrap:mvn:net.sourceforge.nekohtml/nekohtml/1.9.22</bundle>
+ <bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/neko-htmlunit/2.21</bundle>
<bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/htmlunit-core-js/2.17</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>