merge

Signed-off-by: Juergen Albert <[email protected]>
geckoprojects-org · Feb 13, 2023 · 438236f · 438236f
1 parent 67a6399
commit 438236f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/cnf/central.mvn b/cnf/central.mvn
@@ -158,6 +158,7 @@ com.fasterxml.jackson.core:jackson-databind:2.14.1
 com.fasterxml.jackson.core:jackson-annotations:2.14.1
 com.fasterxml.jackson.dataformat:jackson-dataformat-properties:2.14.1
 com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.1
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.1
 org.eclipse.emfcloud:emfjson-jackson:2.2.0
 de.undercouch:bson4jackson:2.13.1
 org.yaml:snakeyaml:1.33

diff --git a/org.gecko.emf.json/bnd.bnd b/org.gecko.emf.json/bnd.bnd
@@ -9,5 +9,5 @@ Bundle-Description: Extension to save and load EMF objects in/to JSON using Jack
 	com.fasterxml.jackson.core.jackson-databind;version=latest,\
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version=latest,\
 	com.fasterxml.jackson.dataformat.jackson-dataformat-properties;version=latest,\
-	org.eclipse.emfcloud.emfjson-jackson;version=latest
-
+	org.eclipse.emfcloud.emfjson-jackson;version=latest,\
+	com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version=latest
diff --git a/org.gecko.emf.json/src/org/gecko/emf/json/configuration/ConfigurableJsonResource.java b/org.gecko.emf.json/src/org/gecko/emf/json/configuration/ConfigurableJsonResource.java
@@ -48,6 +48,7 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.cfg.ContextAttributes;
 import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
 /**
  * 
@@ -102,7 +103,7 @@ public ObjectMapper configureMapper(Map<?, ?> options) {
 
 		EMFModule module = createInitModule(options, isNew);
 		mapper.registerModule(module);
-
+		mapper.registerModule(new JavaTimeModule());
 		return mapper;
 	}
 

diff --git a/org.gecko.emf.util.bnd.library.workspace/required.bndrun b/org.gecko.emf.util.bnd.library.workspace/required.bndrun
@@ -34,8 +34,8 @@
 	com.fasterxml.jackson.dataformat.jackson-dataformat-properties;version='[2.14.1,2.14.2)',\
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.14.1,2.14.2)',\
 	org.eclipse.emfcloud.emfjson-jackson;version='[2.2.0,2.2.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
-	org.yaml.snakeyaml;version='[1.33.0,1.33.1)'
+	org.yaml.snakeyaml;version='[1.33.0,1.33.1)',\
+	com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.14.1,2.14.2)'
 -runblacklist: \
 	bnd.identity;id='ch.qos.logback.classic',\
 	bnd.identity;id='ch.qos.logback.core'