Juan Hernandez has uploaded a new change for review. Change subject: core: Update the version of slf4j to 1.7.2 ......................................................................
core: Update the version of slf4j to 1.7.2 This is the version used by the application server, so using it means we can avoid loading two versions in memory. Change-Id: I64eaaf8e499ee66049c24aad8189b406a3948491 Signed-off-by: Juan Hernandez <[email protected]> --- M backend/manager/dependencies/pom.xml M backend/manager/dependencies/src/main/modules/org/ovirt/engine/core/dependencies/main/module.xml M backend/manager/modules/bll/pom.xml M backend/manager/modules/common/pom.xml M backend/manager/modules/dal/pom.xml M backend/manager/modules/utils/pom.xml M pom.xml 7 files changed, 12 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/51/16751/1 diff --git a/backend/manager/dependencies/pom.xml b/backend/manager/dependencies/pom.xml index aa8bd7f..f526006 100644 --- a/backend/manager/dependencies/pom.xml +++ b/backend/manager/dependencies/pom.xml @@ -94,12 +94,6 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j-jdk14.version}</version> - </dependency> - - <dependency> <groupId>org.springframework.ldap</groupId> <artifactId>spring-ldap-core</artifactId> <version>${spring.ldap.version}</version> @@ -294,12 +288,6 @@ <module> <groupId>org.quartz-scheduler</groupId> <artifactId>quartz</artifactId> - <moduleName>org.ovirt.engine.core.dependencies</moduleName> - </module> - - <module> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> <moduleName>org.ovirt.engine.core.dependencies</moduleName> </module> diff --git a/backend/manager/dependencies/src/main/modules/org/ovirt/engine/core/dependencies/main/module.xml b/backend/manager/dependencies/src/main/modules/org/ovirt/engine/core/dependencies/main/module.xml index fef9c55..e543db0 100644 --- a/backend/manager/dependencies/src/main/modules/org/ovirt/engine/core/dependencies/main/module.xml +++ b/backend/manager/dependencies/src/main/modules/org/ovirt/engine/core/dependencies/main/module.xml @@ -12,7 +12,6 @@ <resource-root path="otopi.jar"/> <resource-root path="ovirt-host-deploy.jar"/> <resource-root path="quartz.jar"/> - <resource-root path="slf4j-api.jar"/> <resource-root path="spring-aop.jar"/> <resource-root path="spring-asm.jar"/> <resource-root path="spring-beans.jar"/> @@ -35,7 +34,7 @@ <module name="org.apache.commons.codec"/> <module name="org.apache.commons.lang"/> <module name="org.apache.commons.logging"/> - <module name="org.slf4j.impl"/> + <module name="org.slf4j"/> <module name="sun.jdk"/> </dependencies> diff --git a/backend/manager/modules/bll/pom.xml b/backend/manager/modules/bll/pom.xml index ff6038f..6a5dda7 100644 --- a/backend/manager/modules/bll/pom.xml +++ b/backend/manager/modules/bll/pom.xml @@ -119,7 +119,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-jdk14.version}</version> + <version>${slf4j.version}</version> <scope>test</scope> </dependency> diff --git a/backend/manager/modules/common/pom.xml b/backend/manager/modules/common/pom.xml index 071cf5b..e8c5d08 100644 --- a/backend/manager/modules/common/pom.xml +++ b/backend/manager/modules/common/pom.xml @@ -43,8 +43,8 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> - <version>${slf4j-jdk14.version}</version> - <scope>provided</scope> + <version>${slf4j.version}</version> + <scope>test</scope> </dependency> </dependencies> diff --git a/backend/manager/modules/dal/pom.xml b/backend/manager/modules/dal/pom.xml index 4836677..5b19fef 100644 --- a/backend/manager/modules/dal/pom.xml +++ b/backend/manager/modules/dal/pom.xml @@ -64,7 +64,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-jdk14.version}</version> + <version>${slf4j.version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/backend/manager/modules/utils/pom.xml b/backend/manager/modules/utils/pom.xml index 42e39ed..c13934b 100644 --- a/backend/manager/modules/utils/pom.xml +++ b/backend/manager/modules/utils/pom.xml @@ -92,7 +92,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-jdk14.version}</version> + <version>${slf4j.version}</version> <scope>test</scope> </dependency> diff --git a/pom.xml b/pom.xml index 755fac1..4d42253 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ <sshd-core.version>0.7.0</sshd-core.version> <otopi.version>1.0.0</otopi.version> <ovirt-host-deploy.version>1.0.0</ovirt-host-deploy.version> - <slf4j-jdk14.version>1.5.6</slf4j-jdk14.version> + <slf4j.version>1.7.2</slf4j.version> <gwt.version>2.3.0</gwt.version> <findbugs.version>2.5.2</findbugs.version> <mockito.version>1.9.0</mockito.version> @@ -261,6 +261,11 @@ <artifactId>log4j</artifactId> <version>${log4j.version}</version> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </dependency> <!--GWT dependencies--> <dependency> <groupId>com.google.gwt</groupId> -- To view, visit http://gerrit.ovirt.org/16751 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I64eaaf8e499ee66049c24aad8189b406a3948491 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
