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

diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
index 879a34bb8f6d058bd83ed11af606eea240c218d4..fe2b885eeb7d85314469e941bc64d4fb2e1e552d 100644 (file)
--- 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 a55dfb510f10bb2dea06bfcc613a97dfec5a931a..e810b7add99324352a6b73dbb4cf356d43dc5d0e 100644 (file)
--- 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 d644f160be589a054fee74e58a7f133d548580a6..e680eec88d25d319979b55bf1c2a987eb270fbbe 100644 (file)
--- 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 072a3ad27ab2fd194769d943467d905848e6ebce..89d6eea2f9c9cf761c7144f9087c67f3820bf906 100644 (file)
--- 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 fed0dcb553ea29ac6e15c84c0a0e5707f69e3971..feb7acd4bcafafdc4e6125137f23770e54ee3c6a 100644 (file)
--- 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 794b630d6e5922fa988f5c1ecc8bae9c97aecb1f..0010fa03dda516ba33aa96e23cb85f6c5818faec 100644 (file)
--- 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 193ff53579d470105379c0d3f43d9a57f753c2fc..9b58b249eea86179c66d30e54457151a7cb59175 100644 (file)
--- 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 fbb3e069ac903605558f775a84eacd6bbfbdd7fd..374a82c8b8f2ebf67d7903ab8bd854a59b5a50c2 100644 (file)
--- 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 b3fe5a02bd56c4080e2a07aa5022710d8bf73f16..1feae3e4e928f7f0d67b0c61cbdbda1e3c0a9495 100644 (file)
--- 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