From ff20da9b892cd1be860cd131ac36dc54000a92d3 Mon Sep 17 00:00:00 2001
From: Matthias Sohn <matthias.sohn@sap.com>
Date: Sun, 10 Dec 2023 23:55:40 +0100
Subject: [PATCH] Enable using slf4j 2.x

Eclipse platform moved to sfl4j 2.x. Hence relax version constraint so
that both 1.7 and 2.x are allowed.

Bug: egit-5
Change-Id: Ie0b00310d8f3f2553457c8668a38978a67b8febe
---
 org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF     | 2 +-
 org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +-
 org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF  | 2 +-
 org.eclipse.jgit.junit/META-INF/MANIFEST.MF      | 2 +-
 org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +-
 org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +-
 org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF   | 2 +-
 org.eclipse.jgit.test/META-INF/MANIFEST.MF       | 2 +-
 org.eclipse.jgit/META-INF/MANIFEST.MF            | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
index 879a34bb8f..fe2b885eeb 100644
--- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
@@ -31,7 +31,7 @@ Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)",
  org.bouncycastle.util.io;version="[1.69.0,2.0.0)",
  org.eclipse.jgit.annotations;version="[6.9.0,6.10.0)",
  org.eclipse.jgit.api.errors;version="[6.9.0,6.10.0)",
- org.slf4j;version="[1.7.0,2.0.0)"
+ org.slf4j;version="[1.7.0,3.0.0)"
 Export-Package: org.eclipse.jgit.gpg.bc;version="6.9.0",
  org.eclipse.jgit.gpg.bc.internal;version="6.9.0";x-friends:="org.eclipse.jgit.gpg.bc.test",
  org.eclipse.jgit.gpg.bc.internal.keys;version="6.9.0";x-friends:="org.eclipse.jgit.gpg.bc.test"
diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index a55dfb510f..e810b7add9 100644
--- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
@@ -30,7 +30,7 @@ Import-Package: javax.servlet;version="[2.5.0,5.0.0)",
  org.eclipse.jgit.transport;version="[6.9.0,6.10.0)",
  org.eclipse.jgit.transport.resolver;version="[6.9.0,6.10.0)",
  org.junit;version="[4.13,5.0.0)",
- org.slf4j.helpers;version="[1.7.0,2.0.0)"
+ org.slf4j.helpers;version="[1.7.0,3.0.0)"
 Export-Package: org.eclipse.jgit.junit.http;version="6.9.0";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.junit,
diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
index d644f160be..e680eec88d 100644
--- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
@@ -44,5 +44,5 @@ Import-Package: org.apache.sshd.common;version="[2.11.0,2.12.0)",
  org.eclipse.jgit.util;version="[6.9.0,6.10.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.experimental.theories;version="[4.13,5.0.0)",
- org.slf4j;version="[1.7.0,2.0.0)"
+ org.slf4j;version="[1.7.0,3.0.0)"
 Export-Package: org.eclipse.jgit.junit.ssh;version="6.9.0"
diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
index 072a3ad27a..89d6eea2f9 100644
--- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
@@ -31,7 +31,7 @@ Import-Package: org.eclipse.jgit.annotations;version="[6.9.0,6.10.0)",
  org.junit.runner;version="[4.13,5.0.0)",
  org.junit.runners;version="[4.13,5.0.0)",
  org.junit.runners.model;version="[4.13,5.0.0)",
- org.slf4j;version="[1.7.0,2.0.0)"
+ org.slf4j;version="[1.7.0,3.0.0)"
 Export-Package: org.eclipse.jgit.junit;version="6.9.0";
   uses:="org.eclipse.jgit.dircache,
    org.eclipse.jgit.lib,
diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
index fed0dcb553..feb7acd4bc 100644
--- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
@@ -35,4 +35,4 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)",
  org.eclipse.jgit.transport.http;version="[6.9.0,6.10.0)",
  org.eclipse.jgit.transport.http.apache;version="[6.9.0,6.10.0)",
  org.eclipse.jgit.util;version="[6.9.0,6.10.0)",
- org.slf4j;version="[1.7.0,2.0.0)"
+ org.slf4j;version="[1.7.0,3.0.0)"
diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
index 794b630d6e..0010fa03dd 100644
--- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
@@ -96,4 +96,4 @@ Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)",
  org.eclipse.jgit.nls;version="[6.9.0,6.10.0)",
  org.eclipse.jgit.transport;version="[6.9.0,6.10.0)",
  org.eclipse.jgit.util;version="[6.9.0,6.10.0)",
- org.slf4j;version="[1.7.0,2.0.0)"
+ org.slf4j;version="[1.7.0,3.0.0)"
diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
index 193ff53579..9b58b249ee 100644
--- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
@@ -18,4 +18,4 @@ Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)",
  org.eclipse.jgit.transport;version="[6.9.0,6.10.0)",
  org.eclipse.jgit.util;version="[6.9.0,6.10.0)",
  org.eclipse.jgit.util.io;version="[6.9.0,6.10.0)",
- org.slf4j;version="[1.7.0,2.0.0)"
+ org.slf4j;version="[1.7.0,3.0.0)"
diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index fbb3e069ac..374a82c8b8 100644
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -88,5 +88,5 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
  org.mockito.junit;version="[5.4.0,6.0.0)",
  org.mockito.stubbing;version="[5.4.0,6.0.0)",
  org.objenesis;version="[3.3.0,4.0.0)",
- org.slf4j;version="[1.7.0,2.0.0)",
+ org.slf4j;version="[1.7.0,3.0.0)",
  org.tukaani.xz
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index b3fe5a02bd..1feae3e4e9 100644
--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
@@ -239,6 +239,6 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
  javax.management,
  javax.net.ssl,
  org.apache.commons.codec.digest;version="1.15.0",
- org.slf4j;version="[1.7.0,2.0.0)",
+ org.slf4j;version="[1.7.0,3.0.0)",
  org.xml.sax,
  org.xml.sax.helpers
-- 
2.39.5