From e7438d450b907ee969bfddacd19363f26a3fc876 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Thu, 12 Jan 2023 17:56:44 +0100
Subject: [PATCH] Fixed code

---
 .../analyser/SoftwareConceptAnalyser.java     |  14 +-
 .../ZenodoSoftwareVersionPublisher.java       |   3 +-
 .../analyser/SoftwareConceptAnalyserTest.java |   4 +-
 .../resources/exported-gcat-from-scratch.bib  | 160 +++++++++++
 .../resources/exported-gcat-from-scratch.json | 271 ++++++++++++++++++
 src/test/resources/gcat-from-scratch.json     |   2 +-
 6 files changed, 444 insertions(+), 10 deletions(-)
 create mode 100644 src/test/resources/exported-gcat-from-scratch.bib
 create mode 100644 src/test/resources/exported-gcat-from-scratch.json

diff --git a/src/main/java/org/gcube/common/software/analyser/SoftwareConceptAnalyser.java b/src/main/java/org/gcube/common/software/analyser/SoftwareConceptAnalyser.java
index e8a0edd..8f87326 100644
--- a/src/main/java/org/gcube/common/software/analyser/SoftwareConceptAnalyser.java
+++ b/src/main/java/org/gcube/common/software/analyser/SoftwareConceptAnalyser.java
@@ -102,8 +102,9 @@ public class SoftwareConceptAnalyser {
 				}finally {
 					
 					/* Need to export the original file with the DOI and Version DOI */
-					if(softwareVersion.getDOIURL()!=null) {
-						originalVersion.put(SoftwareVersion.DOI_URL_PROPERTY_NAME, softwareVersion.getDOIURL().toString());
+					URL doiURL = softwareVersion.getDOIURL();
+					if(doiURL!=null) {
+						originalVersion.put(SoftwareVersion.DOI_URL_PROPERTY_NAME, doiURL.toString());
 					}
 					
 					if(softwareVersion.getVersionDOIURL()!=null) {
@@ -111,7 +112,6 @@ public class SoftwareConceptAnalyser {
 					}
 					
 					if(newDOI) {
-						URL doiURL = softwareVersion.getDOIURL();
 						softwareConcept.setDOIURL(doiURL);
 						concept.put(SoftwareConcept.DOI_URL_PROPERTY_NAME, doiURL.toString());
 					}
@@ -128,13 +128,15 @@ public class SoftwareConceptAnalyser {
 			ObjectNode toBeExported = objectMapper.createObjectNode();
 			toBeExported.replace(CONCEPT_PROPERTY_NAME, concept);
 			
-			if(concept.has(SoftwareConcept.DOI_URL_PROPERTY_NAME) && concept.get(SoftwareConcept.DOI_URL_PROPERTY_NAME).getNodeType()!=JsonNodeType.NULL) {
+			if(concept.has(SoftwareConcept.DOI_URL_PROPERTY_NAME) 
+					&& concept.get(SoftwareConcept.DOI_URL_PROPERTY_NAME).getNodeType()!=JsonNodeType.NULL) {
 				String conceptDOIURL = concept.get(SoftwareConcept.DOI_URL_PROPERTY_NAME).asText();
 				
 				for(i=0; i<exportingVersions.size(); i++) {
 					ObjectNode v = (ObjectNode) exportingVersions.get(i);
-					if(v.has(SoftwareVersion.DOI_URL_PROPERTY_NAME) && v.get(SoftwareVersion.DOI_URL_PROPERTY_NAME).getNodeType()!=JsonNodeType.NULL){
-						String vDOI = concept.get(SoftwareVersion.DOI_URL_PROPERTY_NAME).asText();
+					if(v.has(SoftwareVersion.DOI_URL_PROPERTY_NAME) 
+							&& v.get(SoftwareVersion.DOI_URL_PROPERTY_NAME).getNodeType()!=JsonNodeType.NULL){
+						String vDOI = v.get(SoftwareVersion.DOI_URL_PROPERTY_NAME).asText();
 						if(conceptDOIURL.compareTo(vDOI)==0) {
 							v.remove(SoftwareVersion.DOI_URL_PROPERTY_NAME);
 						}
diff --git a/src/main/java/org/gcube/common/software/process/publish/zenodo/ZenodoSoftwareVersionPublisher.java b/src/main/java/org/gcube/common/software/process/publish/zenodo/ZenodoSoftwareVersionPublisher.java
index 503e2e8..b2d60ca 100644
--- a/src/main/java/org/gcube/common/software/process/publish/zenodo/ZenodoSoftwareVersionPublisher.java
+++ b/src/main/java/org/gcube/common/software/process/publish/zenodo/ZenodoSoftwareVersionPublisher.java
@@ -171,6 +171,7 @@ public class ZenodoSoftwareVersionPublisher extends SoftwareVersionPublisher {
 			publishToZenodo();
 		}finally {
 			for(File file : files) {
+				logger.info("Going to delete file {}", file.getAbsolutePath());
 				if(!file.exists()) {
 		        	throw new RuntimeException(file.getAbsolutePath() + " does not exist");
 		        }
@@ -188,7 +189,7 @@ public class ZenodoSoftwareVersionPublisher extends SoftwareVersionPublisher {
 						file.deleteOnExit();
 					}
 				}catch (Exception e) {
-					logger.error("Unable to delete {}", file.getAbsolutePath());
+					logger.error("Unable to delete file {}", file.getAbsolutePath());
 				}
 			}
 		}
diff --git a/src/test/java/org/gcube/common/software/analyser/SoftwareConceptAnalyserTest.java b/src/test/java/org/gcube/common/software/analyser/SoftwareConceptAnalyserTest.java
index e1fd387..2344e58 100644
--- a/src/test/java/org/gcube/common/software/analyser/SoftwareConceptAnalyserTest.java
+++ b/src/test/java/org/gcube/common/software/analyser/SoftwareConceptAnalyserTest.java
@@ -10,8 +10,8 @@ import org.junit.Test;
  */
 public class SoftwareConceptAnalyserTest {
 
-	// public static final String FILENAME = "gcat-test-sandbox.json";
-	public static final String FILENAME = "gcat-from-scratch.json";
+	public static final String FILENAME = "gcat-test-sandbox.json";
+	// public static final String FILENAME = "gcat-from-scratch.json";
 	
 	@Test
 	public void testUsingTestFile() throws Exception {
diff --git a/src/test/resources/exported-gcat-from-scratch.bib b/src/test/resources/exported-gcat-from-scratch.bib
new file mode 100644
index 0000000..ad87dd1
--- /dev/null
+++ b/src/test/resources/exported-gcat-from-scratch.bib
@@ -0,0 +1,160 @@
+@software{gcat_1.0.0,
+	author = {{Luca Frosini}},
+	title = {gCube Catalogue (gCat) Service 1.0.0},
+	abstract = {gCube Catalogue (gCat) Service allows to publish items in the gCube Catalogue.},
+	date = {2019-01-10},
+	version = {1.0.0},
+	url = {https://doi.org/10.5072/zenodo.1145770},
+	keywords = {Catalogue, D4Science, gCube}
+}
+
+@software{gcat_1.1.0,
+	author = {{Luca Frosini}},
+	title = {gCube Catalogue (gCat) Service 1.1.0},
+	abstract = {gCube Catalogue (gCat) Service allows to publish items in the gCube Catalogue.},
+	date = {2019-02-26},
+	version = {1.1.0},
+	url = {https://doi.org/10.5072/zenodo.1145771},
+	keywords = {Catalogue, D4Science, gCube}
+}
+
+@software{gcat_1.2.0,
+	author = {{Luca Frosini}},
+	title = {gCube Catalogue (gCat) Service 1.2.0},
+	abstract = {gCube Catalogue (gCat) Service allows to publish items in the gCube Catalogue.},
+	date = {2019-05-20},
+	version = {1.2.0},
+	url = {https://doi.org/10.5072/zenodo.1145772},
+	keywords = {Catalogue, D4Science, gCube}
+}
+
+@software{gcat_1.3.0,
+	author = {{Luca Frosini}},
+	title = {gCube Catalogue (gCat) Service 1.3.0},
+	abstract = {gCube Catalogue (gCat) Service allows to publish items in the gCube Catalogue.},
+	date = {2019-06-27},
+	version = {1.3.0},
+	url = {https://doi.org/10.5072/zenodo.1145773},
+	keywords = {Catalogue, D4Science, gCube}
+}
+
+@software{gcat_1.4.0,
+	author = {{Luca Frosini}},
+	title = {gCube Catalogue (gCat) Service 1.4.0},
+	abstract = {gCube Catalogue (gCat) Service allows to publish items in the gCube Catalogue.},
+	date = {2019-11-20},
+	version = {1.4.0},
+	url = {https://doi.org/10.5072/zenodo.1145774},
+	keywords = {Catalogue, D4Science, gCube}
+}
+
+@software{gcat_1.4.1,
+	author = {{Luca Frosini}},
+	title = {gCube Catalogue (gCat) Service 1.4.1},
+	abstract = {gCube Catalogue (gCat) Service allows to publish items in the gCube Catalogue.},
+	date = {2019-12-20},
+	version = {1.4.1},
+	url = {https://doi.org/10.5072/zenodo.1145775},
+	keywords = {Catalogue, D4Science, gCube}
+}
+
+@software{gcat_1.4.2,
+	author = {{Luca Frosini}},
+	title = {gCube Catalogue (gCat) Service 1.4.2},
+	abstract = {gCube Catalogue (gCat) Service allows to publish items in the gCube Catalogue.},
+	date = {2020-02-14},
+	version = {1.4.2},
+	url = {https://doi.org/10.5072/zenodo.1145776},
+	keywords = {Catalogue, D4Science, gCube}
+}
+
+@software{gcat_1.4.3,
+	author = {{Luca Frosini}},
+	title = {gCube Catalogue (gCat) Service 1.4.3},
+	abstract = {gCube Catalogue (gCat) Service allows to publish items in the gCube Catalogue.},
+	date = {2020-06-16},
+	version = {1.4.3},
+	url = {https://doi.org/10.5072/zenodo.1145779},
+	keywords = {Catalogue, D4Science, gCube}
+}
+
+@software{gcat_1.4.4,
+	author = {{Luca Frosini}},
+	title = {gCube Catalogue (gCat) Service 1.4.4},
+	abstract = {gCube Catalogue (gCat) Service allows to publish items in the gCube Catalogue.},
+	date = {2021-02-24},
+	version = {1.4.4},
+	url = {https://doi.org/10.5072/zenodo.1145780},
+	keywords = {Catalogue, D4Science, gCube}
+}
+
+@software{gcat_1.4.5,
+	author = {{Luca Frosini}},
+	title = {gCube Catalogue (gCat) Service 1.4.5},
+	abstract = {gCube Catalogue (gCat) Service allows to publish items in the gCube Catalogue.},
+	date = {2021-03-31},
+	version = {1.4.5},
+	url = {https://doi.org/10.5072/zenodo.1145781},
+	keywords = {Catalogue, D4Science, gCube}
+}
+
+@software{gcat_2.0.0,
+	author = {{Luca Frosini}},
+	title = {gCube Catalogue (gCat) Service 2.0.0},
+	abstract = {gCube Catalogue (gCat) Service allows to publish items in the gCube Catalogue.},
+	date = {2021-05-04},
+	version = {2.0.0},
+	url = {https://doi.org/10.5072/zenodo.1145783},
+	keywords = {Catalogue, D4Science, gCube}
+}
+
+@software{gcat_2.1.0,
+	author = {{Luca Frosini}},
+	title = {gCube Catalogue (gCat) Service 2.1.0},
+	abstract = {gCube Catalogue (gCat) Service allows to publish items in the gCube Catalogue.},
+	date = {2022-01-27},
+	version = {2.1.0},
+	url = {https://doi.org/10.5072/zenodo.1145784},
+	keywords = {Catalogue, D4Science, gCube}
+}
+
+@software{gcat_2.2.0,
+	author = {{Luca Frosini}},
+	title = {gCube Catalogue (gCat) Service 2.2.0},
+	abstract = {gCube Catalogue (gCat) Service allows to publish items in the gCube Catalogue.},
+	date = {2022-05-12},
+	version = {2.2.0},
+	url = {https://doi.org/10.5072/zenodo.1145785},
+	keywords = {Catalogue, D4Science, gCube}
+}
+
+@software{gcat_2.3.0,
+	author = {{Luca Frosini}},
+	title = {gCube Catalogue (gCat) Service 2.3.0},
+	abstract = {gCube Catalogue (gCat) Service allows to publish items in the gCube Catalogue.},
+	date = {2022-07-22},
+	version = {2.3.0},
+	url = {https://doi.org/10.5072/zenodo.1145786},
+	keywords = {Catalogue, D4Science, gCube}
+}
+
+@software{gcat_2.4.0,
+	author = {{Luca Frosini}},
+	title = {gCube Catalogue (gCat) Service 2.4.0},
+	abstract = {gCube Catalogue (gCat) Service allows to publish items in the gCube Catalogue.},
+	date = {2022-09-16},
+	version = {2.4.0},
+	url = {https://doi.org/10.5072/zenodo.1145787},
+	keywords = {Catalogue, D4Science, gCube}
+}
+
+@software{gcat_2.4.1,
+	author = {{Luca Frosini}},
+	title = {gCube Catalogue (gCat) Service 2.4.1},
+	abstract = {gCube Catalogue (gCat) Service allows to publish items in the gCube Catalogue.},
+	date = {2022-12-07},
+	version = {2.4.1},
+	url = {https://doi.org/10.5072/zenodo.1145788},
+	keywords = {Catalogue, D4Science, gCube}
+}
+
diff --git a/src/test/resources/exported-gcat-from-scratch.json b/src/test/resources/exported-gcat-from-scratch.json
new file mode 100644
index 0000000..16e1335
--- /dev/null
+++ b/src/test/resources/exported-gcat-from-scratch.json
@@ -0,0 +1,271 @@
+{
+  "concept" : {
+    "name" : "gcat",
+    "group" : "data-catalogue",
+    "title" : "gCube Catalogue (gCat) Service {{version}}",
+    "license" : {
+      "id" : "EUPL-1.1",
+      "url" : "https://opensource.org/licenses/EUPL-1.1"
+    },
+    "keywords" : [ "gCube", "Catalogue", "D4Science" ],
+    "description" : "gCube Catalogue (gCat) Service allows to publish items in the gCube Catalogue.",
+    "authors" : [ {
+      "affiliation" : "Istituto di Scienza e Tecnologie dell'Informazione \"A. Faedo\" - CNR, Italy",
+      "name" : "Frosini, Luca",
+      "orcid" : "0000-0003-3183-2291"
+    } ],
+    "files" : [ {
+      "url" : "https://code-repo.d4science.org/gCubeSystem/{{name}}/archive/v{{version}}.zip",
+      "desired_name" : "{{name}}-v{{version}}.zip"
+    }, {
+      "url" : "https://code-repo.d4science.org/gCubeSystem/{{name}}/archive/v{{version}}.tar.gz",
+      "desired_name" : "{{name}}-v{{version}}.tar.gz"
+    }, {
+      "url" : "https://nexus.d4science.org/nexus/service/local/repo_groups/gcube-releases-all/content/org/gcube/{{group}}/{{name}}/{{version}}/{{name}}-{{version}}.war",
+      "desired_name" : "{{name}}-v{{version}}.war"
+    } ],
+    "code_location" : "https://code-repo.d4science.org/gCubeSystem/{{name}}",
+    "doi_url" : "https://doi.org/10.5072/zenodo.1145782",
+    "grants" : [ {
+      "id" : "004260",
+      "name" : "DILIGENT",
+      "url" : "https://cordis.europa.eu/project/id/004260"
+    }, {
+      "id" : "212488",
+      "name" : "D4Science",
+      "url" : "https://cordis.europa.eu/project/id/212488"
+    }, {
+      "id" : "239019",
+      "name" : "D4Science-II",
+      "url" : "https://cordis.europa.eu/project/id/239019"
+    }, {
+      "id" : "283465",
+      "name" : "ENVRI",
+      "url" : "https://cordis.europa.eu/project/id/283465"
+    }, {
+      "id" : "283644",
+      "name" : "iMarine",
+      "url" : "https://cordis.europa.eu/project/id/283644"
+    }, {
+      "id" : "288754",
+      "name" : "EUBrazilOpenBio",
+      "url" : "https://cordis.europa.eu/project/id/288754"
+    }, {
+      "id" : "654024",
+      "name" : "SoBigData",
+      "url" : "https://cordis.europa.eu/project/id/654024"
+    }, {
+      "id" : "654119",
+      "name" : "PARTHENOS",
+      "url" : "https://cordis.europa.eu/project/id/654119"
+    }, {
+      "id" : "654142",
+      "name" : "EGI-Engage",
+      "url" : "https://cordis.europa.eu/project/id/654142"
+    }, {
+      "id" : "654182",
+      "name" : "ENVRI PLUS",
+      "url" : "https://cordis.europa.eu/project/id/654182"
+    }, {
+      "id" : "675680",
+      "name" : "BlueBRIDGE",
+      "url" : "https://cordis.europa.eu/project/id/675680"
+    }, {
+      "id" : "727610",
+      "name" : "PerformFISH",
+      "url" : "https://cordis.europa.eu/project/id/727610"
+    }, {
+      "id" : "731001",
+      "name" : "AGINFRA PLUS",
+      "url" : "https://cordis.europa.eu/project/id/731001"
+    }, {
+      "id" : "818194",
+      "name" : "DESIRA",
+      "url" : "https://cordis.europa.eu/project/id/818194"
+    }, {
+      "id" : "823914",
+      "name" : "ARIADNEplus",
+      "url" : "https://cordis.europa.eu/project/id/823914"
+    }, {
+      "id" : "824091",
+      "name" : "RISIS 2",
+      "url" : "https://cordis.europa.eu/project/id/824091"
+    }, {
+      "id" : "857650",
+      "name" : "EOSC-Pillar",
+      "url" : "https://cordis.europa.eu/project/id/857650"
+    }, {
+      "id" : "862409",
+      "name" : "Blue Cloud",
+      "url" : "https://cordis.europa.eu/project/id/862409"
+    }, {
+      "id" : "871042",
+      "name" : "SoBigData-PlusPlus",
+      "url" : "https://cordis.europa.eu/project/id/871042"
+    } ],
+    "publish" : "ALL",
+    "export" : "ALL"
+  },
+  "versions" : [ {
+    "version" : "1.0.0",
+    "date" : "2019-01-10",
+    "group" : "data-publishing",
+    "files" : [ {
+      "url" : "https://nexus.d4science.org/nexus/service/local/repositories/gcube-snapshots/content/org/gcube/data-publishing/gcat/1.0.0-SNAPSHOT/gcat-1.0.0-20190109.172827-2.war",
+      "desired_name" : "{{name}}-v{{version}}.war"
+    } ],
+    "gcube_release_version" : null,
+    "gcube_release_ticket" : null,
+    "version_doi_url" : "https://doi.org/10.5072/zenodo.1145770",
+    "code_location" : null,
+    "doi_url" : "https://doi.org/10.5072/zenodo.1145769"
+  }, {
+    "version" : "1.1.0",
+    "date" : "2019-02-26",
+    "group" : "data-publishing",
+    "files" : [ {
+      "url" : "https://nexus.d4science.org/nexus/service/local/repo_groups/gcube-releases-all/content/org/gcube/data-publishing/gcat/1.1.0-4.13.1-177071/gcat-1.1.0-4.13.1-177071-src.zip",
+      "desired_name" : "{{name}}-v{{version}}.zip"
+    }, {
+      "url" : "https://nexus.d4science.org/nexus/service/local/repo_groups/gcube-releases-all/content/org/gcube/data-publishing/gcat/1.1.0-4.13.1-177071/gcat-1.1.0-4.13.1-177071.war",
+      "desired_name" : "{{name}}-v{{version}}.war"
+    } ],
+    "gcube_release_version" : "4.13.1",
+    "gcube_release_ticket" : "https://support.d4science.org/issues/12988",
+    "version_doi_url" : "https://doi.org/10.5072/zenodo.1145771",
+    "code_location" : null,
+    "doi_url" : "https://doi.org/10.5072/zenodo.1145769"
+  }, {
+    "version" : "1.2.0",
+    "date" : "2019-05-20",
+    "group" : "data-publishing",
+    "files" : [ {
+      "url" : "https://nexus.d4science.org/nexus/service/local/repositories/gcube-snapshots/content/org/gcube/data-publishing/gcat/1.2.0-SNAPSHOT/gcat-1.2.0-20190520.132914-10.war",
+      "desired_name" : "{{name}}-v{{version}}.war"
+    } ],
+    "gcube_release_version" : null,
+    "gcube_release_ticket" : null,
+    "version_doi_url" : "https://doi.org/10.5072/zenodo.1145772",
+    "code_location" : null,
+    "doi_url" : "https://doi.org/10.5072/zenodo.1145769"
+  }, {
+    "version" : "1.3.0",
+    "date" : "2019-06-27",
+    "group" : "data-publishing",
+    "files" : [ {
+      "url" : "https://nexus.d4science.org/nexus/service/local/repo_groups/gcube-releases-all/content/org/gcube/data-publishing/gcat/1.3.0-4.14.0-179505/gcat-1.3.0-4.14.0-179505-src.zip",
+      "desired_name" : "{{name}}-v{{version}}.zip"
+    }, {
+      "url" : "https://nexus.d4science.org/nexus/service/local/repo_groups/gcube-releases-all/content/org/gcube/data-publishing/gcat/1.3.0-4.14.0-179505/gcat-1.3.0-4.14.0-179505.war",
+      "desired_name" : "{{name}}-v{{version}}.war"
+    } ],
+    "gcube_release_version" : "4.14.0",
+    "gcube_release_ticket" : "https://support.d4science.org/issues/16743",
+    "version_doi_url" : "https://doi.org/10.5072/zenodo.1145773",
+    "code_location" : null,
+    "doi_url" : "https://doi.org/10.5072/zenodo.1145769"
+  }, {
+    "version" : "1.4.0",
+    "date" : "2019-11-20",
+    "group" : "data-publishing",
+    "gcube_release_version" : "4.15.0",
+    "gcube_release_ticket" : "https://support.d4science.org/issues/17294",
+    "version_doi_url" : "https://doi.org/10.5072/zenodo.1145774",
+    "code_location" : "https://code-repo.d4science.org/gCubeSystem/{{name}}/releases/tag/v{{version}}",
+    "doi_url" : "https://doi.org/10.5072/zenodo.1145769"
+  }, {
+    "version" : "1.4.1",
+    "date" : "2019-12-20",
+    "group" : "data-publishing",
+    "gcube_release_version" : "4.18.0",
+    "gcube_release_ticket" : "https://support.d4science.org/issues/18335",
+    "version_doi_url" : "https://doi.org/10.5072/zenodo.1145775",
+    "code_location" : "https://code-repo.d4science.org/gCubeSystem/{{name}}/releases/tag/v{{version}}",
+    "doi_url" : "https://doi.org/10.5072/zenodo.1145769"
+  }, {
+    "version" : "1.4.2",
+    "date" : "2020-02-14",
+    "group" : "data-publishing",
+    "gcube_release_version" : "4.20.0",
+    "gcube_release_ticket" : "https://support.d4science.org/issues/18507",
+    "version_doi_url" : "https://doi.org/10.5072/zenodo.1145776",
+    "code_location" : "https://code-repo.d4science.org/gCubeSystem/{{name}}/releases/tag/v{{version}}",
+    "doi_url" : "https://doi.org/10.5072/zenodo.1145769"
+  }, {
+    "version" : "1.4.3",
+    "date" : "2020-06-16",
+    "group" : "data-publishing",
+    "gcube_release_version" : "4.23.0",
+    "gcube_release_ticket" : "https://support.d4science.org/issues/19322",
+    "version_doi_url" : "https://doi.org/10.5072/zenodo.1145779",
+    "code_location" : "https://code-repo.d4science.org/gCubeSystem/{{name}}/releases/tag/v{{version}}",
+    "doi_url" : "https://doi.org/10.5072/zenodo.1145769"
+  }, {
+    "version" : "1.4.4",
+    "date" : "2021-02-24",
+    "group" : "data-publishing",
+    "gcube_release_version" : "5.0.0",
+    "gcube_release_ticket" : "https://support.d4science.org/issues/20648",
+    "version_doi_url" : "https://doi.org/10.5072/zenodo.1145780",
+    "code_location" : "https://code-repo.d4science.org/gCubeSystem/{{name}}/releases/tag/v{{version}}",
+    "doi_url" : "https://doi.org/10.5072/zenodo.1145769"
+  }, {
+    "version" : "1.4.5",
+    "date" : "2021-03-31",
+    "group" : "data-publishing",
+    "gcube_release_version" : "5.1.0",
+    "gcube_release_ticket" : "https://support.d4science.org/issues/20920",
+    "version_doi_url" : "https://doi.org/10.5072/zenodo.1145781",
+    "code_location" : "https://code-repo.d4science.org/gCubeSystem/{{name}}/releases/tag/v{{version}}",
+    "doi_url" : "https://doi.org/10.5072/zenodo.1145769"
+  }, {
+    "version" : "2.0.0",
+    "date" : "2021-05-04",
+    "gcube_release_version" : "5.2.0",
+    "version_doi_url" : "https://doi.org/10.5072/zenodo.1145783",
+    "code_location" : "https://code-repo.d4science.org/gCubeSystem/{{name}}/releases/tag/v{{version}}"
+  }, {
+    "version" : "2.1.0",
+    "date" : "2022-01-27",
+    "gcube_release_version" : "5.7.0",
+    "gcube_release_ticket" : "https://support.d4science.org/issues/21685/",
+    "version_doi_url" : "https://doi.org/10.5072/zenodo.1145784",
+    "code_location" : "https://code-repo.d4science.org/gCubeSystem/{{name}}/releases/tag/v{{version}}"
+  }, {
+    "version" : "2.2.0",
+    "date" : "2022-05-12",
+    "gcube_release_version" : "5.11.0",
+    "gcube_release_ticket" : "https://support.d4science.org/issues/22943",
+    "version_doi_url" : "https://doi.org/10.5072/zenodo.1145785",
+    "code_location" : "https://code-repo.d4science.org/gCubeSystem/{{name}}/releases/tag/v{{version}}"
+  }, {
+    "version" : "2.3.0",
+    "date" : "2022-07-22",
+    "gcube_release_version" : "5.13.0",
+    "gcube_release_ticket" : "https://support.d4science.org/issues/23374",
+    "version_doi_url" : "https://doi.org/10.5072/zenodo.1145786",
+    "code_location" : "https://code-repo.d4science.org/gCubeSystem/{{name}}/releases/tag/v{{version}}"
+  }, {
+    "version" : "2.4.0",
+    "date" : "2022-09-16",
+    "gcube_release_version" : "5.13.1",
+    "gcube_release_ticket" : "https://support.d4science.org/issues/23650",
+    "version_doi_url" : "https://doi.org/10.5072/zenodo.1145787",
+    "code_location" : "https://code-repo.d4science.org/gCubeSystem/{{name}}/releases/tag/v{{version}}"
+  }, {
+    "version" : "2.4.1",
+    "date" : "2022-12-07",
+    "gcube_release_version" : "5.14.0",
+    "gcube_release_ticket" : "https://support.d4science.org/issues/23885",
+    "version_doi_url" : "https://doi.org/10.5072/zenodo.1145788",
+    "code_location" : "https://code-repo.d4science.org/gCubeSystem/{{name}}/releases/tag/v{{version}}"
+  } ],
+  "publishers" : {
+    "ZenodoSoftwareVersionPublisher" : {
+      "html_description" : "<p><a href=\"https://www.gcube-system.org/\">gCube</a> Catalogue (gCat) Service allows any client to publish items in the gCube Catalogue.</p>\n\n<p><a href=\"https://www.gcube-system.org/\">gCube</a> is an open-source software toolkit used for building and operating Hybrid Data Infrastructures enabling the dynamic deployment of Virtual Research Environments, such as the <a href=\"https://www.d4science.org/\">D4Science Infrastructure</a>, by favouring the realisation of reuse-oriented policies.</p>\n\n<p><a href=\"https://www.gcube-system.org/\">gCube</a> has been used to successfully build and operate infrastructures and virtual research environments for application domains ranging from biodiversity to environmental data management and cultural heritage.</p>\n\n<p><a href=\"https://www.gcube-system.org/\">gCube</a> offers components supporting typical data management workflows including data access, curation, processing, and visualisation on a large set of data typologies ranging from primary biodiversity data to geospatial and tabular data.</p>\n\n<p><a href=\"https://www.d4science.org/\">D4Science</a> is a Hybrid Data Infrastructure combining over 500 software components and integrating data from more than 50 different data providers into a coherent and managed system of hardware, software, and data resources. The D4Science infrastructure drastically reduces the cost of ownership, maintenance, and operation thanks to the exploitation of gCube.</p>\n\n<p>&nbsp;</p>",
+      "html_code_location" : "\n\n<p>The official source code location of this software version is available at:</p>\n\n<p><a href=\"{{code_location}}\">{{code_location}}</a></p>",
+      "skip_grants" : [ "004260" ]
+    }
+  },
+  "exporters" : { }
+}
\ No newline at end of file
diff --git a/src/test/resources/gcat-from-scratch.json b/src/test/resources/gcat-from-scratch.json
index 473f243..6d5e4d8 100644
--- a/src/test/resources/gcat-from-scratch.json
+++ b/src/test/resources/gcat-from-scratch.json
@@ -2,7 +2,7 @@
     "concept": {
         "name": "gcat",
         "group": "data-catalogue",
-        "title": "MYTEST gCube Catalogue (gCat) Service {{version}}",
+        "title": "gCube Catalogue (gCat) Service {{version}}",
         "license": {
             "id": "EUPL-1.1",
             "url": "https://opensource.org/licenses/EUPL-1.1"