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.jsch.core | |
| 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.jsch.core')
| -rw-r--r-- | bundles/org.eclipse.jsch.core/META-INF/MANIFEST.MF | 4 | ||||
| -rw-r--r-- | bundles/org.eclipse.jsch.core/pom.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.jsch.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jsch.core/META-INF/MANIFEST.MF index a00bcfd6f..f63a52fe9 100644 --- a/bundles/org.eclipse.jsch.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.jsch.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jsch.core;singleton:=true -Bundle-Version: 1.1.400.qualifier +Bundle-Version: 1.1.500.qualifier Bundle-Activator: org.eclipse.jsch.internal.core.JSchCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,6 +10,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)", com.jcraft.jsch;bundle-version="[0.1.50,1.0.0)", org.eclipse.core.net;bundle-version="[1.0.0,2.0.0)" Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.jsch.core, +Export-Package: org.eclipse.jsch.core;uses:="org.eclipse.core.runtime,com.jcraft.jsch", org.eclipse.jsch.internal.core;x-friends:="org.eclipse.jsch.ui" Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/bundles/org.eclipse.jsch.core/pom.xml b/bundles/org.eclipse.jsch.core/pom.xml index aca0a7825..41e4fba48 100644 --- a/bundles/org.eclipse.jsch.core/pom.xml +++ b/bundles/org.eclipse.jsch.core/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.jsch</groupId> <artifactId>org.eclipse.jsch.core</artifactId> - <version>1.1.400-SNAPSHOT</version> + <version>1.1.500-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> |