From f50c28b7e1d8c6d259e9386c87ed691383ff11de Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Wed, 3 Feb 2010 19:42:06 -0800 Subject: [PATCH] Update manifests to use versioned Import-Package or Require-Bundle Rather than taking anything at random, take the >= 3.4 but less than 4.0 versions for any Eclipse package, and JGit 0.6.0,0.7.0. This documents the assumption we are making about targeting the 3.4 API platform for Eclipse, but hopefully working on a forward release up until 4.0. Change-Id: If3955b243dbd36b6bee63472fa480ac172a80354 Signed-off-by: Shawn O. Pearce --- org.eclipse.egit-feature/feature.xml | 31 ++++++++-------- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 45 ++++++++++++----------- org.eclipse.egit.core/META-INF/MANIFEST.MF | 29 +++++++++------ org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 19 +++++----- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 49 ++++++++++++++++--------- 5 files changed, 99 insertions(+), 74 deletions(-) rewrite org.eclipse.egit.core.test/META-INF/MANIFEST.MF (62%) diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 89b6d6f6..30fd126e 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -24,21 +24,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF dissimilarity index 62% index 438bed4f..2eb33118 100644 --- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF @@ -1,21 +1,24 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Test Plug-in (Incubation) -Bundle-SymbolicName: org.eclipse.egit.core.test -Bundle-Version: 0.6.0.qualifier -Bundle-Activator: org.eclipse.egit.core.test.Activator -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.team.core, - org.junit, - org.eclipse.egit.core, - org.eclipse.egit.ui, - org.eclipse.jgit, - org.eclipse.core.filesystem, - org.eclipse.jgit.junit;bundle-version="0.6.0" -Bundle-ActivationPolicy: lazy -Import-Package: org.eclipse.core.resources, - org.eclipse.jdt.core, - org.eclipse.jdt.junit, - org.eclipse.jdt.launching -Export-Package: org.eclipse.egit.core.internal.mapping -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Git Team Provider Core Test Plug-in (Incubation) +Bundle-Vendor: Eclipse.org +Bundle-SymbolicName: org.eclipse.egit.core.test +Bundle-Version: 0.6.0.qualifier +Bundle-Activator: org.eclipse.egit.core.test.Activator +Require-Bundle: org.eclipse.core.runtime;version="[3.4.0,4.0.0)", + org.eclipse.core.filesystem;version="[3.4.0,4.0.0)", + org.eclipse.core.resources;version="[3.4.0,4.0.0)", + org.eclipse.team.core;version="[3.4.0,4.0.0)", + org.eclipse.jdt.core;version="[3.4.0,4.0.0)", + org.eclipse.jdt.launching;version="[3.4.0,4.0.0)" +Bundle-ActivationPolicy: lazy +Import-Package: junit.framework;version="[4.3.1,5.0.0)", + org.eclipse.egit.core;version="[0.6.0,0.7.0)", + org.eclipse.egit.core.op;version="[0.6.0,0.7.0)", + org.eclipse.egit.core.project;version="[0.6.0,0.7.0)", + org.eclipse.jgit.junit;version="[0.6.0,0.7.0)", + org.eclipse.jgit.lib;version="[0.6.0,0.7.0)", + org.eclipse.jgit.treewalk;version="[0.6.0,0.7.0)", + org.eclipse.jgit.treewalk.filter;version="[0.6.0,0.7.0)", + org.eclipse.jgit.util;version="[0.6.0,0.7.0)" +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF index beae8641..efd21183 100644 --- a/org.eclipse.egit.core/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core/META-INF/MANIFEST.MF @@ -6,16 +6,23 @@ Bundle-Version: 0.6.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.team.core, - org.eclipse.core.resources, - org.eclipse.jgit, - org.eclipse.core.filesystem, - org.eclipse.ui -Export-Package: org.eclipse.egit.core, - org.eclipse.egit.core.internal.storage;x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.util;x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.op, - org.eclipse.egit.core.project +Require-Bundle: org.eclipse.core.runtime;version="[3.4.0,4.0.0)", + org.eclipse.team.core;version="[3.4.0,4.0.0)", + org.eclipse.core.resources;version="[3.4.0,4.0.0)", + org.eclipse.core.filesystem;version="[3.4.0,4.0.0)", + org.eclipse.ui;version="[3.4.0,4.0.0)" +Export-Package: org.eclipse.egit.core;version="0.6.0", + org.eclipse.egit.core.internal.storage;version="0.6.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.util;version="0.6.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.op;version="0.6.0", + org.eclipse.egit.core.project;version="0.6.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: org.eclipse.jgit.dircache;version="[0.6.0,0.7.0)", + org.eclipse.jgit.errors;version="[0.6.0,0.7.0)", + org.eclipse.jgit.lib;version="[0.6.0,0.7.0)", + org.eclipse.jgit.revwalk;version="[0.6.0,0.7.0)", + org.eclipse.jgit.transport;version="[0.6.0,0.7.0)", + org.eclipse.jgit.treewalk;version="[0.6.0,0.7.0)", + org.eclipse.jgit.treewalk.filter;version="[0.6.0,0.7.0)", + org.eclipse.jgit.util;version="[0.6.0,0.7.0)" diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index b1ea8fa1..20aca824 100644 --- a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF @@ -1,16 +1,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Test Plug-in +Bundle-Name: Git Team Provider UI Test Plug-in (Incubation) +Bundle-Vendor: Eclipse.org Bundle-SymbolicName: org.eclipse.egit.ui.test Bundle-Version: 0.6.0.qualifier Bundle-Activator: org.eclipse.egit.ui.test.Activator Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Require-Bundle: org.eclipse.core.runtime;version="[3.4.0,4.0.0)", + org.eclipse.core.filesystem;version="[3.4.0,4.0.0)", + org.eclipse.core.resources;version="[3.4.0,4.0.0)" Import-Package: org.apache.log4j, - org.eclipse.core.resources, - org.eclipse.core.runtime;version="3.4.0", - org.eclipse.core.runtime.jobs, - org.eclipse.jgit.lib;version="0.6.0", + org.eclipse.jgit.lib;version="[0.6.0,0.7.0)", org.eclipse.swt.widgets, org.eclipse.swtbot.eclipse.finder, org.eclipse.swtbot.eclipse.finder.exceptions, @@ -27,7 +28,7 @@ Import-Package: org.apache.log4j, org.eclipse.swtbot.swt.finder.widgets, org.eclipse.ui, org.hamcrest, - org.junit;version="4.3.1", - org.junit.runner;version="4.3.1", - org.junit.runners;version="4.3.1", - org.osgi.framework;version="1.4.0" + org.junit;version="[4.3.1,5.0.0)", + org.junit.runner;version="[4.3.1,5.0.0)", + org.junit.runners;version="[4.3.1,5.0.0)", + org.osgi.framework;version="[1.4.0,2.0.0)" diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF index ac0db7dd..3035d3bf 100644 --- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF @@ -6,23 +6,38 @@ Bundle-Version: 0.6.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.core.filesystem, - org.eclipse.core.net, - org.eclipse.ui, +Require-Bundle: org.eclipse.core.runtime;version="[3.4.0,4.0.0)", + org.eclipse.core.filesystem;version="[3.4.0,4.0.0)", + org.eclipse.core.resources;version="[3.4.0,4.0.0)", + org.eclipse.core.net;version="[3.4.0,4.0.0)", + org.eclipse.ui;version="[3.4.0,4.0.0)", org.eclipse.team.core;bundle-version="3.4.0", - org.eclipse.team.ui, - org.eclipse.jface.text, - org.eclipse.ui.ide, - org.eclipse.ui.workbench.texteditor, - org.eclipse.compare, - org.eclipse.jgit, - org.eclipse.egit.core, - org.eclipse.ui.ide, - org.eclipse.jsch.ui;bundle-version="1.1.100" + org.eclipse.team.ui;version="[3.4.0,4.0.0)", + org.eclipse.jface.text;version="[3.4.0,4.0.0)", + org.eclipse.ui.ide;version="[3.4.0,4.0.0)", + org.eclipse.ui.workbench.texteditor;version="[3.4.0,4.0.0)", + org.eclipse.compare;version="[3.4.0,4.0.0)", + org.eclipse.ui.ide;version="[3.4.0,4.0.0)", + org.eclipse.jsch.ui;bundle-version="1.1.100", + org.eclipse.jsch.core;bundle-version="[1.1.100,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: com.jcraft.jsch, - org.eclipse.jsch.core, - org.eclipse.jsch.internal.core +Import-Package: com.jcraft.jsch;version="[0.1.41,0.2.0)", + org.eclipse.egit.core;version="[0.6.0,0.7.0)", + org.eclipse.egit.core.op;version="[0.6.0,0.7.0)", + org.eclipse.egit.core.project;version="[0.6.0,0.7.0)", + org.eclipse.jgit.diff;version="0.6.0", + org.eclipse.jgit.dircache;version="0.6.0", + org.eclipse.jgit.errors;version="0.6.0", + org.eclipse.jgit.fnmatch;version="0.6.0", + org.eclipse.jgit.lib;version="0.6.0", + org.eclipse.jgit.merge;version="0.6.0", + org.eclipse.jgit.patch;version="0.6.0", + org.eclipse.jgit.revplot;version="0.6.0", + org.eclipse.jgit.revwalk;version="0.6.0", + org.eclipse.jgit.revwalk.filter;version="0.6.0", + org.eclipse.jgit.transport;version="0.6.0", + org.eclipse.jgit.treewalk;version="0.6.0", + org.eclipse.jgit.treewalk.filter;version="0.6.0", + org.eclipse.jgit.util;version="0.6.0", + org.eclipse.jgit.util.io;version="0.6.0" -- 2.11.4.GIT