Martin Peřina has uploaded a new change for review. Change subject: core: Add dependency to original sfl4j library ......................................................................
core: Add dependency to original sfl4j library 1) Adds instance type org.ovirt.slf4j module which will just export JBoss reimplementation of slf4j library 2) Adds standalone type org.ovirt.slf4j module which will provide original slf4j-api.jar and slf4j-jdk14.jar so we can use slf4j in standalone tools with java.util.logging backend 3) Changes oVirt modules dependency from org.slf4j to org.ovirt.slf4j 4) Adds dependency to slf4j package Change-Id: I12a3fc298ec3d641e86ea5e766e7e7aa86690b14 Bug-Url: https://bugzilla.redhat.com/1109871 Signed-off-by: Martin Perina <mper...@redhat.com> --- A backend/manager/dependencies/instance/pom.xml A backend/manager/dependencies/instance/src/main/modules/org/ovirt/slf4j/main/module.xml M backend/manager/dependencies/pom.xml A backend/manager/dependencies/standalone/pom.xml A backend/manager/dependencies/standalone/src/main/modules/org/ovirt/slf4j/main/module.xml M backend/manager/modules/aaa/src/main/modules/org/ovirt/engine/core/aaa/main/module.xml M backend/manager/modules/builtin-extensions/src/main/modules/org/ovirt/engine/extensions/builtin/main/module.xml M backend/manager/modules/common/src/main/modules/org/ovirt/engine/core/common/main/module.xml M backend/manager/modules/extensions-manager/src/main/modules/org/ovirt/engine/core/extensions-manager/main/module.xml M backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml M ovirt-engine.spec.in M pom.xml 12 files changed, 139 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/32849/1 diff --git a/backend/manager/dependencies/instance/pom.xml b/backend/manager/dependencies/instance/pom.xml new file mode 100644 index 0000000..58e4128 --- /dev/null +++ b/backend/manager/dependencies/instance/pom.xml @@ -0,0 +1,49 @@ +<project + xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.ovirt.engine.core.manager</groupId> + <artifactId>dependencies</artifactId> + <version>3.6.0-SNAPSHOT</version> + </parent> + + <artifactId>instance-dependencies</artifactId> + <packaging>jar</packaging> + + <name>oVirt Engine instance dependencies</name> + + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.ovirt.engine</groupId> + <artifactId>jboss-modules-maven-plugin</artifactId> + <configuration> + <generateIndex>false</generateIndex> + <category>instance</category> + <modules> + + <!-- We just export slf4j provided by JBoss, so no need to included jars --> + <module> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <moduleName>org.ovirt.slf4j</moduleName> + <artifactProvided>true</artifactProvided> + </module> + </modules> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/backend/manager/dependencies/instance/src/main/modules/org/ovirt/slf4j/main/module.xml b/backend/manager/dependencies/instance/src/main/modules/org/ovirt/slf4j/main/module.xml new file mode 100644 index 0000000..15871d8 --- /dev/null +++ b/backend/manager/dependencies/instance/src/main/modules/org/ovirt/slf4j/main/module.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<module xmlns="urn:jboss:module:1.1" name="org.ovirt.slf4j"> + + <dependencies> + <module name="org.slf4j" export="true"/> + </dependencies> + +</module> diff --git a/backend/manager/dependencies/pom.xml b/backend/manager/dependencies/pom.xml index ceb00eb..3dacc75 100644 --- a/backend/manager/dependencies/pom.xml +++ b/backend/manager/dependencies/pom.xml @@ -19,6 +19,8 @@ <modules> <module>common</module> + <module>instance</module> + <module>standalone</module> </modules> </project> diff --git a/backend/manager/dependencies/standalone/pom.xml b/backend/manager/dependencies/standalone/pom.xml new file mode 100644 index 0000000..8b30c94 --- /dev/null +++ b/backend/manager/dependencies/standalone/pom.xml @@ -0,0 +1,61 @@ +<project + xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.ovirt.engine.core.manager</groupId> + <artifactId>dependencies</artifactId> + <version>3.6.0-SNAPSHOT</version> + </parent> + + <artifactId>standalone-dependencies</artifactId> + <packaging>jar</packaging> + + <name>oVirt Engine instance dependencies</name> + + <!-- We need to put here all the dependencies corresponding to the + .jar files that will be added to the modules archive: --> + + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <version>${slf4j.version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.ovirt.engine</groupId> + <artifactId>jboss-modules-maven-plugin</artifactId> + <configuration> + <generateIndex>false</generateIndex> + <category>standalone</category> + <modules> + <module> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <moduleName>org.ovirt.slf4j</moduleName> + </module> + + <module> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <moduleName>org.ovirt.slf4j</moduleName> + </module> + </modules> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/backend/manager/dependencies/standalone/src/main/modules/org/ovirt/slf4j/main/module.xml b/backend/manager/dependencies/standalone/src/main/modules/org/ovirt/slf4j/main/module.xml new file mode 100644 index 0000000..e9b3176 --- /dev/null +++ b/backend/manager/dependencies/standalone/src/main/modules/org/ovirt/slf4j/main/module.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<module xmlns="urn:jboss:module:1.1" name="org.ovirt.slf4j"> + + <resources> + <resource-root path="slf4j-api.jar"/> + <resource-root path="slf4j-jdk14.jar"/> + </resources> + +</module> diff --git a/backend/manager/modules/aaa/src/main/modules/org/ovirt/engine/core/aaa/main/module.xml b/backend/manager/modules/aaa/src/main/modules/org/ovirt/engine/core/aaa/main/module.xml index 5dce55b6..c44d91e 100644 --- a/backend/manager/modules/aaa/src/main/modules/org/ovirt/engine/core/aaa/main/module.xml +++ b/backend/manager/modules/aaa/src/main/modules/org/ovirt/engine/core/aaa/main/module.xml @@ -16,7 +16,7 @@ <module name="org.ovirt.engine.core.extensions-manager"/> <module name="org.ovirt.engine.core.utils"/> <module name="org.ovirt.engine.api.ovirt-engine-extensions-api"/> - <module name="org.slf4j"/> + <module name="org.ovirt.slf4j"/> </dependencies> </module> diff --git a/backend/manager/modules/builtin-extensions/src/main/modules/org/ovirt/engine/extensions/builtin/main/module.xml b/backend/manager/modules/builtin-extensions/src/main/modules/org/ovirt/engine/extensions/builtin/main/module.xml index 101bedb..63d5973 100644 --- a/backend/manager/modules/builtin-extensions/src/main/modules/org/ovirt/engine/extensions/builtin/main/module.xml +++ b/backend/manager/modules/builtin-extensions/src/main/modules/org/ovirt/engine/extensions/builtin/main/module.xml @@ -18,7 +18,7 @@ <module name="org.ovirt.engine.core.compat"/> <module name="org.ovirt.engine.core.utils"/> <module name="org.ovirt.engine.core.uutils"/> - <module name="org.slf4j"/> + <module name="org.ovirt.slf4j"/> <module name="org.springframework.ldap"/> <module name="sun.jdk"/> </dependencies> diff --git a/backend/manager/modules/common/src/main/modules/org/ovirt/engine/core/common/main/module.xml b/backend/manager/modules/common/src/main/modules/org/ovirt/engine/core/common/main/module.xml index 1483983..ba64925 100644 --- a/backend/manager/modules/common/src/main/modules/org/ovirt/engine/core/common/main/module.xml +++ b/backend/manager/modules/common/src/main/modules/org/ovirt/engine/core/common/main/module.xml @@ -19,7 +19,7 @@ <module name="org.codehaus.jackson.jackson-mapper-asl"/> <module name="org.hibernate.validator"/> <module name="org.ovirt.engine.core.compat"/> - <module name="org.slf4j"/> + <module name="org.ovirt.slf4j"/> </dependencies> </module> diff --git a/backend/manager/modules/extensions-manager/src/main/modules/org/ovirt/engine/core/extensions-manager/main/module.xml b/backend/manager/modules/extensions-manager/src/main/modules/org/ovirt/engine/core/extensions-manager/main/module.xml index 09ea565..f3605ea 100644 --- a/backend/manager/modules/extensions-manager/src/main/modules/org/ovirt/engine/core/extensions-manager/main/module.xml +++ b/backend/manager/modules/extensions-manager/src/main/modules/org/ovirt/engine/core/extensions-manager/main/module.xml @@ -9,7 +9,7 @@ <dependencies> <module name="org.jboss.modules"/> <module name="org.ovirt.engine.api.ovirt-engine-extensions-api"/> - <module name="org.slf4j"/> + <module name="org.ovirt.slf4j"/> </dependencies> </module> diff --git a/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml b/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml index f174cb3..da7916b 100644 --- a/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml +++ b/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml @@ -30,7 +30,7 @@ <module name="org.ovirt.engine.core.uutils"/> <module name="org.postgresql"/> <module name="org.springframework"/> - <module name="org.slf4j"/> + <module name="org.ovirt.slf4j"/> </dependencies> </module> diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index faabaa0..5ef9b22 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -203,6 +203,7 @@ Requires: ovirt-iso-uploader >= 3.6.0 Requires: patternfly1 Requires: postgresql-server >= 8.4.7 +Requires: slf4j >= 1.7.0 Requires: ws-commons-util Requires: yum-plugin-versionlock @@ -707,6 +708,8 @@ common/org/ovirt/otopi/main/otopi.jar otopi/otopi.jar common/org/ovirt/ovirt-host-deploy/main/ovirt-host-deploy.jar ovirt-host-deploy/ovirt-host-deploy.jar common/org/ovirt/vdsm-jsonrpc-java/main/vdsm-jsonrpc-java-client.jar vdsm-jsonrpc-java/vdsm-jsonrpc-java-client.jar +standalone/org/ovirt/slf4j/main/slf4j-api.jar slf4j/slf4j-api.jar +standalone/org/ovirt/slf4j/main/slf4j-jdk14.jar slf4j/slf4j-jdk14.jar %if 0%{?fedora} %if %{fedora} >= 19 common/com/mchange/c3p0/main/c3p0.jar diff --git a/pom.xml b/pom.xml index 39e0159..0a212ce 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,6 @@ <org.ovirt.engine.api.ovirt-engine-extensions-api.version>0.0.0-SNAPSHOT</org.ovirt.engine.api.ovirt-engine-extensions-api.version> <vdsm-jsonrpc-java.version>1.0.6</vdsm-jsonrpc-java.version> <slf4j.version>1.7.5</slf4j.version> - <slf4j-jdk14.version>1.5.6</slf4j-jdk14.version> <gwt.version>2.5.1</gwt.version> <findbugs.version>2.5.2</findbugs.version> <mockito.version>1.9.0</mockito.version> -- To view, visit http://gerrit.ovirt.org/32849 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12a3fc298ec3d641e86ea5e766e7e7aa86690b14 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <mper...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
