Repository: camel
Updated Branches:
refs/heads/camel-2.17.x 0bad5b285 -> df4004898
CAMEL-9926: Updated jetty client version to 9.2.17.v20160517, which includes a
fix for an http proxy issue
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/df400489
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/df400489
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/df400489
Branch: refs/heads/camel-2.17.x
Commit: df4004898478c30b04b4ef757420228a060fc31d
Parents: 0bad5b2
Author: Dhiraj Bokde <dhira...@yahoo.com>
Authored: Mon May 23 11:10:43 2016 -0700
Committer: Dhiraj Bokde <dhira...@yahoo.com>
Committed: Mon May 23 11:20:25 2016 -0700
----------------------------------------------------------------------
.../camel/component/salesforce/HttpProxyIntegrationTest.java | 5 ++---
parent/pom.xml | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/df400489/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java
----------------------------------------------------------------------
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java
index d54b207..3281452 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java
@@ -32,7 +32,6 @@ import org.eclipse.jetty.util.B64Code;
import org.eclipse.jetty.util.StringUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,7 +42,6 @@ import static
org.eclipse.jetty.http.HttpHeader.PROXY_AUTHORIZATION;
/**
* Test HTTP proxy configuration for Salesforce component.
*/
-@Ignore("Bug in Jetty9 causes java.lang.IllegalArgumentException: Invalid
protocol login.salesforce.com")
public class HttpProxyIntegrationTest extends AbstractSalesforceTestBase {
private static final Logger LOG =
LoggerFactory.getLogger(HttpProxyIntegrationTest.class);
@@ -128,9 +126,10 @@ public class HttpProxyIntegrationTest extends
AbstractSalesforceTestBase {
// set HTTP proxy settings
salesforce.setHttpProxyHost(HTTP_PROXY_HOST);
salesforce.setHttpProxyPort(httpProxyPort);
+ salesforce.setIsHttpProxySecure(false);
salesforce.setHttpProxyUsername(HTTP_PROXY_USER_NAME);
salesforce.setHttpProxyPassword(HTTP_PROXY_PASSWORD);
- salesforce.setHttpProxyAuthUri(String.format("https://%s:%s";,
HTTP_PROXY_HOST, httpProxyPort));
+ salesforce.setHttpProxyAuthUri(String.format("http://%s:%s";,
HTTP_PROXY_HOST, httpProxyPort));
salesforce.setHttpProxyRealm(HTTP_PROXY_REALM);
// set HTTP client properties
http://git-wip-us.apache.org/repos/asf/camel/blob/df400489/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6ea3bca..49ff4a2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -302,7 +302,7 @@
<jetty6-bundle-version>6.1.26_4</jetty6-bundle-version>
<jetty6-version>6.1.26</jetty6-version>
<jetty8-version>8.1.17.v20150415</jetty8-version>
- <jetty9-version>9.2.15.v20160210</jetty9-version>
+ <jetty9-version>9.2.17.v20160517</jetty9-version>
<jetty-version>${jetty8-version}</jetty-version>
<!-- jetty-plugin 8.1.7 does not exists -->
<jetty-plugin-version>8.1.16.v20140903</jetty-plugin-version>
