summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.http.test
diff options
context:
space:
mode:
authorThomas Wolf <thomas.wolf@paranor.ch>2022-01-05 15:59:54 +0100
committerThomas Wolf <thomas.wolf@paranor.ch>2022-01-05 17:22:50 +0100
commit126839b8b1fc5541a9c531ef0e8a76f8100ac83c (patch)
tree973e14b13eb22e0a915dedb3d4c358ac5288c0ff /org.eclipse.jgit.http.test
parent4d34cdf3459022d0878dfbd099c6f7b7ea03ea73 (diff)
parentf7662a756e325570dd82594613db403a60fd44cb (diff)
downloadjgit-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.http.test')
-rw-r--r--org.eclipse.jgit.http.test/build.properties3
1 files changed, 1 insertions, 2 deletions
diff --git a/org.eclipse.jgit.http.test/build.properties b/org.eclipse.jgit.http.test/build.properties
index a909f1301f..a12a660466 100644
--- a/org.eclipse.jgit.http.test/build.properties
+++ b/org.eclipse.jgit.http.test/build.properties
@@ -4,5 +4,4 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.properties
-additional.bundles = org.apache.log4j,\
- org.slf4j.binding.log4j12
+additional.bundles = org.slf4j.binding.simple