Repository: camel Updated Branches: refs/heads/master 39509af13 -> 0099d077c
Upgrade HtmlUnit and related bundle to version 2.20 in camel-linkedin Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dc8676de Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dc8676de Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dc8676de Branch: refs/heads/master Commit: dc8676de6b954c9c61e3e360f664467cc2644e4e Parents: 39509af Author: Andrea Cosentino <anco...@gmail.com> Authored: Thu Apr 28 14:36:54 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Thu Apr 28 15:14:50 2016 +0200 ---------------------------------------------------------------------- .../component/linkedin/api/LinkedInOAuthRequestFilter.java | 4 ++-- parent/pom.xml | 4 ++-- platforms/karaf/features/src/main/resources/features.xml | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/dc8676de/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java ---------------------------------------------------------------------- diff --git a/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java b/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java index 7c5def9..4d781d1 100644 --- a/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java +++ b/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java @@ -93,7 +93,7 @@ public final class LinkedInOAuthRequestFilter implements ClientRequestFilter { this.oAuthToken = null; // create HtmlUnit client - webClient = new WebClient(BrowserVersion.FIREFOX_24); + webClient = new WebClient(BrowserVersion.FIREFOX_38); final WebClientOptions options = webClient.getOptions(); options.setRedirectEnabled(true); options.setJavaScriptEnabled(false); @@ -224,7 +224,7 @@ public final class LinkedInOAuthRequestFilter implements ClientRequestFilter { } public void close() { - webClient.closeAllWindows(); + webClient.close(); } private OAuthToken getAccessToken(String refreshToken) throws IOException { http://git-wip-us.apache.org/repos/asf/camel/blob/dc8676de/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index c2a65a8..ac5b391 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -233,8 +233,8 @@ <hk2-version>2.3.0</hk2-version> <hk2-osgi-resource-version>1.0.1</hk2-osgi-resource-version> <hsqldb-version>2.3.3</hsqldb-version> - <htmlunit.version>2.15</htmlunit.version> - <htmlunit-bundle-version>2.15_1</htmlunit-bundle-version> + <htmlunit.version>2.20</htmlunit.version> + <htmlunit-bundle-version>2.20_1</htmlunit-bundle-version> <httpunit-version>1.7</httpunit-version> <httpcore4-version>4.4.4</httpcore4-version> <httpclient4-version>4.5.2</httpclient4-version> http://git-wip-us.apache.org/repos/asf/camel/blob/dc8676de/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 d639afb..38f603d 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1040,12 +1040,13 @@ <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: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:net.sourceforge.cssparser/cssparser/0.9.18</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> <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.21</bundle> + <bundle dependency='true'>wrap:mvn:net.sourceforge.nekohtml/nekohtml/1.9.22</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> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
