From fdacfaecc43e573feaf31dcb4ab26e3469868618 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 8 Dec 2017 07:29:51 +0900 Subject: [PATCH] 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 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 6 +++--- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 8 ++++---- org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF | 8 ++++---- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 6 +++--- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 10 +++++----- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 7a45c970e..ca869791d 100644 --- 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 c230c776d..06a6f8db2 100644 --- 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 d7a7e23d8..80f65c509 100644 --- 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 b90ac64ef..fb56964c1 100644 --- 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 9d4181fb9..d12f37d1f 100644 --- 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 2d2e9439f..35d6f712b 100644 --- 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 edbfb1cd7..3cd666379 100644 --- 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 d196e1949..12e9dca82 100644 --- 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)"