motiejus
/
jgit
1
Fork 0
Code Releases Activity

Use slf4j-simple instead of log4j for logging 

JGit uses slf4j-api as logging API.

The libraries
- org.eclipse.jgit.http.test
- org.eclipse.jgit.pgm
- org.eclipse.jgit.ssh.apache.test
- org.eclipse.jgit.test
used the outdated log4j 1.2.15 which is EOL since years.

Since both jgit command line and also the tests don't need sophisticated
logging features replace log4j with the much simpler slf4j-simple log
implementation. The org.slf4j.binding.simple 1.7.30 archive has only
25kB instead of 429kB for log4j 1.2.15

Applications using jgit are free to choose any other log implementation
supporting slf4j API.

Change-Id: I89e85cd3c76e954c3434622510975ce65dc227d4
This commit is contained in:
Matthias Sohn 2021-12-16 18:42:45 +01:00
parent e06eeb0167
commit 486afbc08d
32 changed files with 84 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/BUILD
View File

@ -260,7 +260,6 @@ java_library(
java_library( java_library(
name = "slf4j-simple", name = "slf4j-simple",
testonly = 1,
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
exports = ["@slf4j-simple//jar"], exports = ["@slf4j-simple//jar"],
) )

3
org.eclipse.jgit.http.test/build.properties
View File

@ -4,5 +4,4 @@ output.. = bin/
bin.includes = META-INF/,\ bin.includes = META-INF/,\
.,\ .,\
plugin.properties plugin.properties
additional.bundles = org.apache.log4j,\ additional.bundles = org.slf4j.binding.simple
org.slf4j.binding.log4j12

10
org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml
View File

@ -111,12 +111,6 @@
<bundle id="org.apache.httpcomponents.httpcore.source"> <bundle id="org.apache.httpcomponents.httpcore.source">
<category name="JGit-dependency-bundles"/> <category name="JGit-dependency-bundles"/>
</bundle> </bundle>
<bundle id="org.apache.log4j">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.log4j.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.sshd.osgi"> <bundle id="org.apache.sshd.osgi">
<category name="JGit-dependency-bundles"/> <category name="JGit-dependency-bundles"/>
</bundle> </bundle>
@ -165,10 +159,10 @@
<bundle id="org.slf4j.api.source"> <bundle id="org.slf4j.api.source">
<category name="JGit-dependency-bundles"/> <category name="JGit-dependency-bundles"/>
</bundle> </bundle>
<bundle id="org.slf4j.binding.log4j12"> <bundle id="org.slf4j.binding.simple">
<category name="JGit-dependency-bundles"/> <category name="JGit-dependency-bundles"/>
</bundle> </bundle>
<bundle id="org.slf4j.binding.log4j12.source"> <bundle id="org.slf4j.binding.simple.source">
<category name="JGit-dependency-bundles"/> <category name="JGit-dependency-bundles"/>
</bundle> </bundle>
<bundle id="org.tukaani.xz"> <bundle id="org.tukaani.xz">

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.10" sequenceNumber="1639436778"> <target name="jgit-4.10" sequenceNumber="1639438138">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -53,8 +53,6 @@
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
@ -85,8 +83,8 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.11" sequenceNumber="1639436783"> <target name="jgit-4.11" sequenceNumber="1639438138">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -53,8 +53,6 @@
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
@ -85,8 +83,8 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.12" sequenceNumber="1639436783"> <target name="jgit-4.12" sequenceNumber="1639438138">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -53,8 +53,6 @@
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
@ -85,8 +83,8 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.13" sequenceNumber="1639436783"> <target name="jgit-4.13" sequenceNumber="1639438138">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -53,8 +53,6 @@
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
@ -85,8 +83,8 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.14" sequenceNumber="1639436780"> <target name="jgit-4.14" sequenceNumber="1639438136">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -53,8 +53,6 @@
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
@ -85,8 +83,8 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.15" sequenceNumber="1639436780"> <target name="jgit-4.15" sequenceNumber="1639438136">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -53,8 +53,6 @@
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
@ -85,8 +83,8 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.16" sequenceNumber="1639436783"> <target name="jgit-4.16" sequenceNumber="1639438138">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -53,8 +53,6 @@
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
@ -85,8 +83,8 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.17" sequenceNumber="1639436784"> <target name="jgit-4.17" sequenceNumber="1639438139">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -53,8 +53,6 @@
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
@ -85,8 +83,8 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.18" sequenceNumber="1639436784"> <target name="jgit-4.18" sequenceNumber="1639438139">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -53,8 +53,6 @@
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
@ -85,8 +83,8 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.19-staging" sequenceNumber="1639436780"> <target name="jgit-4.19-staging" sequenceNumber="1639438136">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -53,8 +53,6 @@
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
@ -85,8 +83,8 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.20" sequenceNumber="1639436784"> <target name="jgit-4.20" sequenceNumber="1639438139">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -53,8 +53,6 @@
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
@ -85,8 +83,8 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.21" sequenceNumber="1639436783"> <target name="jgit-4.21" sequenceNumber="1639438138">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -53,8 +53,6 @@
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
@ -85,8 +83,8 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.6" sequenceNumber="1639436794"> <target name="jgit-4.6" sequenceNumber="1639438149">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -53,8 +53,6 @@
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
@ -85,8 +83,8 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.7" sequenceNumber="1639436790"> <target name="jgit-4.7" sequenceNumber="1639438145">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -53,8 +53,6 @@
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
@ -85,8 +83,8 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.8" sequenceNumber="1639436783"> <target name="jgit-4.8" sequenceNumber="1639438139">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -53,8 +53,6 @@
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
@ -85,8 +83,8 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.9" sequenceNumber="1639436784"> <target name="jgit-4.9" sequenceNumber="1639438138">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/> <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@ -53,8 +53,6 @@
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/>
<unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
@ -85,8 +83,8 @@
<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/>
<unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
<unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>

6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20211213173813-2021-12.tpd
View File

@ -30,8 +30,6 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202112131738
org.apache.httpcomponents.httpclient.source [4.5.13.v20210128-2225,4.5.13.v20210128-2225] org.apache.httpcomponents.httpclient.source [4.5.13.v20210128-2225,4.5.13.v20210128-2225]
org.apache.httpcomponents.httpcore [4.4.14.v20210128-2225,4.4.14.v20210128-2225] org.apache.httpcomponents.httpcore [4.4.14.v20210128-2225,4.4.14.v20210128-2225]
org.apache.httpcomponents.httpcore.source [4.4.14.v20210128-2225,4.4.14.v20210128-2225] org.apache.httpcomponents.httpcore.source [4.4.14.v20210128-2225,4.4.14.v20210128-2225]
org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815]
org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815]
org.apache.sshd.osgi [2.7.0.v20210623-0618,2.7.0.v20210623-0618] org.apache.sshd.osgi [2.7.0.v20210623-0618,2.7.0.v20210623-0618]
org.apache.sshd.osgi.source [2.7.0.v20210623-0618,2.7.0.v20210623-0618] org.apache.sshd.osgi.source [2.7.0.v20210623-0618,2.7.0.v20210623-0618]
org.apache.sshd.sftp [2.7.0.v20210623-0618,2.7.0.v20210623-0618] org.apache.sshd.sftp [2.7.0.v20210623-0618,2.7.0.v20210623-0618]
@ -62,8 +60,8 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202112131738
org.objenesis.source [2.6.0.v20180420-1519,2.6.0.v20180420-1519] org.objenesis.source [2.6.0.v20180420-1519,2.6.0.v20180420-1519]
org.slf4j.api [1.7.30.v20200204-2150,1.7.30.v20200204-2150] org.slf4j.api [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
org.slf4j.api.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150] org.slf4j.api.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
org.slf4j.binding.log4j12 [1.7.30.v20201108-2042,1.7.30.v20201108-2042] org.slf4j.binding.simple [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
org.slf4j.binding.log4j12.source [1.7.30.v20201108-2042,1.7.30.v20201108-2042] org.slf4j.binding.simple.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
org.tukaani.xz [1.9.0.v20210624-1259,1.9.0.v20210624-1259] org.tukaani.xz [1.9.0.v20210624-1259,1.9.0.v20210624-1259]
org.tukaani.xz.source [1.9.0.v20210624-1259,1.9.0.v20210624-1259] org.tukaani.xz.source [1.9.0.v20210624-1259,1.9.0.v20210624-1259]
} }

