Specify consistent version range for junit in OSGi manifests

There are several different version ranges specified in the various
manifest files.

Align them all to the same range:  [4.12,5.0.0)

Change-Id: I02205b8b8546c9f53ed431b5fd9abf6ddcda4423
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>

diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
index 7a45c970ed4f9a896f368f62c1113190b86607d0..ca869791df4f5b96a7e0708045d5c71e3616bf70 100644 (file)
--- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
@@ -12,4 +12,4 @@ Import-Package: org.apache.tools.ant,
  org.eclipse.jgit.lib;version="[4.10.0,4.11.0)",
  org.eclipse.jgit.util;version="[4.10.0,4.11.0)",
  org.hamcrest.core;version="[1.1.0,2.0.0)",
- org.junit;version="[4.0.0,5.0.0)"
+ org.junit;version="[4.12,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 c230c776d5cb9ec86b924da1335612a04de2676d..06a6f8db28da52f2056273d315ae43a91b974226 100644 (file)
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@ -44,6 +44,6 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
  org.eclipse.jgit.transport.resolver;version="[4.10.0,4.11.0)",
  org.eclipse.jgit.util;version="[4.10.0,4.11.0)",
  org.hamcrest.core;version="[1.1.0,2.0.0)",
- org.junit;version="[4.0.0,5.0.0)",
- org.junit.runner;version="[4.0.0,5.0.0)",
- org.junit.runners;version="[4.0.0,5.0.0)"
+ org.junit;version="[4.12,5.0.0)",
+ org.junit.runner;version="[4.12,5.0.0)",
+ org.junit.runners;version="[4.12,5.0.0)"

diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index d7a7e23d8562e803fe18f22eaa7037c46b9f315d..80f65c50952e42bce5db5df6c07444d8c6d31cde 100644 (file)
--- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
@@ -29,7 +29,7 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
  org.eclipse.jgit.revwalk;version="[4.10.0,4.11.0)",
  org.eclipse.jgit.transport;version="[4.10.0,4.11.0)",
  org.eclipse.jgit.transport.resolver;version="[4.10.0,4.11.0)",
- org.junit;version="[4.0.0,5.0.0)"
+ org.junit;version="[4.12,5.0.0)"
 Export-Package: org.eclipse.jgit.junit.http;version="4.10.0";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.junit,

diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
index b90ac64efcbc751b1f1f2bb985ce815a428ca6ab..fb56964c1273423f23e614f2ca6a575bd79acb2c 100644 (file)
--- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
@@ -22,10 +22,10 @@ Import-Package: org.eclipse.jgit.api;version="[4.10.0,4.11.0)",
  org.eclipse.jgit.util;version="[4.10.0,4.11.0)",
  org.eclipse.jgit.util.io;version="[4.10.0,4.11.0)",
  org.eclipse.jgit.util.time;version="[4.10.0,4.11.0)",
- org.junit;version="[4.0.0,5.0.0)",
- org.junit.rules;version="[4.9.0,5.0.0)",
- org.junit.runner;version="[4.0.0,5.0.0)",
- org.junit.runners.model;version="[4.5.0,5.0.0)"
+ org.junit;version="[4.12,5.0.0)",
+ org.junit.rules;version="[4.12,5.0.0)",
+ org.junit.runner;version="[4.12,5.0.0)",
+ org.junit.runners.model;version="[4.12,5.0.0)"
 Export-Package: org.eclipse.jgit.junit;version="4.10.0";
   uses:="org.eclipse.jgit.dircache,
    org.eclipse.jgit.lib,

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 9d4181fb9a566d003b1bbf3612810073670a5e52..d12f37d1fdd62be8e277153f6594e691c7ed11b4 100644 (file)
--- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
@@ -33,7 +33,7 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
  org.eclipse.jgit.lfs.test;version="[4.10.0,4.11.0)",
  org.eclipse.jgit.util;version="[4.10.0,4.11.0)",
  org.hamcrest.core;version="[1.1.0,2.0.0)",
- org.junit;version="[4.0.0,5.0.0)",
- org.junit.rules;version="[4.11.0,5.0.0)",
- org.junit.runner;version="[4.0.0,5.0.0)",
- org.junit.runners;version="[4.0.0,5.0.0)"
+ org.junit;version="[4.12,5.0.0)",
+ org.junit.rules;version="[4.12,5.0.0)",
+ org.junit.runner;version="[4.12,5.0.0)",
+ org.junit.runners;version="[4.12,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 2d2e9439f95c51e065268d84a31aa046e8cc5c66..35d6f712b610f161f5e3c78b4e39d4efe98c6b8d 100644 (file)
--- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
@@ -17,8 +17,8 @@ Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[4.10.0,4.11.0)",
  org.eclipse.jgit.treewalk.filter;version="[4.10.0,4.11.0)",
  org.eclipse.jgit.util;version="[4.10.0,4.11.0)",
  org.hamcrest.core;version="[1.1.0,2.0.0)",
- org.junit;version="[4.0.0,5.0.0)",
- org.junit.runner;version="[4.0.0,5.0.0)",
- org.junit.runners;version="[4.0.0,5.0.0)"
+ org.junit;version="[4.12,5.0.0)",
+ org.junit.runner;version="[4.12,5.0.0)",
+ org.junit.runners;version="[4.12,5.0.0)"
 Export-Package: org.eclipse.jgit.lfs.test;version="4.10.0";x-friends:="org.eclipse.jgit.lfs.server.test"
 

diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
index edbfb1cd7cbdac99b4a6c5335c00cab34aded39d..3cd66637973e19b2b148ca7b228fad248e390bff 100644 (file)
--- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Import-Package: org.eclipse.jgit.api;version="[4.10.0,4.11.0)",
  org.eclipse.jgit.util;version="[4.10.0,4.11.0)",
  org.eclipse.jgit.util.io;version="[4.10.0,4.11.0)",
  org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
- org.junit;version="[4.11.0,5.0.0)",
- org.junit.rules;version="[4.11.0,5.0.0)",
+ org.junit;version="[4.12,5.0.0)",
+ org.junit.rules;version="[4.12,5.0.0)",
  org.kohsuke.args4j;version="[2.33.0,3.0.0)"
 Require-Bundle: org.tukaani.xz;bundle-version="[1.3.0,2.0.0)"

diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index d196e1949e9017c4814ccc1971a41926b513f3d2..12e9dca8235cfa930295229f4ce7da79e96f8126 100644 (file)
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -54,11 +54,11 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
  org.eclipse.jgit.util;version="[4.10.0,4.11.0)",
  org.eclipse.jgit.util.io;version="[4.10.0,4.11.0)",
  org.eclipse.jgit.util.sha1;version="[4.10.0,4.11.0)",
- org.junit;version="[4.4.0,5.0.0)",
- org.junit.experimental.theories;version="[4.4.0,5.0.0)",
- org.junit.rules;version="[4.11.0,5.0.0)",
- org.junit.runner;version="[4.4.0,5.0.0)",
- org.junit.runners;version="[4.11.0,5.0.0)",
+ org.junit;version="[4.12,5.0.0)",
+ org.junit.experimental.theories;version="[4.12,5.0.0)",
+ org.junit.rules;version="[4.12,5.0.0)",
+ org.junit.runner;version="[4.12,5.0.0)",
+ org.junit.runners;version="[4.12,5.0.0)",
  org.slf4j;version="[1.7.2,2.0.0)"
 Require-Bundle: org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
  org.hamcrest.library;bundle-version="[1.1.0,2.0.0)"