Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Honor system proxy settings #510

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Honor system proxy settings #510

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
41b5c7d
Add fallback to JVM system proxy values
Jun 1, 2021
eecc68c
Fix `isHttps` logic
Jun 1, 2021
24b92bf
Implement handling for http.nonProxyHosts property
Jun 2, 2021
76b3c4a
Implement DeployTaskProxyTest
Jun 2, 2021
aaabcf2
Remove unused import
Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix isHttps logic
  • Loading branch information
Drew Hamilton committed Jun 1, 2021
commit eecc68c3c917225478b0c65b81d40aa8c047896e
2 changes: 1 addition & 1 deletion ...extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/task/DeployTask.java
View file
Original file line number Diff line number Diff line change
@@ -206,7 +206,7 @@ private void configureProxy(String contextUrl, ArtifactoryClientConfiguration cl
String proxyHost = proxy.getHost();
Integer proxyPort = proxy.getPort();

boolean isHttps = contextUrl.startsWith("http") && !contextUrl.startsWith("https");
boolean isHttps = !contextUrl.startsWith("http://");

// If no proxyHost is explicitly set, check for the JVM system proxyHost property:
if (StringUtils.isBlank(proxyHost)) {