diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlManager.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlManager.java index e1c829d62be..ebb71692170 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlManager.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlManager.java @@ -20,9 +20,11 @@ import org.ovirt.engine.api.model.ObjectFactory; import org.ovirt.engine.api.model.Rsdl; import org.ovirt.engine.api.utils.ApiRootLinksCreator; +import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.Constructor; import org.yaml.snakeyaml.constructor.CustomClassLoaderConstructor; +import org.yaml.snakeyaml.inspector.TagInspector; public class RsdlManager { @@ -112,7 +114,10 @@ private static MetaData loadMetaData() throws IOException { } private static MetaData loadMetaData(InputStream in) throws IOException { - Constructor constructor = new CustomClassLoaderConstructor(Thread.currentThread().getContextClassLoader()); + LoaderOptions loaderOptions = new LoaderOptions(); + TagInspector tagInspector = tag -> tag.getClassName().equals(MetaData.class.getName()); + loaderOptions.setTagInspector(tagInspector); + Constructor constructor = new CustomClassLoaderConstructor(Thread.currentThread().getContextClassLoader(), loaderOptions); MetaData metaData = (MetaData) new Yaml(constructor).load(in); if (metaData == null) { throw new IOException("Can't load metadata from input stream"); diff --git a/i18n/pom.xml b/i18n/pom.xml index df7fc7ac772..7737ee9ffec 100644 --- a/i18n/pom.xml +++ b/i18n/pom.xml @@ -14,7 +14,7 @@ 11 2.5 1.7.22 - 1.33 + 2.4 target/zanata diff --git a/pom.xml b/pom.xml index 1d43d7ec718..a163e974411 100644 --- a/pom.xml +++ b/pom.xml @@ -71,10 +71,10 @@ 0.9.4 1.6 1.3 - 6.0.18.Final + 6.2.5.Final 4.5.13 4.4.14 - 9.4.18.Final + 14.0.34.Final 3.0.10 2.12.7 2.12.7.1 @@ -104,13 +104,13 @@ 5.7.1 3.8.0 3.2.9 - 42.2.27 + 42.7.5 0.9.9 3.9.3.Final 1.7.22 - 1.33 - 5.3.27 - 2.9.2 + 2.4 + 5.3.39 + 2.14.0 2.0.1.Final 1.0.2 3.1.3