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/05/10 07:12:46 UTC
[1/2] camel git commit: Upgrade HtmlUnit and related bundle to
version 2.20 in camel-linkedin
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x 250de646d -> 04179ec97
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/1fc41734
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1fc41734
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1fc41734
Branch: refs/heads/camel-2.17.x
Commit: 1fc41734872ab82c82ecadf8970332afe968313e
Parents: 250de64
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Apr 28 14:36:54 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue May 10 09:06:31 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/1fc41734/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/1fc41734/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ff9fe76..6ea3bca 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -234,8 +234,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/1fc41734/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 a2906c1..8d4b50f 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1027,12 +1027,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>
[2/2] camel git commit: Upgrade HtmlUnit and related bundle to
version 2.20 in camel-box
Posted by ac...@apache.org.
Upgrade HtmlUnit and related bundle to version 2.20 in camel-box
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/04179ec9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/04179ec9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/04179ec9
Branch: refs/heads/camel-2.17.x
Commit: 04179ec97a6f3aad0c781055af2f959cdfe4c455
Parents: 1fc4173
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Apr 28 14:47:17 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue May 10 09:06:40 2016 +0200
----------------------------------------------------------------------
.../apache/camel/component/box/internal/LoginAuthFlowUI.java | 2 +-
platforms/karaf/features/src/main/resources/features.xml | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/04179ec9/components/camel-box/src/main/java/org/apache/camel/component/box/internal/LoginAuthFlowUI.java
----------------------------------------------------------------------
diff --git a/components/camel-box/src/main/java/org/apache/camel/component/box/internal/LoginAuthFlowUI.java b/components/camel-box/src/main/java/org/apache/camel/component/box/internal/LoginAuthFlowUI.java
index d5d2d33..8044ecd 100644
--- a/components/camel-box/src/main/java/org/apache/camel/component/box/internal/LoginAuthFlowUI.java
+++ b/components/camel-box/src/main/java/org/apache/camel/component/box/internal/LoginAuthFlowUI.java
@@ -84,7 +84,7 @@ public final class LoginAuthFlowUI implements IAuthFlowUI {
// TODO run this on an Executor to make it async
// create HtmlUnit client
- final WebClient webClient = new WebClient(BrowserVersion.FIREFOX_24);
+ final WebClient webClient = new WebClient(BrowserVersion.FIREFOX_38);
final WebClientOptions options = webClient.getOptions();
options.setRedirectEnabled(true);
options.setJavaScriptEnabled(false);
http://git-wip-us.apache.org/repos/asf/camel/blob/04179ec9/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 8d4b50f..bf8886b 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -224,12 +224,13 @@
<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'>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:commons-codec/commons-codec/${commons-codec-version}</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'>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>