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 <robin.rosenberg@dewire.com>

diff --git a/.eclipse_iplog b/.eclipse_iplog
index e85980f0c2f5e9f7c8a3cb7aea45b7bfdea1931f..bc3b22e5676496bfed1fbdfde5541f6f8a4af8ff 100644 (file)
--- 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 29e54cc4d16e2064308b160b39a5dce1a495ca3e..7c97c5ab0fa94caf1ceec41d737faca11fd77fd3 100644 (file)
--- 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 b49e3684dca709c85b52c2e97c82967082c71e1b..3324c7601ae62d58eff08e446364908418ad3380 100644 (file)
--- 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 eea590e05469fc239c70b6e8982ed0e375637339..12f067d185bd5bdce0128de316c59cda14c2df64 100644 (file)
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -60,7 +60,7 @@
 
   <properties>
     <tycho-version>0.7.0</tycho-version>
-    <eclipse-site>http://download.eclipse.org/releases/galileo</eclipse-site>
+    <eclipse-site>http://download.eclipse.org/releases/ganymede</eclipse-site>
   </properties>
 
   <modules>
@@ -70,7 +70,7 @@
 
   <repositories>
     <repository>
-      <id>galileo</id>
+      <id>ganymede</id>
       <layout>p2</layout>
       <url>${eclipse-site}</url>
     </repository>

diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index 49e9d328634690b62aede666d13a1ec6102268b0..8b44b60535ca854535ecfd94807413a1d5633751 100644 (file)
--- 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 d9d2faa9dfb6e18064dcf5b503fe8448c8789609..b496cd08dd6d6940c10632a982c6886efafa968d 100644 (file)
--- 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 291ecdc6ab2c4fb2464d54594a427f25bc150f0f..f586e924874f2a73ca9970bc932d5a31f66b87b1 100644 (file)
--- 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)"