diff --git a/build.gradle.kts b/build.gradle.kts index a8f141d..c3fc0d7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,17 +35,14 @@ val junitVersion = "5.6.1" val spockVersion = "1.3-groovy-2.4" val groovyVersion = "2.4.19" val slf4jVersion = "1.8.0-beta4" -var jacksonVersion = "2.9.8" +val jsonschemaVersion = "4.36.0" dependencies { implementation("org.codehaus.groovy", "groovy-all", groovyVersion) - // jackson - implementation("com.fasterxml.jackson.module", "jackson-module-jsonSchema", jacksonVersion) - // jsonschema-generator - implementation("com.github.victools", "jsonschema-generator", "4.36.0") - implementation("com.github.victools", "jsonschema-module-jackson", "4.36.0") + implementation("com.github.victools", "jsonschema-generator", jsonschemaVersion) + implementation("com.github.victools", "jsonschema-module-jackson", jsonschemaVersion) // unit-tests testImplementation("org.junit.jupiter", "junit-jupiter-api", junitVersion) diff --git a/src/ru/pulsar/jenkins/library/steps/ResultsTransformer.groovy b/src/ru/pulsar/jenkins/library/steps/ResultsTransformer.groovy index 68c4ee5..0eabf61 100644 --- a/src/ru/pulsar/jenkins/library/steps/ResultsTransformer.groovy +++ b/src/ru/pulsar/jenkins/library/steps/ResultsTransformer.groovy @@ -58,19 +58,12 @@ class ResultsTransformer implements Serializable { if (config.resultsTransformOptions.removeSupport) { def supportLevel = config.resultsTransformOptions.supportLevel steps.cmd("stebi transform --Format $genericIssuesFormat --remove_support $supportLevel --src $srcDir $genericIssueFile") - } + } } else { Logger.println("Конвертация результата EDT в Issues с помощью edt-ripper") - if (config.sourceFormat == SourceFormat.DESIGNER) { - - steps.unstash(DesignerToEdtFormatTransformation.WORKSPACE_ZIP_STASH) - steps.unzip(DesignerToEdtFormatTransformation.WORKSPACE, DesignerToEdtFormatTransformation.WORKSPACE_ZIP) - - } - srcDir = FileUtils.getFilePath("$env.WORKSPACE/$config.srcDir") def projectName = srcDir.getName() diff --git a/src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy b/src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy index 7d80da5..5b9808b 100644 --- a/src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy +++ b/src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy @@ -61,13 +61,6 @@ class SonarScanner implements Serializable { if (config.stageFlags.edtValidate) { steps.unstash(ResultsTransformer.RESULT_STASH) - if (config.sourceFormat == SourceFormat.DESIGNER) { - - steps.unstash(DesignerToEdtFormatTransformation.WORKSPACE_ZIP_STASH) - steps.unzip(DesignerToEdtFormatTransformation.WORKSPACE, DesignerToEdtFormatTransformation.WORKSPACE_ZIP) - - } - if (config.resultsTransformOptions.transformer == ResultsTransformerType.STEBI) { sonarCommand += " -Dsonar.externalIssuesReportPaths=" + ResultsTransformer.RESULT_FILE } else {