From ba8bae1a8822b2936d2dbb300a63af250c923fba Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Tue, 14 Dec 2021 12:09:15 +0200
Subject: [PATCH 1/3] Update some maven dependencies

---
 dmp-backend/pom.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml
index 914c54b41..16f74c1c1 100644
--- a/dmp-backend/pom.xml
+++ b/dmp-backend/pom.xml
@@ -41,6 +41,7 @@
         <commons-codec.version>1.9</commons-codec.version>
         <org.junit.version>4.11</org.junit.version>
         <log4j.version>1.2.17</log4j.version>
+        <log4j2.version>2.15.0</log4j2.version>
         <slf4j.version>1.7.12</slf4j.version>
         <!--<jetty.version>11.0.5
         </jetty.version>--> <!-- Adapt this to a version found on http://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-maven-plugin/ -->
@@ -218,10 +219,10 @@
             <version>2.1</version>
         </dependency>
 
-        <dependency>
+        <!--<dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-jpamodelgen</artifactId>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
@@ -229,11 +230,11 @@
             <version>7.6.0</version>
         </dependency>
 
-        <dependency>
+        <!--<dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-to-slf4j</artifactId>
             <version>2.8.2</version>
-        </dependency>
+        </dependency>-->
 
         <!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
         <dependency>

From 6964aa1d472029e8229986e7fa4c301cea6ec404 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Tue, 14 Dec 2021 17:07:00 +0200
Subject: [PATCH 2/3] Fix minor typo

---
 .../src/main/java/eu/eudat/models/rda/mapper/HostRDAMapper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/HostRDAMapper.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/HostRDAMapper.java
index d96aa3ca3..97d57b645 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/HostRDAMapper.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/HostRDAMapper.java
@@ -19,7 +19,7 @@ public class HostRDAMapper {
 	public static Host toRDA(List<JsonNode> nodes, String numbering) {
 		Host rda = new Host();
 		for (JsonNode node: nodes) {
-			String rdaProperty = node.get("rdaProperties").asText();
+			String rdaProperty = node.get("rdaProperty").asText();
 			if (rdaProperty.contains("host")) {
 				int firstDiff = MyStringUtils.getFirstDifference(numbering, node.get("numbering").asText());
 				if (firstDiff == -1 || firstDiff > 2) {

From 42c5dbb3b241a68bdd5f503f52a4df049a105a03 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Tue, 14 Dec 2021 18:05:10 +0200
Subject: [PATCH 3/3] Make distribiution to parse as list

---
 .../main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java
index 67858a14b..307ae19e2 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java
@@ -97,7 +97,7 @@ public class DatasetRDAMapper {
 			}
 			List<JsonNode> distributionNodes = JsonSearcher.findNodes(datasetDescriptionObj, "rdaProperty", "dataset.distribution");
 			if (!distributionNodes.isEmpty()) {
-				rda.setDistribution(Collections.singletonList(DistributionRDAMapper.toRDA(distributionNodes)));
+				rda.setDistribution(DistributionRDAMapper.toRDAList(distributionNodes));
 			}
 			List<JsonNode> keywordNodes = JsonSearcher.findNodes(datasetDescriptionObj, "rdaProperty", "dataset.keyword");
 			if (!keywordNodes.isEmpty()) {