diff --git a/dependencies.gradle b/dependencies.gradle index 3c83f40a0..565b9a1ba 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,7 +4,7 @@ ext { assertj: '3.16.1', commonmark: '0.14.0', directoryWatcher: '0.15.0', - emfjsonJackson: '1.3.0', + emfjsonJackson: '2.2.0', guava: '31.1-jre', junit: '5.9.0', jackson: '2.13.4', @@ -58,7 +58,7 @@ ext { watcher: "io.methvin:directory-watcher:${versions.directoryWatcher}" ] emf = [ - jackson: "org.emfjson:emfjson-jackson:${versions.emfjsonJackson}" + jackson: "org.eclipse.emfcloud:emfjson-jackson:${versions.emfjsonJackson}" ] slf4j = [ diff --git a/languages/oas/src/main/kotlin/io/vrap/codegen/languages/oas/model/OasModuleRenderer.kt b/languages/oas/src/main/kotlin/io/vrap/codegen/languages/oas/model/OasModuleRenderer.kt index d43ed86a1..b83b3238d 100644 --- a/languages/oas/src/main/kotlin/io/vrap/codegen/languages/oas/model/OasModuleRenderer.kt +++ b/languages/oas/src/main/kotlin/io/vrap/codegen/languages/oas/model/OasModuleRenderer.kt @@ -19,11 +19,11 @@ import io.vrap.rmf.raml.model.modules.Api import io.vrap.rmf.raml.model.types.* import io.vrap.rmf.raml.model.values.RegExp import org.eclipse.emf.ecore.EObject -import org.emfjson.jackson.annotations.EcoreReferenceInfo -import org.emfjson.jackson.annotations.EcoreTypeInfo -import org.emfjson.jackson.databind.ser.EcoreReferenceSerializer -import org.emfjson.jackson.handlers.BaseURIHandler -import org.emfjson.jackson.module.EMFModule +import org.eclipse.emfcloud.jackson.annotations.EcoreReferenceInfo +import org.eclipse.emfcloud.jackson.annotations.EcoreTypeInfo +import org.eclipse.emfcloud.jackson.databind.ser.EcoreReferenceSerializer +import org.eclipse.emfcloud.jackson.handlers.BaseURIHandler +import org.eclipse.emfcloud.jackson.module.EMFModule import java.io.IOException class OasModuleRenderer constructor(val api: Api, override val vrapTypeProvider: VrapTypeProvider) : EObjectExtensions, FileProducer { diff --git a/languages/ramldoc/src/main/kotlin/io/vrap/codegen/languages/ramldoc/model/RamldocModuleRenderer.kt b/languages/ramldoc/src/main/kotlin/io/vrap/codegen/languages/ramldoc/model/RamldocModuleRenderer.kt index 3b8c1fdfa..cc73dc5af 100644 --- a/languages/ramldoc/src/main/kotlin/io/vrap/codegen/languages/ramldoc/model/RamldocModuleRenderer.kt +++ b/languages/ramldoc/src/main/kotlin/io/vrap/codegen/languages/ramldoc/model/RamldocModuleRenderer.kt @@ -19,11 +19,11 @@ import io.vrap.rmf.raml.model.modules.Api import io.vrap.rmf.raml.model.types.* import io.vrap.rmf.raml.model.values.RegExp import org.eclipse.emf.ecore.EObject -import org.emfjson.jackson.annotations.EcoreReferenceInfo -import org.emfjson.jackson.annotations.EcoreTypeInfo -import org.emfjson.jackson.databind.ser.EcoreReferenceSerializer -import org.emfjson.jackson.handlers.BaseURIHandler -import org.emfjson.jackson.module.EMFModule +import org.eclipse.emfcloud.jackson.annotations.EcoreReferenceInfo +import org.eclipse.emfcloud.jackson.annotations.EcoreTypeInfo +import org.eclipse.emfcloud.jackson.databind.ser.EcoreReferenceSerializer +import org.eclipse.emfcloud.jackson.handlers.BaseURIHandler +import org.eclipse.emfcloud.jackson.module.EMFModule import java.io.IOException class RamldocModuleRenderer constructor(val api: Api, override val vrapTypeProvider: VrapTypeProvider) : EObjectExtensions, FileProducer {