From 1bf6056e6c08c9143a25f05e5f13ec0ad0daf1e1 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 9 Nov 2021 16:55:51 +0000 Subject: [PATCH] Perform a deep copy of version objects --- versionnumbering/generate.groovy | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 3c087c4..6e0db11 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -161,11 +161,8 @@ String generate(meta, String sourcerevision, String sourcepath, String basebuild String copyfrom(meta, othermeta) { // Deep copy - def newgitinfo = othermeta.gitinfo.getClass().newInstance([othermeta.gitinfo]) - def newbuildstampinfo = othermeta.buildstampinfo.getClass().newInstance([othermeta.buildstampinfo]) - - meta.gitinfo = newgitinfo - meta.buildstampinfo = newbuildstampinfo + meta.gitinfo.set(othermeta.gitinfo.sourcepath, othermeta.gitinfo.sourcerevision, othermeta.gitinfo.gitrevision, othermeta.gitinfo.remoteurl, othermeta.gitinfo.remoteinfo) + meta.buildstampinfo.set(othermeta.buildstampinfo.buildstampprefix, othermeta.buildstampinfo.revision, othermeta.buildstampinfo.buildstamp) return meta.buildstampinfo.buildstamp }