From cd946161e6d7ad1998649e87c37aa5cfacba596c Mon Sep 17 00:00:00 2001
From: Robin Rosenberg <robin.rosenberg@dewire.com>
Date: Sun, 4 Apr 2010 11:38:19 +0200
Subject: [PATCH] EGit plugin not compatible with Eclipse 3.4, due to JSch
 dependency

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

Bug: 308032

Change-Id: Ic5039efe08e381e81be473712dd5d173c83d3fd8
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
---
 org.eclipse.egit-feature/feature.xml     | 2 +-
 org.eclipse.egit.ui/META-INF/MANIFEST.MF | 6 +++---
 pom.xml                                  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml
index 8e3c9d5c..81e4d55c 100644
--- a/org.eclipse.egit-feature/feature.xml
+++ b/org.eclipse.egit-feature/feature.xml
@@ -37,7 +37,7 @@
       <import plugin="org.eclipse.team.core" version="3.4.0" match="compatible"/>
       <import plugin="org.eclipse.jsch.ui" version="1.1.100" match="compatible"/>
       <import plugin="org.eclipse.jsch.core" version="1.1.100" match="compatible"/>
-      <import plugin="com.jcraft.jsch" version="0.1.41" match="compatible"/>
+      <import plugin="com.jcraft.jsch" version="0.1.37" match="compatible"/>
       <import feature="org.eclipse.jgit" version="0.8.0" match="equivalent"/>
    </requires>
 
diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF
index d690eb61..bb288602 100644
--- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF
@@ -20,11 +20,11 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.jsch.ui;bundle-version="[1.1.100,2.0.0)",
  org.eclipse.jsch.core;bundle-version="[1.1.100,2.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)"
+ org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)",
+ com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: com.jcraft.jsch;version="[0.1.41,0.2.0)",
- org.eclipse.egit.core;version="[0.8.0,0.9.0)",
+Import-Package: org.eclipse.egit.core;version="[0.8.0,0.9.0)",
  org.eclipse.egit.core.internal.storage;version="[0.8.0,0.9.0)",
  org.eclipse.egit.core.internal.trace;version="0.8.0",
  org.eclipse.egit.core.internal.util;version="[0.8.0,0.9.0)",
diff --git a/pom.xml b/pom.xml
index 103b1df9..78fef13c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
   <properties>
     <tycho-version>0.7.0</tycho-version>
     <jgit-version>0.8.0-SNAPSHOT</jgit-version>
-    <eclipse-site>http://download.eclipse.org/releases/galileo</eclipse-site>
+    <eclipse-site>http://download.eclipse.org/releases/ganymede</eclipse-site>
   </properties>
 
   <modules>
@@ -79,7 +79,7 @@
 
   <repositories>
     <repository>
-      <id>galileo</id>
+      <id>ganymede</id>
       <layout>p2</layout>
       <url>${eclipse-site}</url>
     </repository>
-- 
2.11.4.GIT