Juan Hernandez has uploaded a new change for review. Change subject: core: Use Jackson 1.9.9 ......................................................................
core: Use Jackson 1.9.9 The version of the OpenStack Java SDK that we use requires at least Jackson 1.9.9 in order to work correctly, otherwise responses received from Neutron aren't parsed correctly. This patch changes the dependencies module so that the correct version of Jackson will be bundled with the engine, overriding the one provided by the application server. Change-Id: I55d02ecd385c86a32a69f154610d4093aea9b74e Bug-Url: https://bugzilla.redhat.com/1064231 Related-To: https://bugzilla.redhat.com/1132259 Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com> --- M backend/manager/dependencies/pom.xml A backend/manager/dependencies/src/main/modules/org/codehaus/jackson/jackson-core-asl/main/module.xml A backend/manager/dependencies/src/main/modules/org/codehaus/jackson/jackson-jaxrs/main/module.xml A backend/manager/dependencies/src/main/modules/org/codehaus/jackson/jackson-mapper-asl/main/module.xml A backend/manager/dependencies/src/main/modules/org/codehaus/jackson/jackson-xc/main/module.xml M backend/manager/modules/restapi/interface/definition/pom.xml M backend/manager/modules/vdsbroker/pom.xml M pom.xml 8 files changed, 141 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/59/33959/1 diff --git a/backend/manager/dependencies/pom.xml b/backend/manager/dependencies/pom.xml index 4d39aa4..518554e 100644 --- a/backend/manager/dependencies/pom.xml +++ b/backend/manager/dependencies/pom.xml @@ -347,6 +347,38 @@ <version>${jaxb-impl.version}</version> </dependency> + <!-- This version of Jackson is needed in order to avoid issues + with the OpenStack Java SDK, refer to the following bug: + + https://bugzilla.redhat.com/1064231 + + Note that won't be fixed by WildFly, as it includes version + 2.x of Jackson, which won't probably be supported by the + OpenStack Java SDK. --> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + <version>${jackson.version}</version> + </dependency> + + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-jaxrs</artifactId> + <version>${jackson.version}</version> + </dependency> + + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + <version>${jackson.version}</version> + </dependency> + + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-xc</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> <groupId>org.antlr</groupId> <artifactId>antlr4-runtime</artifactId> @@ -683,6 +715,30 @@ </module> <module> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + <moduleName>org.codehaus.jackson.jackson-core-asl</moduleName> + </module> + + <module> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-jaxrs</artifactId> + <moduleName>org.codehaus.jackson.jackson-jaxrs</moduleName> + </module> + + <module> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + <moduleName>org.codehaus.jackson.jackson-mapper-asl</moduleName> + </module> + + <module> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-xc</artifactId> + <moduleName>org.codehaus.jackson.jackson-xc</moduleName> + </module> + + <module> <groupId>org.antlr</groupId> <artifactId>antlr4-runtime</artifactId> <moduleName>org.antlr.antlr4-runtime</moduleName> diff --git a/backend/manager/dependencies/src/main/modules/org/codehaus/jackson/jackson-core-asl/main/module.xml b/backend/manager/dependencies/src/main/modules/org/codehaus/jackson/jackson-core-asl/main/module.xml new file mode 100644 index 0000000..4347a73 --- /dev/null +++ b/backend/manager/dependencies/src/main/modules/org/codehaus/jackson/jackson-core-asl/main/module.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- This module is needed because the OpenStack Java SDK requires a newer + version (1.9.9) of Jackson than what is required by the application + server (1.9.2). --> + +<module xmlns="urn:jboss:module:1.1" name="org.codehaus.jackson.jackson-core-asl"> + + <resources> + <resource-root path="jackson-core-asl.jar"/> + </resources> + + <dependencies> + <module name="javax.api"/> + </dependencies> + +</module> diff --git a/backend/manager/dependencies/src/main/modules/org/codehaus/jackson/jackson-jaxrs/main/module.xml b/backend/manager/dependencies/src/main/modules/org/codehaus/jackson/jackson-jaxrs/main/module.xml new file mode 100644 index 0000000..6027d39 --- /dev/null +++ b/backend/manager/dependencies/src/main/modules/org/codehaus/jackson/jackson-jaxrs/main/module.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- This module is needed because the OpenStack Java SDK requires a newer + version (1.9.9) of Jackson than what is required by the application + server (1.9.2). --> + +<module xmlns="urn:jboss:module:1.1" name="org.codehaus.jackson.jackson-jaxrs"> + + <resources> + <resource-root path="jackson-jaxrs.jar"/> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.ws.rs.api"/> + <module name="org.codehaus.jackson.jackson-core-asl"/> + <module name="org.codehaus.jackson.jackson-mapper-asl"/> + <module name="org.codehaus.jackson.jackson-xc"/> + </dependencies> + +</module> diff --git a/backend/manager/dependencies/src/main/modules/org/codehaus/jackson/jackson-mapper-asl/main/module.xml b/backend/manager/dependencies/src/main/modules/org/codehaus/jackson/jackson-mapper-asl/main/module.xml new file mode 100644 index 0000000..6b0229e --- /dev/null +++ b/backend/manager/dependencies/src/main/modules/org/codehaus/jackson/jackson-mapper-asl/main/module.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- This module is needed because the OpenStack Java SDK requires a newer + version (1.9.9) of Jackson than what is required by the application + server (1.9.2). --> + +<module xmlns="urn:jboss:module:1.1" name="org.codehaus.jackson.jackson-mapper-asl"> + + <resources> + <resource-root path="jackson-mapper-asl.jar"/> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="org.codehaus.jackson.jackson-core-asl"/> + <module name="org.joda.time"/> + </dependencies> + +</module> diff --git a/backend/manager/dependencies/src/main/modules/org/codehaus/jackson/jackson-xc/main/module.xml b/backend/manager/dependencies/src/main/modules/org/codehaus/jackson/jackson-xc/main/module.xml new file mode 100644 index 0000000..30a41f3 --- /dev/null +++ b/backend/manager/dependencies/src/main/modules/org/codehaus/jackson/jackson-xc/main/module.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- This module is needed because the OpenStack Java SDK requires a newer + version (1.9.9) of Jackson than what is required by the application + server (1.9.2). --> + +<module xmlns="urn:jboss:module:1.1" name="org.codehaus.jackson.jackson-xc"> + + <resources> + <resource-root path="jackson-xc.jar"/> + </resources> + + <dependencies> + <module name="javax.activation.api"/> + <module name="javax.api"/> + <module name="javax.xml.bind.api"/> + <module name="org.codehaus.jackson.jackson-core-asl"/> + <module name="org.codehaus.jackson.jackson-mapper-asl"/> + </dependencies> + +</module> diff --git a/backend/manager/modules/restapi/interface/definition/pom.xml b/backend/manager/modules/restapi/interface/definition/pom.xml index 517ea60..aa196d2 100644 --- a/backend/manager/modules/restapi/interface/definition/pom.xml +++ b/backend/manager/modules/restapi/interface/definition/pom.xml @@ -23,19 +23,19 @@ <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-jaxrs</artifactId> - <version>${jackson-core-asl.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> - <version>${jackson-core-asl.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-xc</artifactId> - <version>${jackson-core-asl.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> diff --git a/backend/manager/modules/vdsbroker/pom.xml b/backend/manager/modules/vdsbroker/pom.xml index 4ab47c9..54ed329 100644 --- a/backend/manager/modules/vdsbroker/pom.xml +++ b/backend/manager/modules/vdsbroker/pom.xml @@ -68,7 +68,7 @@ <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> - <version>${jackson-core-asl.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> diff --git a/pom.xml b/pom.xml index cb65696..ba57873 100644 --- a/pom.xml +++ b/pom.xml @@ -83,8 +83,7 @@ <javassist.version>3.12.0.GA</javassist.version> <javax.mail.version>1.4.4</javax.mail.version> <hibernate-validator.version>4.2.0.Final</hibernate-validator.version> - <jackson-core-asl.version>1.9.9</jackson-core-asl.version> - <jackson-mapper-asl.version>1.9.9</jackson-mapper-asl.version> + <jackson.version>1.9.9</jackson.version> <commons-configuration.version>1.6</commons-configuration.version> <commons-jxpath.version>1.3</commons-jxpath.version> <jaxb-impl.version>2.2.7</jaxb-impl.version> @@ -265,12 +264,12 @@ <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> - <version>${jackson-core-asl.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> - <version>${jackson-mapper-asl.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>log4j</groupId> -- To view, visit http://gerrit.ovirt.org/33959 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55d02ecd385c86a32a69f154610d4093aea9b74e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
