diff options
author | David Williams | 2013-11-12 14:39:09 +0000 |
---|---|---|
committer | Szymon Brandys | 2013-11-12 14:42:40 +0000 |
commit | 1d601b81aaeb31ba9c28b520b31693dbfe395742 (patch) | |
tree | c563879c87b4b89614435777508456310179d1f2 /bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF | |
parent | ec3d37680e890ded361048d4561f71398cd1ed32 (diff) | |
download | eclipse.platform.team-1d601b81aaeb31ba9c28b520b31693dbfe395742.tar.gz eclipse.platform.team-1d601b81aaeb31ba9c28b520b31693dbfe395742.tar.xz eclipse.platform.team-1d601b81aaeb31ba9c28b520b31693dbfe395742.zip |
Bug 420903 - EGit (3.1.0) conflicts with com.jcraft.jsch (1.5.0) if
upgrading (must use -clean)
Signed-off-by: David Williams <david_williams@us.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF')
-rw-r--r-- | bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF index ce69f15ab..2f2fa0b1d 100644 --- a/bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.team.cvs.core; singleton:=true -Bundle-Version: 3.3.500.qualifier +Bundle-Version: 3.3.600.qualifier Bundle-Activator: org.eclipse.team.internal.ccvs.core.CVSProviderPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.3.0,4.0.0)", org.eclipse.team.core;bundle-version="[3.6.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)", - com.jcraft.jsch;bundle-version="[0.1.27,2.0.0)", + com.jcraft.jsch;bundle-version="[0.1.50,1.0.0)", org.eclipse.jsch.core;bundle-version="[1.0.0,2.0.0)", org.eclipse.core.net;bundle-version="[1.0.0,2.0.0)", org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)" |