diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml
index 4bd8416a8..db2246392 100644
--- a/dmp-backend/pom.xml
+++ b/dmp-backend/pom.xml
@@ -17,7 +17,9 @@
4.2.3.RELEASE
1.19.1
7.0.35
- 5.2.9.Final
+
+ 5.2.11.Final
+
1.9
4.11
1.2.17
diff --git a/dmp-backend/src/main/java/dao/entities/DMPDao.java b/dmp-backend/src/main/java/dao/entities/DMPDao.java
index 018690b8d..45012ea39 100644
--- a/dmp-backend/src/main/java/dao/entities/DMPDao.java
+++ b/dmp-backend/src/main/java/dao/entities/DMPDao.java
@@ -14,6 +14,7 @@ public interface DMPDao extends Dao {
List listAllIDsLabels();
+// public boolean createFromForm();
}
\ No newline at end of file
diff --git a/dmp-backend/src/main/java/dao/entities/DMPDaoImpl.java b/dmp-backend/src/main/java/dao/entities/DMPDaoImpl.java
index d733194d9..d00fa59f4 100644
--- a/dmp-backend/src/main/java/dao/entities/DMPDaoImpl.java
+++ b/dmp-backend/src/main/java/dao/entities/DMPDaoImpl.java
@@ -1,6 +1,7 @@
package dao.entities;
import java.util.List;
+import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors;
@@ -38,4 +39,10 @@ public class DMPDaoImpl extends JpaDao implements DMPDao {
.collect(Collectors.toList());
}
+// @Override
+// public boolean createFromForm(Map keyVals) {
+// String query = "insert into DMP () values"
+// return false;
+// }
+
}
diff --git a/dmp-backend/src/main/java/dao/entities/DatasetDao.java b/dmp-backend/src/main/java/dao/entities/DatasetDao.java
index b53f1a057..3307aecda 100644
--- a/dmp-backend/src/main/java/dao/entities/DatasetDao.java
+++ b/dmp-backend/src/main/java/dao/entities/DatasetDao.java
@@ -13,5 +13,7 @@ public interface DatasetDao extends Dao {
public List listAllIDs();
List listAllIDsLabels();
+
+ int assignDMPToDataset(String datasetID, String dmpID);
}
\ No newline at end of file
diff --git a/dmp-backend/src/main/java/dao/entities/DatasetDaoImpl.java b/dmp-backend/src/main/java/dao/entities/DatasetDaoImpl.java
index 3fcde77d6..1e903dc27 100644
--- a/dmp-backend/src/main/java/dao/entities/DatasetDaoImpl.java
+++ b/dmp-backend/src/main/java/dao/entities/DatasetDaoImpl.java
@@ -4,11 +4,10 @@ import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
+import javax.persistence.Query;
import javax.persistence.TypedQuery;
import javax.transaction.Transactional;
-import org.hibernate.query.Query;
-
import dao.JpaDao;
import entities.Dataset;
import entities.responses.IDLabelPair;
@@ -32,11 +31,22 @@ public class DatasetDaoImpl extends JpaDao implements DatasetDao
public List listAllIDsLabels() {
String queryString = "SELECT dataset.id, dataset.label FROM Dataset dataset";
Query query = (Query) entityManager.createQuery(queryString);
- List