From df492c865a00124636569d39180756641abc0ff4 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 10 Dec 2021 17:31:21 +0000 Subject: [PATCH] Start writing format version into meta data file --- meta/folder.groovy | 53 ++++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 9b4452a..806b6ff 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -20,9 +20,10 @@ abstract class GISJsonSerialised implements Serializable { } class ProductInfo extends GISJsonSerialised { - String productname - String subcomponentname - String variant + private String format + private String productname + private String subcomponentname + private String variant ProductInfo(script, productname = "", subcomponentname = "", variant = "") { super(script) @@ -96,6 +97,7 @@ class ProductInfo extends GISJsonSerialised { } class GitInfo extends GISJsonSerialised { + private String format private String sourcepath private String sourcerevision private String gitrevision @@ -160,6 +162,7 @@ class GitInfo extends GISJsonSerialised { } class JenkinsBuildParameter extends GISJsonSerialised { + private String format private String name private String valuetype private String value @@ -197,12 +200,13 @@ class JenkinsBuildParameter extends GISJsonSerialised { } class JenkinsBuildInfo extends GISJsonSerialised { - String buildjobname - int buildnumber + private String format + private String buildjobname + private int buildnumber private String buildmachine private String builddate - ArrayList parameters - boolean isfullbuild + private ArrayList parameters + private boolean isfullbuild JenkinsBuildInfo(script, String buildjobname = "", int buildnumber = 0, String buildmachine = "", String builddate = "", boolean isfullbuild = true) { super(script) @@ -277,9 +281,10 @@ class JenkinsBuildInfo extends GISJsonSerialised { } class BuildStampInfo extends GISJsonSerialised { - String buildstampprefix - int revision - String buildstamp + private String format + private String buildstampprefix + private int revision + private String buildstamp BuildStampInfo(script, buildstampprefix = "0.30000.0.", revision = 0, buildstamp = "0.30000.0.0") { super(script) @@ -364,9 +369,10 @@ class BuildStampInfo extends GISJsonSerialised { } class ReleaseInfo extends GISJsonSerialised { - String releaserepoURL - ArrayList releaseitems - boolean released + private String format + private String releaserepoURL + private ArrayList releaseitems + private boolean released ReleaseInfo(script, String releaserepoURL = "", boolean released = false) { super(script) @@ -419,6 +425,7 @@ class ReleaseInfo extends GISJsonSerialised { } class ConfigurationInfo extends GISJsonSerialised { + private String format private String configurationname private String configurationURL private String configurationversion @@ -478,6 +485,7 @@ class ChecksumPair extends GISJsonSerialised { } class ChecksumSet extends GISJsonSerialised { + private String format private String artifactpath private ArrayList checksumpairs @@ -524,6 +532,7 @@ class ChecksumSet extends GISJsonSerialised { } class ChecksumInfo extends GISJsonSerialised { + private String format private ArrayList checksumsets ChecksumInfo(script) { @@ -566,6 +575,7 @@ class ChecksumInfo extends GISJsonSerialised { } class PublishableInfo extends GISJsonSerialised { + private String format private String filepath PublishableInfo(script, String filepath = "") { @@ -594,8 +604,9 @@ class MetaInfo extends GISJsonSerialised { private static String METAARTIFACTS = "${METAFOLDERNAME}/**" class RelatedMetaInfo extends GISJsonSerialised { - String offsetpath - MetaInfo meta + private String format + private String offsetpath + private MetaInfo meta RelatedMetaInfo(script, offsetpath = "", MetaInfo meta = null) { super(script) @@ -622,12 +633,12 @@ class MetaInfo extends GISJsonSerialised { } private String format = '0.1' - ProductInfo productinfo - GitInfo gitinfo - JenkinsBuildInfo jenkinsbuildinfo - BuildStampInfo buildstampinfo - ReleaseInfo releaseinfo - ChecksumInfo checksuminfo + private ProductInfo productinfo + private GitInfo gitinfo + private JenkinsBuildInfo jenkinsbuildinfo + private BuildStampInfo buildstampinfo + private ReleaseInfo releaseinfo + private ChecksumInfo checksuminfo private ArrayList configurationinfo private ArrayList publishableinfo private LinkedHashMap custominfo