diff options
| author | Michael Keppler <Michael.Keppler@gmx.de> | 2018-12-03 17:25:51 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2020-06-01 01:56:33 +0200 |
| commit | 166c85e0cf4087297e14d9192e2c3cfcccf225b2 (patch) | |
| tree | 90b46589a18bfbb9c44ca240a163f5100c717c67 | |
| parent | 8d2d683655e2de17cf465fa46af10e0e56b3aaed (diff) | |
| download | jgit-166c85e0cf4087297e14d9192e2c3cfcccf225b2.tar.gz jgit-166c85e0cf4087297e14d9192e2c3cfcccf225b2.zip | |
Do not include log4j implementation in jgit
As discussed in the bug, jgit should not include a logging
implementation, and instead rely on the product containing jgit to
configure the logging.
We have recently run into the situation, that installing egit in a (non
eclipse.org) RCP application breaks all the logging due to incompatible
logging implementations. Removal of the jgit logging implementation
should fix this.
Following further changes have been done for jgit command line:
* added log4j.properties to binary build of jgit.pgm. That file existed
in the git repository, but was not included in the eclipse binary build.
(maybe it is in the bazel build)
* removed apache.commons.logging package import from jgit.pgm. That
import is not used, and makes the logging even more confusing.
Bug: 514326
Change-Id: I6dc7d1462f0acfca9e2b1ac87e705617179ffdda
Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| -rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml | 15 | ||||
| -rw-r--r-- | org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 1 | ||||
| -rw-r--r-- | org.eclipse.jgit.pgm/build.properties | 3 |
3 files changed, 2 insertions, 17 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 9ffc6c2355..8d2e8c82df 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -58,21 +58,6 @@ unpack="false"/> <plugin - id="org.slf4j.impl.log4j12" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true" - unpack="false"/> - - <plugin - id="org.apache.log4j" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.bouncycastle.bcpg" download-size="0" install-size="0" diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 06728de622..ad7d8e3ef7 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -13,7 +13,6 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.apache.commons.compress.archivers;version="[1.3,2.0)", org.apache.commons.compress.archivers.tar;version="[1.3,2.0)", org.apache.commons.compress.archivers.zip;version="[1.3,2.0)", - org.apache.commons.logging;version="1.1.1", org.eclipse.jetty.continuation;version="[9.4.5,10.0.0)", org.eclipse.jetty.http;version="[9.4.5,10.0.0)", org.eclipse.jetty.io;version="[9.4.5,10.0.0)", diff --git a/org.eclipse.jgit.pgm/build.properties b/org.eclipse.jgit.pgm/build.properties index 6365cbb7ee..4b38114d09 100644 --- a/org.eclipse.jgit.pgm/build.properties +++ b/org.eclipse.jgit.pgm/build.properties @@ -5,4 +5,5 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ plugin.properties,\ - about.html + about.html,\ + resources/log4j.properties |