From fa4c3fe461064e24bc20954a713f0c09e13d6a18 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Sat, 3 Apr 2010 23:43:44 +0200 Subject: [PATCH] JGit plugin not compatible with Eclipse 3.4 The JSch bundle in Eclipse 3.4 does not export its packages with version numbers. Use Require-Bundle on version 0.1.37 that comes with Eclipse 3.4 There is no 0.1.37 in the maven repositories so the pom still refers to 0.1.41 so the build can get the compile time dependencies right. Bug: 308031 CQ: 3904 jsch Version: 0.1.37 (using Orbit CQ2014) Change-Id: I12eba86bfbe584560c213882ebba58bf1f9fa0c1 Signed-off-by: Robin Rosenberg --- .eclipse_iplog | 6 ++++++ org.eclipse.jgit.console/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.jgit.packaging/pom.xml | 4 ++-- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 6 +++--- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.eclipse_iplog b/.eclipse_iplog index e85980f0c2..bc3b22e567 100644 --- a/.eclipse_iplog +++ b/.eclipse_iplog @@ -22,6 +22,12 @@ use = unmodified binary state = approved +[CQ "3904"] + description = jsch Version: 0.1.37 (using Orbit CQ2014) + license = New BSD license + use = unmodified binary + state = approved + [CQ "3655"] description = Junit Version: 3.8.2 (PB CQ2206) license = Common Public License 1.0 diff --git a/org.eclipse.jgit.console/META-INF/MANIFEST.MF b/org.eclipse.jgit.console/META-INF/MANIFEST.MF index 29e54cc4d1..7c97c5ab0f 100644 --- a/org.eclipse.jgit.console/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.console/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Bundle-Version: 0.8.0.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.eclipse.jgit.console;version="0.8.0" -Import-Package: com.jcraft.jsch;version="[0.1.41,0.2.0)", - org.eclipse.jgit.transport;version="[0.8.0,0.9.0)", +Import-Package: org.eclipse.jgit.transport;version="[0.8.0,0.9.0)", org.eclipse.jgit.util;version="[0.8.0,0.9.0)" +Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)" diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index b49e3684dc..3324c7601a 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -7,8 +7,7 @@ Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: com.jcraft.jsch;version="[0.1.41,0.2.0)", - junit.framework;version="[3.8.2,4.0.0)", +Import-Package: junit.framework;version="[3.8.2,4.0.0)", org.eclipse.jgit.diff;version="[0.8.0,0.9.0)", org.eclipse.jgit.dircache;version="[0.8.0,0.9.0)", org.eclipse.jgit.errors;version="[0.8.0,0.9.0)", @@ -25,3 +24,4 @@ Import-Package: com.jcraft.jsch;version="[0.1.41,0.2.0)", org.eclipse.jgit.util;version="[0.8.0,0.9.0)", org.eclipse.jgit.util.io;version="[0.8.0,0.9.0)" Export-Package: org.eclipse.jgit.junit;version="0.8.0" +Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)" diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index eea590e054..12f067d185 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -60,7 +60,7 @@ 0.7.0 - http://download.eclipse.org/releases/galileo + http://download.eclipse.org/releases/ganymede @@ -70,7 +70,7 @@ - galileo + ganymede p2 ${eclipse-site} diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 49e9d32863..8b44b60535 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -7,8 +7,7 @@ Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: com.jcraft.jsch;version="[0.1.41,0.2.0)", - junit.framework;version="[3.8.2,4.0.0)", +Import-Package: junit.framework;version="[3.8.2,4.0.0)", junit.textui;version="[3.8.2,4.0.0)", org.eclipse.jgit.diff;version="[0.8.0,0.9.0)", org.eclipse.jgit.dircache;version="[0.8.0,0.9.0)", @@ -27,3 +26,4 @@ Import-Package: com.jcraft.jsch;version="[0.1.41,0.2.0)", org.eclipse.jgit.treewalk.filter;version="[0.8.0,0.9.0)", org.eclipse.jgit.util;version="[0.8.0,0.9.0)", org.eclipse.jgit.util.io;version="[0.8.0,0.9.0)" +Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)" diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index d9d2faa9df..b496cd08dd 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -7,9 +7,9 @@ Bundle-Version: 0.8.0.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.jgit.awtui;version="0.8.0" -Import-Package: com.jcraft.jsch;version="[0.1.41,0.2.0)", - org.eclipse.jgit.lib;version="[0.8.0,0.9.0)", - org.eclipse.jgit.transport;version="[0.8.0,0.9.0)", +Import-Package: org.eclipse.jgit.lib;version="[0.8.0,0.9.0)", org.eclipse.jgit.revplot;version="[0.8.0,0.9.0)", org.eclipse.jgit.revwalk;version="[0.8.0,0.9.0)", + org.eclipse.jgit.transport;version="[0.8.0,0.9.0)", org.eclipse.jgit.util;version="[0.8.0,0.9.0)" +Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)" diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 291ecdc6ab..f586e92487 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -23,4 +23,4 @@ Export-Package: org.eclipse.jgit.diff;version="0.8.0", org.eclipse.jgit.util.io;version="0.8.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: com.jcraft.jsch;version="[0.1.41,0.2.0)" +Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)" -- 2.39.5