Repository: camel Updated Branches: refs/heads/master 3cb727769 -> 79fbb6a3b
CAMEL-9926: Updated jetty client version to 9.2.17.v20160517, which includes a fix for an http proxy issue Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/79fbb6a3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/79fbb6a3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/79fbb6a3 Branch: refs/heads/master Commit: 79fbb6a3b8362396774eb14c408edbbf2558dd91 Parents: 3cb7277 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:10:43 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/79fbb6a3/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/79fbb6a3/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 5aa1953..8de5e07 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -304,7 +304,7 @@ <jedis-client-version>2.8.1</jedis-client-version> <jedis-client-bundle-version>2.8.1_1</jedis-client-bundle-version> <jersey-version>2.11</jersey-version> - <jetty9-version>9.2.15.v20160210</jetty9-version> + <jetty9-version>9.2.17.v20160517</jetty9-version> <jetty-version>${jetty9-version}</jetty-version> <jetty-plugin-version>${jetty-version}</jetty-plugin-version> <jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
