diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml
index 32dc92fa8..a3bf6f170 100644
--- a/dmp-backend/pom.xml
+++ b/dmp-backend/pom.xml
@@ -156,6 +156,11 @@
jackson-databind
2.13.1
+
+ com.fasterxml.jackson.module
+ jackson-module-jaxb-annotations
+ 2.13.1
+
diff --git a/dmp-backend/web/pom.xml b/dmp-backend/web/pom.xml
index 6798b6022..a0ede9191 100644
--- a/dmp-backend/web/pom.xml
+++ b/dmp-backend/web/pom.xml
@@ -50,7 +50,6 @@
com.fasterxml.jackson.core
jackson-annotations
- 2.12.3
@@ -71,7 +70,7 @@
com.github.ben-manes.caffeine
caffeine
- 2.9.0
+ 3.0.5
@@ -80,14 +79,14 @@
org.junit.jupiter
junit-jupiter-api
- 5.7.2
+ 5.8.2
test
org.postgresql
postgresql
- 42.2.22
+ 42.3.1
diff --git a/dmp-backend/web/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java b/dmp-backend/web/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java
index a1311f1f1..6a967b439 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java
@@ -7,7 +7,6 @@ import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.*;
import org.springframework.core.env.Environment;
import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.orm.jpa.JpaVendorAdapter;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
@@ -67,7 +66,7 @@ public class DevelDatabaseConfiguration {
private Properties additionalProperties() {
Properties properties = new Properties();
properties.setProperty("hibernate.dialect", "org.hibernate.dialect.PostgreSQL92Dialect");
- properties.setProperty("hibernate.show_sql", "true");
+ properties.setProperty("hibernate.show_sql", "false");
properties.setProperty("hibernate.temp.use_jdbc_metadata_defaults", "false");
return properties;
}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/configurations/JacksonConfiguration.java b/dmp-backend/web/src/main/java/eu/eudat/configurations/JacksonConfiguration.java
deleted file mode 100644
index 266c23ede..000000000
--- a/dmp-backend/web/src/main/java/eu/eudat/configurations/JacksonConfiguration.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package eu.eudat.configurations;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.Module;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import eu.eudat.criteria.entities.Criteria;
-import eu.eudat.criteria.serialzier.CriteriaSerializer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.ArrayList;
-
-@Configuration
-public class JacksonConfiguration {
- @Bean
- public ObjectMapper buildObjectMapper() {
-
- ArrayList modules = new ArrayList<>();
- SimpleModule criteriaSerializerModule = new SimpleModule();
- criteriaSerializerModule.addDeserializer(Criteria.class, new CriteriaSerializer());
- modules.add(criteriaSerializerModule);
-
- return new ObjectMapper()
- .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
- .registerModules(modules);
- }
-}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
index c578db0e5..ae3db7c85 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
@@ -1026,9 +1026,8 @@ public class DatasetManager {
public void getTagsFromProfile(DatasetWizardModel wizardModel, Dataset dataset) throws IOException {
dataset.setProfile(apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(dataset.getProfile().getId()));
wizardModel.setDatasetProfileDefinition(this.getPagedProfile(wizardModel, dataset));
- ObjectMapper mapper = new ObjectMapper();
- String json = mapper.writeValueAsString(wizardModel.getDatasetProfileDefinition());
- JsonNode propertiesJson = mapper.readTree(json);
+ String json = apiContext.getObjectMapper().writeValueAsString(wizardModel.getDatasetProfileDefinition());
+ JsonNode propertiesJson = apiContext.getObjectMapper().readTree(json);
DatasetCriteria criteria = new DatasetCriteria();
criteria.setHasTags(true);
List tags = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().query(criteria).stream().map(eu.eudat.elastic.entities.Dataset::getTags).flatMap(Collection::stream).filter(StreamDistinctBy.distinctByKey(Tag::getId)).collect(Collectors.toList());
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ExternalDatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ExternalDatasetManager.java
index f8f72ce31..f91aaec53 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ExternalDatasetManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ExternalDatasetManager.java
@@ -60,9 +60,8 @@ public class ExternalDatasetManager {
List