Martin Peřina has uploaded a new change for review. Change subject: core: Remove log4j remains from project ......................................................................
core: Remove log4j remains from project Removes log4j remains from project. Change-Id: I6276c9558ae03abf17ea8cb4c32ead9cfa5d05d3 Bug-Url: https://bugzilla.redhat.com/1109871 Signed-off-by: Martin Perina <[email protected]> --- M .gitignore M backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml M backend/manager/modules/welcome/pom.xml M backend/manager/modules/welcome/src/main/resources/META-INF/MANIFEST.MF M backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml M ear/src/main/resources/META-INF/MANIFEST.MF M packaging/man/man8/engine-config.8 M pom.xml 8 files changed, 2 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/34186/1 diff --git a/.gitignore b/.gitignore index 013393d..851d1cb 100644 --- a/.gitignore +++ b/.gitignore @@ -51,9 +51,7 @@ packaging/bin/ovirt-engine-log-setup-event.sh packaging/bin/pki-common.sh packaging/conf/notifier-logging.properties -packaging/etc/engine-config/log4j.xml packaging/etc/engine-manage-domains/engine-manage-domains.conf -packaging/etc/engine-manage-domains/log4j.xml packaging/etc/engine.conf.d/README packaging/etc/notifier/notifier.conf.d/README packaging/etc/ovirt-fence-kdump-listener.conf.d/README 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 6ffd05e..1b279be 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 @@ -18,7 +18,6 @@ <module name="org.apache.commons.httpclient"/> <module name="org.apache.commons.lang"/> <module name="org.apache.commons.logging"/> - <module name="org.apache.log4j"/> <module name="org.codehaus.jackson.jackson-core-asl"/> <module name="org.codehaus.jackson.jackson-mapper-asl"/> <module name="org.infinispan"/> diff --git a/backend/manager/modules/welcome/pom.xml b/backend/manager/modules/welcome/pom.xml index 8973b1c..3106908 100644 --- a/backend/manager/modules/welcome/pom.xml +++ b/backend/manager/modules/welcome/pom.xml @@ -55,12 +55,6 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>${engine.groupId}</groupId> <artifactId>branding</artifactId> <version>${engine.version}</version> diff --git a/backend/manager/modules/welcome/src/main/resources/META-INF/MANIFEST.MF b/backend/manager/modules/welcome/src/main/resources/META-INF/MANIFEST.MF index 6ac93cb..c20d3be 100644 --- a/backend/manager/modules/welcome/src/main/resources/META-INF/MANIFEST.MF +++ b/backend/manager/modules/welcome/src/main/resources/META-INF/MANIFEST.MF @@ -1,2 +1,2 @@ Manifest-Version: 1.0 -Dependencies: org.apache.log4j \ No newline at end of file +Dependencies: org.slf4j diff --git a/backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml b/backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml index 8b9d1bf..0e2c535 100644 --- a/backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml +++ b/backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml @@ -13,7 +13,6 @@ <module name="org.apache.commons.configuration"/> <module name="org.apache.commons.lang"/> <module name="org.apache.commons.logging"/> - <module name="org.apache.log4j"/> <module name="org.ovirt.engine.core.common"/> <module name="org.ovirt.engine.core.compat"/> <module name="org.ovirt.engine.core.utils"/> diff --git a/ear/src/main/resources/META-INF/MANIFEST.MF b/ear/src/main/resources/META-INF/MANIFEST.MF index 9cec5c3..3f34aed 100644 --- a/ear/src/main/resources/META-INF/MANIFEST.MF +++ b/ear/src/main/resources/META-INF/MANIFEST.MF @@ -7,7 +7,6 @@ org.apache.commons.httpclient, org.apache.commons.lang, org.apache.httpcomponents, - org.apache.log4j, org.apache.xmlrpc, org.codehaus.jackson.jackson-core-asl, org.codehaus.jackson.jackson-mapper-asl, @@ -28,6 +27,7 @@ org.ovirt.engine.api.ovirt-engine-extensions-api, org.ovirt.vdsm-jsonrpc-java, org.quartz, + org.slf4j, org.springframework, com.woorea.openstack.sdk services, org.yaml.snakeyaml, diff --git a/packaging/man/man8/engine-config.8 b/packaging/man/man8/engine-config.8 index 22e26c0..6023d05 100644 --- a/packaging/man/man8/engine-config.8 +++ b/packaging/man/man8/engine-config.8 @@ -60,11 +60,6 @@ .RS 4 Sets log level, one of FINE, INFO (default), WARNING, SEVERE (case insensitive). .RE -.PP -\fB\-\-log4j\-config\fR=\fIXML_FILE\fR -.RS 4 -Sets log4j.xml file which logging configuration is loaded from. -.RE .SH SETTING PASSWORDS Passwords can be set in interactive mode: diff --git a/pom.xml b/pom.xml index 515b5e4..5fa9d24 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,6 @@ <commons-jxpath.version>1.3</commons-jxpath.version> <jaxb-impl.version>2.2.7</jaxb-impl.version> <jbosssx-bare.version>2.0.4</jbosssx-bare.version> - <log4j.version>1.2.16</log4j.version> <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> @@ -271,11 +270,6 @@ <artifactId>jackson-mapper-asl</artifactId> <version>${jackson-mapper-asl.version}</version> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> - </dependency> <!--GWT dependencies--> <dependency> <groupId>com.google.gwt</groupId> @@ -314,11 +308,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> <version>${slf4j.version}</version> </dependency> <dependency> -- To view, visit http://gerrit.ovirt.org/34186 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6276c9558ae03abf17ea8cb4c32ead9cfa5d05d3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
