Browse Source

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>
master
Michael Keppler 6 years ago committed by Matthias Sohn
parent
commit
166c85e0cf
  1. 15
      org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
  2. 1
      org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
  3. 3
      org.eclipse.jgit.pgm/build.properties

15
org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml

@ -57,21 +57,6 @@
version="0.0.0"
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"

1
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)",

3
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

Loading…
Cancel
Save