2
org.eclipse.jgit.pgm/build.properties
View File

@ -6,4 +6,4 @@ bin.includes = META-INF/,\
.,\ .,\
plugin.properties,\ plugin.properties,\
about.html,\ about.html,\
resources/log4j.properties resources/simplelogger.properties

7
org.eclipse.jgit.pgm/pom.xml
View File

@ -97,12 +97,7 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-simple</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>

6
org.eclipse.jgit.pgm/resources/log4j.properties
View File

@ -1,6 +0,0 @@
log4j.rootLogger=WARN, stderr
log4j.appender.stderr=org.apache.log4j.ConsoleAppender
log4j.appender.stderr.Target=System.err
log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
log4j.appender.stderr.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n

6
org.eclipse.jgit.pgm/resources/simplelogger.properties Normal file
View File

@ -0,0 +1,6 @@
org.slf4j.simpleLogger.defaultLogLevel=warn
org.slf4j.simpleLogger.logFile=System.err
org.slf4j.simpleLogger.showDateTime=true
org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss
org.slf4j.simpleLogger.showThreadName=true
org.slf4j.simpleLogger.showLogName=true

3
org.eclipse.jgit.ssh.apache.test/build.properties
View File

@ -3,5 +3,4 @@ output.. = bin/
bin.includes = META-INF/,\ bin.includes = META-INF/,\
.,\ .,\
plugin.properties plugin.properties
additional.bundles = org.apache.log4j,\ additional.bundles = org.slf4j.binding.simple
org.slf4j.binding.log4j12

