diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2022-01-05 15:59:54 +0100 |
|---|---|---|
| committer | Thomas Wolf <thomas.wolf@paranor.ch> | 2022-01-05 17:22:50 +0100 |
| commit | 126839b8b1fc5541a9c531ef0e8a76f8100ac83c (patch) | |
| tree | 973e14b13eb22e0a915dedb3d4c358ac5288c0ff /org.eclipse.jgit.packaging/org.eclipse.jgit.repository | |
| parent | 4d34cdf3459022d0878dfbd099c6f7b7ea03ea73 (diff) | |
| parent | f7662a756e325570dd82594613db403a60fd44cb (diff) | |
| download | jgit-126839b8b1fc5541a9c531ef0e8a76f8100ac83c.tar.gz jgit-126839b8b1fc5541a9c531ef0e8a76f8100ac83c.zip | |
Merge branch 'stable-6.0'
* stable-6.0:
Use slf4j-simple instead of log4j for logging
Update orbit to R20211213173813
Change-Id: I746b7fb71571020ce49f7b50fd675c9864327719
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.jgit.packaging/org.eclipse.jgit.repository')
| -rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml index af9523fd4f..7fa2b837e7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml @@ -165,12 +165,6 @@ <bundle id="org.apache.httpcomponents.httpcore.source"> <category name="JGit-dependency-bundles"/> </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"> <category name="JGit-dependency-bundles"/> </bundle> @@ -219,10 +213,10 @@ <bundle id="org.slf4j.api.source"> <category name="JGit-dependency-bundles"/> </bundle> - <bundle id="org.slf4j.binding.log4j12"> + <bundle id="org.slf4j.binding.simple"> <category name="JGit-dependency-bundles"/> </bundle> - <bundle id="org.slf4j.binding.log4j12.source"> + <bundle id="org.slf4j.binding.simple.source"> <category name="JGit-dependency-bundles"/> </bundle> <bundle id="org.tukaani.xz"> |