From 6b6a6fb8e7df309cb3b59b3dc01af73e89e8e649 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 20 Dec 2019 16:09:24 +0000 Subject: [PATCH] GIS-1621 - Import for version numbering but don't append to meta data --- import/importer.groovy | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/import/importer.groovy b/import/importer.groovy index fc844fb..6ca3c53 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -36,7 +36,7 @@ class ImportOptions { setappendtoparentmeta(appendtoparentmeta) } - setsource(String source) { + void setsource(String source) { source = source.trim() switch (source) { case 'Jenkins job artefact': @@ -51,43 +51,43 @@ class ImportOptions { } } - setIncrementVersionNumber(boolean incrementversionnumber) { + void setIncrementVersionNumber(boolean incrementversionnumber) { this.incrementversionnumber = incrementversionnumber } - setfilter(String filter) { + void setfilter(String filter) { this.filter = filter.trim() } - setexcludes(String excludes) { + void setexcludes(String excludes) { this.excludes = excludes.trim() } - setfingerprint(boolean fingerprint) { + void setfingerprint(boolean fingerprint) { this.fingerprint = fingerprint } - setnested(boolean nested) { + void setnested(boolean nested) { this.nested = nested } - setappendtoparentmeta(boolean appendtoparentmeta) { + void setappendtoparentmeta(boolean appendtoparentmeta) { this.appendtoparentmeta = appendtoparentmeta } - jenkinsjob(String jenkinsjob, buildnumberorselector) { + void jenkinsjob(String jenkinsjob, buildnumberorselector) { this.jenkinsjob = jenkinsjob.trim() this.buildnumberorselector = buildnumberorselector.trim() setsource('Jenkins job artifact') } - releaserepo(String repo, String revision) { + void releaserepo(String repo, String revision) { this.repo = repo.trim() this.revision = revision.trim() setsource('Release repository') } - source(String source, String jenkinsjob, buildnumberorselector, String repo, String revision) { + void source(String source, String jenkinsjob, buildnumberorselector, String repo, String revision) { jenkinsjob(String jenkinsjob, buildnumberorselector) releaserepo(String repo, String revision) setsource(source)