Martin Peřina has uploaded a new change for review. Change subject: core: Adds missing 3rd party dependencies as modules ......................................................................
core: Adds missing 3rd party dependencies as modules Adds these missing 3rd dependencies as JBoss modules: aopalliance:aopalliance:jar:1.0 c3p0:c3p0:jar:0.9.1.1 org.tukaani:xz:jar:1.0 Change-Id: I04070d30a13117fda0a8f297118a5e6a7ea8061b Bug-Url: https://bugzilla.redhat.com/1016716 Signed-off-by: Martin Perina <mper...@redhat.com> --- M backend/manager/dependencies/pom.xml A backend/manager/dependencies/src/main/modules/com/mchange/c3p0/main/module.xml A backend/manager/dependencies/src/main/modules/org/aopalliance/main/module.xml M backend/manager/dependencies/src/main/modules/org/apache/commons/compress/main/module.xml M backend/manager/dependencies/src/main/modules/org/quartz/main/module.xml M backend/manager/dependencies/src/main/modules/org/springframework/main/module.xml A backend/manager/dependencies/src/main/modules/org/tukaani/xz/main/module.xml M ovirt-engine.spec.in M pom.xml 9 files changed, 80 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/21128/1 diff --git a/backend/manager/dependencies/pom.xml b/backend/manager/dependencies/pom.xml index 3447361..3f884af 100644 --- a/backend/manager/dependencies/pom.xml +++ b/backend/manager/dependencies/pom.xml @@ -207,6 +207,24 @@ <version>${openstack-client.version}</version> </dependency> + <dependency> + <groupId>org.tukaani</groupId> + <artifactId>xz</artifactId> + <version>${tukaani-xz.version}</version> + </dependency> + + <dependency> + <groupId>c3p0</groupId> + <artifactId>c3p0</artifactId> + <version>${c3p0.version}</version> + </dependency> + + <dependency> + <groupId>aopalliance</groupId> + <artifactId>aopalliance</artifactId> + <version>${aopalliance.version}</version> + </dependency> + </dependencies> <build> @@ -405,6 +423,24 @@ <moduleName>com.woorea.openstack.sdk</moduleName> </module> + <module> + <groupId>org.tukaani</groupId> + <artifactId>xz</artifactId> + <moduleName>org.tukaani.xz</moduleName> + </module> + + <module> + <groupId>c3p0</groupId> + <artifactId>c3p0</artifactId> + <moduleName>com.mchange.c3p0</moduleName> + </module> + + <module> + <groupId>aopalliance</groupId> + <artifactId>aopalliance</artifactId> + <moduleName>org.aopalliance</moduleName> + </module> + </modules> </configuration> </plugin> diff --git a/backend/manager/dependencies/src/main/modules/com/mchange/c3p0/main/module.xml b/backend/manager/dependencies/src/main/modules/com/mchange/c3p0/main/module.xml new file mode 100644 index 0000000..946b497 --- /dev/null +++ b/backend/manager/dependencies/src/main/modules/com/mchange/c3p0/main/module.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<module xmlns="urn:jboss:module:1.1" name="com.mchange.c3p0"> + + <resources> + <resource-root path="c3p0.jar"/> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="org.slf4j"/> + </dependencies> + +</module> + diff --git a/backend/manager/dependencies/src/main/modules/org/aopalliance/main/module.xml b/backend/manager/dependencies/src/main/modules/org/aopalliance/main/module.xml new file mode 100644 index 0000000..b7c0a64 --- /dev/null +++ b/backend/manager/dependencies/src/main/modules/org/aopalliance/main/module.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<module xmlns="urn:jboss:module:1.1" name="org.aopalliance"> + + <resources> + <resource-root path="aopalliance.jar"/> + </resources> + +</module> diff --git a/backend/manager/dependencies/src/main/modules/org/apache/commons/compress/main/module.xml b/backend/manager/dependencies/src/main/modules/org/apache/commons/compress/main/module.xml index 7c8ee3a..f33b106 100644 --- a/backend/manager/dependencies/src/main/modules/org/apache/commons/compress/main/module.xml +++ b/backend/manager/dependencies/src/main/modules/org/apache/commons/compress/main/module.xml @@ -6,4 +6,7 @@ <resource-root path="commons-compress.jar"/> </resources> + <dependencies> + <module name="org.tukaani.xz"/> + </dependencies> </module> diff --git a/backend/manager/dependencies/src/main/modules/org/quartz/main/module.xml b/backend/manager/dependencies/src/main/modules/org/quartz/main/module.xml index f04783b..84b377b 100644 --- a/backend/manager/dependencies/src/main/modules/org/quartz/main/module.xml +++ b/backend/manager/dependencies/src/main/modules/org/quartz/main/module.xml @@ -9,6 +9,7 @@ <dependencies> <module name="javax.api"/> <module name="org.slf4j"/> + <module name="com.mchange.c3p0"/> </dependencies> </module> diff --git a/backend/manager/dependencies/src/main/modules/org/springframework/main/module.xml b/backend/manager/dependencies/src/main/modules/org/springframework/main/module.xml index efd9a4b..cf3fe4b 100644 --- a/backend/manager/dependencies/src/main/modules/org/springframework/main/module.xml +++ b/backend/manager/dependencies/src/main/modules/org/springframework/main/module.xml @@ -19,6 +19,7 @@ <module name="javax.api"/> <module name="org.apache.commons.lang"/> <module name="org.apache.commons.logging"/> + <module name="org.aopalliance"/> <module name="sun.jdk"/> </dependencies> diff --git a/backend/manager/dependencies/src/main/modules/org/tukaani/xz/main/module.xml b/backend/manager/dependencies/src/main/modules/org/tukaani/xz/main/module.xml new file mode 100644 index 0000000..2d1a1a7 --- /dev/null +++ b/backend/manager/dependencies/src/main/modules/org/tukaani/xz/main/module.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<module xmlns="urn:jboss:module:1.1" name="org.tukaani.xz"> + + <resources> + <resource-root path="xz.jar"/> + </resources> + +</module> diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index 0a5f6bd..8936c7f 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -571,6 +571,8 @@ org/ovirt/ovirt-host-deploy/main/ovirt-host-deploy.jar ovirt-host-deploy/ovirt-host-deploy.jar %if 0%{?fedora} %if %{fedora} >= 19 +com/mchange/c3p0/main/c3p0.jar +org/aopalliance/main/aopalliance.jar org/apache/commons/compress/main/commons-compress.jar org/apache/commons/configuration/main/commons-configuration.jar commons-configuration.jar org/apache/commons/httpclient/main/commons-httpclient.jar @@ -591,6 +593,7 @@ org/springframework/main/spring-jdbc.jar springframework/spring-jdbc.jar org/springframework/main/spring-ldap-core.jar spring-ldap/spring-ldap-core.jar org/springframework/main/spring-tx.jar springframework/spring-tx.jar +org/tukaani/xz/main/xz.jar %endif %endif __EOF__ diff --git a/pom.xml b/pom.xml index 33b7a38..3f1383e 100644 --- a/pom.xml +++ b/pom.xml @@ -91,6 +91,9 @@ <infinispan.version>5.2.5.Final</infinispan.version> <snakeyaml.version>1.8</snakeyaml.version> <ws-commons-util.version>1.0.2</ws-commons-util.version> + <tukaani-xz.version>1.0</tukaani-xz.version> + <c3p0.version>0.9.1.1</c3p0.version> + <aopalliance.version>1.0</aopalliance.version> <!-- OpenStack --> <openstack-client.version>3.0.0</openstack-client.version> -- To view, visit http://gerrit.ovirt.org/21128 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I04070d30a13117fda0a8f297118a5e6a7ea8061b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Martin Peřina <mper...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
