Relax version range for hamcrest and assertj

We currently cannot use hamcrest 2.2 and assertj 3.20.2 (which requires
hamcrest 2.2) in egit tests since other Eclipse dependencies (e.g.
swtbot) require hamcrest 1.1.

Hence relax version range for these components in jgit so that jgit
tests also work when using the egit target platform.

Change-Id: I521e2ec4491bd8d790609b8a66a8f14511a865a1

8 files changed, 11 insertions, 11 deletions

diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
index 63f0305ffe..d42d349885 100644
--- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Import-Package: org.apache.tools.ant,
  org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
  org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
  org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
- org.hamcrest.core;version="[2.2.0,3.0.0)",
+ org.hamcrest.core;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)"
diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
index e5ac4fc162..d450796165 100644
--- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.65.0,2.0.0)",
  org.eclipse.jgit.gpg.bc.internal;version="[5.13.0,5.14.0)",
  org.eclipse.jgit.gpg.bc.internal.keys;version="[5.13.0,5.14.0)",
  org.eclipse.jgit.util.sha1;version="[5.13.0,5.14.0)",
- org.hamcrest;version="[2.2.0,3.0.0)",
+ org.hamcrest;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.runner;version="[4.13,5.0.0)",
  org.junit.runners;version="[4.13,5.0.0)"
diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index c012c90402..210b28f222 100644
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@ -48,8 +48,8 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
  org.eclipse.jgit.transport.http.apache;version="[5.13.0,5.14.0)",
  org.eclipse.jgit.transport.resolver;version="[5.13.0,5.14.0)",
  org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
- org.hamcrest;version="[2.2.0,3.0.0)",
- org.hamcrest.core;version="[2.2.0,3.0.0)",
+ org.hamcrest;version="[1.1.0,3.0.0)",
+ org.hamcrest.core;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.rules;version="[4.13,5.0.0)",
  org.junit.runner;version="[4.13,5.0.0)",
diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
index 3b208aafe9..b10bf8c264 100644
--- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
@@ -46,7 +46,7 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
  org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)",
  org.eclipse.jgit.treewalk.filter;version="[5.13.0,5.14.0)",
  org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
- org.hamcrest.core;version="[2.2.0,3.0.0)",
+ org.hamcrest.core;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.rules;version="[4.13,5.0.0)",
  org.junit.runner;version="[4.13,5.0.0)",
diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
index 5a7bbad060..cd13fe5229 100644
--- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Import-Package: org.eclipse.jgit.api;version="[5.13.0,5.14.0)",
  org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)",
  org.eclipse.jgit.treewalk.filter;version="[5.13.0,5.14.0)",
  org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
- org.hamcrest.core;version="[2.2.0,3.0.0)",
+ org.hamcrest.core;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.runner;version="[4.13,5.0.0)",
  org.junit.runners;version="[4.13,5.0.0)"
diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
index d5256c40c3..215115e71d 100644
--- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
@@ -30,7 +30,7 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.7.0,2.8.0)",
  org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
  org.eclipse.jgit.transport.sshd;version="[5.13.0,5.14.0)",
  org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
- org.hamcrest;version="[2.2.0,3.0.0)",
+ org.hamcrest;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.experimental.theories;version="[4.13,5.0.0)",
  org.junit.runner;version="[4.13,5.0.0)"
diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
index 945ebb6a49..df6d24fb7e 100644
--- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)",
  org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
  org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
  org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
- org.hamcrest;version="[2.2.0,3.0.0)",
+ org.hamcrest;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.experimental.theories;version="[4.13,5.0.0)",
  org.junit.runner;version="[4.13,5.0.0)"
diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index 8b50e010ce..f8da0f9063 100644
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
  org.apache.commons.compress.compressors.bzip2;version="[1.15.0,2.0)",
  org.apache.commons.compress.compressors.gzip;version="[1.15.0,2.0)",
  org.apache.commons.compress.compressors.xz;version="[1.15.0,2.0)",
- org.assertj.core.api;version="[3.20.0,4.0.0)",
+ org.assertj.core.api;version="[3.14.0,4.0.0)",
  org.eclipse.jgit.annotations;version="[5.13.0,5.14.0)",
  org.eclipse.jgit.api;version="[5.13.0,5.14.0)",
  org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)",
@@ -69,8 +69,8 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
  org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
  org.eclipse.jgit.util.io;version="[5.13.0,5.14.0)",
  org.eclipse.jgit.util.sha1;version="[5.13.0,5.14.0)",
- org.hamcrest;version="[2.2.0,3.0.0)",
- org.hamcrest.collection;version="[2.2.0,3.0.0)",
+ org.hamcrest;version="[1.1.0,3.0.0)",
+ org.hamcrest.collection;version="[1.1.0,3.0.0)",
  org.junit;version="[4.13,5.0.0)",
  org.junit.experimental.theories;version="[4.13,5.0.0)",
  org.junit.function;version="[4.13.0,5.0.0)",