|
12 | 12 | import org.gradle.api.logging.Logging;
|
13 | 13 | import org.gradle.api.tasks.InputFiles;
|
14 | 14 | import org.gradle.api.tasks.TaskAction;
|
15 |
| -import org.jfrog.build.extractor.ci.BuildInfo; |
16 |
| -import org.jfrog.build.extractor.ci.BuildInfoConfigProperties; |
17 | 15 | import org.jfrog.build.client.ArtifactoryUploadResponse;
|
18 | 16 | import org.jfrog.build.extractor.BuildInfoExtractorUtils;
|
| 17 | +import org.jfrog.build.extractor.ci.BuildInfo; |
| 18 | +import org.jfrog.build.extractor.ci.BuildInfoConfigProperties; |
19 | 19 | import org.jfrog.build.extractor.clientConfiguration.ArtifactoryClientConfiguration;
|
20 | 20 | import org.jfrog.build.extractor.clientConfiguration.IncludeExcludePatterns;
|
21 | 21 | import org.jfrog.build.extractor.clientConfiguration.PatternMatcher;
|
|
24 | 24 | import org.jfrog.build.extractor.clientConfiguration.deploy.DeployableArtifactsUtils;
|
25 | 25 | import org.jfrog.build.extractor.retention.Utils;
|
26 | 26 | import org.jfrog.gradle.plugin.artifactory.ArtifactoryPluginUtil;
|
27 |
| -import org.jfrog.gradle.plugin.artifactory.extractor.GradleArtifactoryClientConfigUpdater; |
28 |
| -import org.jfrog.gradle.plugin.artifactory.extractor.GradleBuildInfoExtractor; |
29 |
| -import org.jfrog.gradle.plugin.artifactory.extractor.GradleClientLogger; |
30 |
| -import org.jfrog.gradle.plugin.artifactory.extractor.GradleDeployDetails; |
31 |
| -import org.jfrog.gradle.plugin.artifactory.extractor.ModuleInfoFileProducer; |
| 27 | +import org.jfrog.gradle.plugin.artifactory.extractor.*; |
32 | 28 |
|
33 | 29 | import javax.annotation.Nonnull;
|
34 | 30 | import java.io.File;
|
35 | 31 | import java.io.IOException;
|
36 |
| -import java.util.ArrayList; |
37 |
| -import java.util.HashMap; |
38 |
| -import java.util.LinkedHashSet; |
39 |
| -import java.util.List; |
40 |
| -import java.util.Map; |
41 |
| -import java.util.Set; |
42 |
| -import java.util.concurrent.CompletableFuture; |
43 |
| -import java.util.concurrent.ConcurrentHashMap; |
44 |
| -import java.util.concurrent.ExecutionException; |
45 |
| -import java.util.concurrent.ExecutorService; |
46 |
| -import java.util.concurrent.Executors; |
| 32 | +import java.util.*; |
| 33 | +import java.util.concurrent.*; |
47 | 34 |
|
48 | 35 | /**
|
49 | 36 | * @author Ruben Perez
|
@@ -195,6 +182,7 @@ private void deployArtifacts(ArtifactoryClientConfiguration accRoot, Map<String,
|
195 | 182 | configureProxy(accRoot, artifactoryManager);
|
196 | 183 | configConnectionTimeout(accRoot, artifactoryManager);
|
197 | 184 | configRetriesParams(accRoot, artifactoryManager);
|
| 185 | + configInsecureTls(accRoot, artifactoryManager); |
198 | 186 | deployArtifacts(artifactoryTask.deployDetails, artifactoryManager, patterns, logPrefix, publisher.getMinChecksumDeploySizeKb());
|
199 | 187 | }
|
200 | 188 | }
|
@@ -243,6 +231,11 @@ private void configRetriesParams(ArtifactoryClientConfiguration clientConf, Arti
|
243 | 231 | }
|
244 | 232 | }
|
245 | 233 |
|
| 234 | + private void configInsecureTls(ArtifactoryClientConfiguration clientConf, ArtifactoryManager artifactoryManager) { |
| 235 | + log.debug("Deploying artifacts using InsecureTls = " + clientConf.getInsecureTls()); |
| 236 | + artifactoryManager.setInsecureTls(clientConf.getInsecureTls()); |
| 237 | + } |
| 238 | + |
246 | 239 | private void exportBuildInfo(BuildInfo buildInfo, File toFile) throws IOException {
|
247 | 240 | log.debug("Exporting generated build info to '{}'", toFile.getAbsolutePath());
|
248 | 241 | BuildInfoExtractorUtils.saveBuildInfoToFile(buildInfo, toFile);
|
@@ -296,7 +289,7 @@ private void deployArtifacts(Set<GradleDeployDetails> allDeployDetails, Artifact
|
296 | 289 | ArtifactoryUploadResponse response = artifactoryManager.upload(deployDetails, logPrefix, minChecksumDeploySizeKb);
|
297 | 290 | detail.getDeployDetails().setDeploySucceeded(true);
|
298 | 291 | detail.getDeployDetails().setSha256(response.getChecksums().getSha256());
|
299 |
| - } catch (IOException e){ |
| 292 | + } catch (IOException e) { |
300 | 293 | detail.getDeployDetails().setDeploySucceeded(false);
|
301 | 294 | detail.getDeployDetails().setSha256("");
|
302 | 295 | throw e;
|
|
0 commit comments