diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2022-01-05 14:54:39 +0100 |
|---|---|---|
| committer | Thomas Wolf <thomas.wolf@paranor.ch> | 2022-01-05 15:59:09 +0100 |
| commit | f7662a756e325570dd82594613db403a60fd44cb (patch) | |
| tree | e239244d4dca5993370216f995dbff432ff6e4bb /org.eclipse.jgit.http.test | |
| parent | fa82b80c9bce223af71e57151ab62b18bf005064 (diff) | |
| parent | 486afbc08d4689105019f77bf1ca0d1a2fc5ab0f (diff) | |
| download | jgit-f7662a756e325570dd82594613db403a60fd44cb.tar.gz jgit-f7662a756e325570dd82594613db403a60fd44cb.zip | |
Merge branch 'stable-5.13' into stable-6.0
* stable-5.13:
Use slf4j-simple instead of log4j for logging
Update orbit to R20211213173813
Change-Id: I219ef3901c1d908b91bf9c8f00431b22686ff7a5
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.properties | 3 |
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 |