Skip to content

Commit 7f02d69

Browse files
committed
Add ignoreCertErrors option
1 parent ae75d61 commit 7f02d69

File tree

3 files changed

+15
-19
lines changed

3 files changed

+15
-19
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'signing'
44

55
group 'com.assertthat.plugins'
66
archivesBaseName = "assertthat-bdd-gradle-tasks"
7-
version '1.7'
7+
version '1.9'
88

99
sourceCompatibility = 1.7
1010
targetCompatibility = 1.7
@@ -17,7 +17,7 @@ repositories {
1717
dependencies {
1818
implementation gradleApi()
1919
implementation localGroovy()
20-
compile group: 'com.assertthat.plugins', name: 'assertthat-bdd-standalone', version: '1.9.5'
20+
compile group: 'com.assertthat.plugins', name: 'assertthat-bdd-standalone', version: '1.9.6'
2121
}
2222

2323
task javadocJar(type: Jar) {
@@ -82,6 +82,6 @@ uploadArchives {
8282

8383
signing {
8484
required { !version.endsWith("SNAPSHOT") && gradle.taskGraph.hasTask("uploadArchives") }
85-
useGpgCmd()
85+
//useGpgCmd()
8686
sign configurations.archives
8787
}

src/main/groovy/FeaturesTask.groovy

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import com.assertthat.plugins.internal.APIUtil
2-
import com.assertthat.plugins.internal.Arguments
3-
import com.assertthat.plugins.internal.FileUtil
1+
import com.assertthat.plugins.standalone.APIUtil
2+
import com.assertthat.plugins.standalone.ArgumentsFeatures
3+
import com.assertthat.plugins.standalone.FileUtil
44
import org.gradle.api.DefaultTask
55
import org.gradle.api.tasks.Input
66
import org.gradle.api.tasks.Optional
@@ -71,23 +71,20 @@ class FeaturesTask extends DefaultTask {
7171

7272
@TaskAction
7373
def downloadFeatures() {
74-
Arguments arguments = new Arguments(accessKey,
74+
ArgumentsFeatures arguments = new ArgumentsFeatures(accessKey,
7575
secretKey,
7676
projectId,
77-
null,
7877
outputFolder,
79-
null,
80-
null,
8178
proxyURI,
8279
proxyUsername,
8380
proxyPassword,
8481
mode,
8582
jql,
8683
tags,
87-
null,
8884
jiraServerUrl,
8985
numbered,
9086
ignoreCertErrors)
87+
9188
APIUtil apiUtil = new APIUtil(arguments.getProjectId(),
9289
arguments.getAccessKey(),
9390
arguments.getSecretKey(),
@@ -96,8 +93,9 @@ class FeaturesTask extends DefaultTask {
9693
arguments.getProxyPassword(),
9794
arguments.getJiraServerUrl(),
9895
arguments.isIgnoreCertErrors())
99-
File inZip = apiUtil.download(new File(arguments.getOutputFolder()),
96+
File inZip = apiUtil.download(new File(project.projectDir.getCanonicalFile().toURI().resolve(arguments.getOutputFolder()).getPath()),
10097
mode, jql, tags, arguments.isNumbered())
98+
10199
File zip = new FileUtil().unpackArchive(inZip, new File(arguments.getOutputFolder()))
102100
zip.delete()
103101
}

src/main/groovy/ReportTask.groovy

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import com.assertthat.plugins.internal.APIUtil
2-
import com.assertthat.plugins.internal.Arguments
3-
import com.assertthat.plugins.internal.FileUtil
1+
import com.assertthat.plugins.standalone.APIUtil
2+
import com.assertthat.plugins.standalone.ArgumentsReport
3+
import com.assertthat.plugins.standalone.FileUtil
44
import org.apache.maven.plugin.MojoExecutionException
55
import org.codehaus.jettison.json.JSONException
66
import org.gradle.api.DefaultTask
@@ -76,23 +76,21 @@ class ReportTask extends DefaultTask {
7676

7777
@TaskAction
7878
def submitReport() {
79-
Arguments arguments = new Arguments(accessKey,
79+
ArgumentsReport arguments = new ArgumentsReport(accessKey,
8080
secretKey,
8181
projectId,
8282
runName,
83-
null,
8483
jsonReportFolder,
8584
jsonReportIncludePattern,
8685
proxyURI,
8786
proxyUsername,
8887
proxyPassword,
89-
null,
9088
jql,
9189
type,
9290
jiraServerUrl,
9391
metadata,
94-
true,
9592
ignoreCertErrors)
93+
9694
APIUtil apiUtil = new APIUtil(arguments.getProjectId(),
9795
arguments.getAccessKey(),
9896
arguments.getSecretKey(),

0 commit comments

Comments
 (0)