3
org.eclipse.jgit.test/build.properties
View File

@ -7,5 +7,4 @@ bin.includes = META-INF/,\
plugin.properties,\ plugin.properties,\
bin-tst/,\ bin-tst/,\
bin/ bin/
additional.bundles = org.apache.log4j,\ additional.bundles = org.slf4j.binding.simple
org.slf4j.binding.log4j12

3
org.eclipse.jgit.test/tests.bzl
View File

@ -36,7 +36,7 @@ def tests(tests):
] ]
if src.endswith("SecurityManagerMissingPermissionsTest.java"): if src.endswith("SecurityManagerMissingPermissionsTest.java"):
additional_deps = [ additional_deps = [
"//lib:log4j", "//lib:slf4j-simple",
] ]
if src.endswith("JDKHttpConnectionTest.java"): if src.endswith("JDKHttpConnectionTest.java"):
additional_deps = [ additional_deps = [
@ -68,6 +68,7 @@ def tests(tests):
"//lib:javaewah", "//lib:javaewah",
"//lib:junit", "//lib:junit",
"//lib:slf4j-api", "//lib:slf4j-api",
"//lib:slf4j-simple",
"//org.eclipse.jgit:jgit", "//org.eclipse.jgit:jgit",
"//org.eclipse.jgit.junit:junit", "//org.eclipse.jgit.junit:junit",
"//org.eclipse.jgit.lfs:jgit-lfs", "//org.eclipse.jgit.lfs:jgit-lfs",

14
org.eclipse.jgit.test/tst-rsrc/log4j.properties
View File

@ -1,14 +0,0 @@
# Root logger option
log4j.rootLogger=INFO, stdout
# Direct log messages to stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target=System.out
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
log4j.appender.fileLogger.bufferedIO = true
log4j.appender.fileLogger.bufferSize = 4096
#log4j.logger.org.eclipse.jgit.util.FS = DEBUG
#log4j.logger.org.eclipse.jgit.internal.storage.file.FileSnapshot = DEBUG

12
org.eclipse.jgit.test/tst-rsrc/simplelogger.properties
View File

@ -1,9 +1,9 @@
org.slf4j.simpleLogger.logFile = System.err org.slf4j.simpleLogger.defaultLogLevel=info
org.slf4j.simpleLogger.cacheOutputStream = true org.slf4j.simpleLogger.logFile=System.err
org.slf4j.simpleLogger.defaultLogLevel = info org.slf4j.simpleLogger.showDateTime=true
org.slf4j.simpleLogger.showDateTime = true org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss
org.slf4j.simpleLogger.dateTimeFormat = HH:mm:ss.SSSXXX org.slf4j.simpleLogger.showThreadName=true
org.slf4j.simpleLogger.showThreadName = true org.slf4j.simpleLogger.showLogName=true
#org.slf4j.simpleLogger.log.org.eclipse.jgit.util.FS = debug #org.slf4j.simpleLogger.log.org.eclipse.jgit.util.FS = debug
#org.slf4j.simpleLogger.log.org.eclipse.jgit.internal.storage.file.FileSnapshot = debug #org.slf4j.simpleLogger.log.org.eclipse.jgit.internal.storage.file.FileSnapshot = debug

28
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/SecurityManagerMissingPermissionsTest.java
View File

@ -13,17 +13,15 @@
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.StringWriter; import java.io.PrintStream;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.security.Policy; import java.security.Policy;
import java.util.Collections; import java.util.Collections;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
import org.apache.log4j.WriterAppender;
import org.eclipse.jgit.junit.RepositoryTestCase; import org.eclipse.jgit.junit.RepositoryTestCase;
import org.eclipse.jgit.util.FileUtils; import org.eclipse.jgit.util.FileUtils;
import org.junit.After; import org.junit.After;
@ -38,25 +36,21 @@ public class SecurityManagerMissingPermissionsTest extends RepositoryTestCase {
/** /**
* Collects all logging sent to the logging system. * Collects all logging sent to the logging system.
*/ */
private final StringWriter errorOutputWriter = new StringWriter(); private final ByteArrayOutputStream errorOutput = new ByteArrayOutputStream();
/**
* Appender to intercept all logging sent to the logging system.
*/
private WriterAppender appender;
private SecurityManager originalSecurityManager; private SecurityManager originalSecurityManager;
private PrintStream defaultErrorOutput;
@Override @Override
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
originalSecurityManager = System.getSecurityManager(); originalSecurityManager = System.getSecurityManager();
appender = new WriterAppender( // slf4j-simple logs to System.err, redirect it to enable asserting
new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN), // logged errors
errorOutputWriter); defaultErrorOutput = System.err;
System.setErr(new PrintStream(errorOutput));
Logger.getRootLogger().addAppender(appender);
refreshPolicyAllPermission(Policy.getPolicy()); refreshPolicyAllPermission(Policy.getPolicy());
System.setSecurityManager(new SecurityManager()); System.setSecurityManager(new SecurityManager());
@ -85,14 +79,14 @@ public void testCreateNewRepos_MissingPermissions() throws Exception {
addRepoToClose(git.getRepository()); addRepoToClose(git.getRepository());
assertEquals("", errorOutputWriter.toString()); assertEquals("", errorOutput.toString());
} }
@Override @Override
@After @After
public void tearDown() throws Exception { public void tearDown() throws Exception {
System.setSecurityManager(originalSecurityManager); System.setSecurityManager(originalSecurityManager);
Logger.getRootLogger().removeAppender(appender); System.setErr(defaultErrorOutput);
super.tearDown(); super.tearDown();
} }

2
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/WalkEncryptionTest.java
View File

@ -99,7 +99,7 @@
public class WalkEncryptionTest { public class WalkEncryptionTest {
/** /**
* Logger setup: ${project_loc}/tst-rsrc/log4j.properties * Logger setup: ${project_loc}/tst-rsrc/simplelogger.properties
*/ */
static final Logger logger = LoggerFactory.getLogger(WalkEncryptionTest.class); static final Logger logger = LoggerFactory.getLogger(WalkEncryptionTest.class);

27
pom.xml
View File

@ -167,7 +167,6 @@
<httpclient-version>4.5.13</httpclient-version> <httpclient-version>4.5.13</httpclient-version>
<httpcore-version>4.4.14</httpcore-version> <httpcore-version>4.4.14</httpcore-version>
<slf4j-version>1.7.30</slf4j-version> <slf4j-version>1.7.30</slf4j-version>
<log4j-version>1.2.15</log4j-version>
<maven-javadoc-plugin-version>3.3.1</maven-javadoc-plugin-version> <maven-javadoc-plugin-version>3.3.1</maven-javadoc-plugin-version>
<tycho-extras-version>1.7.0</tycho-extras-version> <tycho-extras-version>1.7.0</tycho-extras-version>
<gson-version>2.8.8</gson-version> <gson-version>2.8.8</gson-version>
@ -743,34 +742,10 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-simple</artifactId>
<version>${slf4j-version}</version> <version>${slf4j-version}</version>
</dependency> </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j-version}</version>
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</exclusion>
<exclusion>
<groupId>javax.jms</groupId>
<artifactId>jms</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jdmk</groupId>
<artifactId>jmxtools</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jmx</groupId>
<artifactId>jmxri</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>