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>
This commit is contained in:
parent
2b6c555aee
commit
fa4c3fe461
|
@ -22,6 +22,12 @@
|
||||||
use = unmodified binary
|
use = unmodified binary
|
||||||
state = approved
|
state = approved
|
||||||
|
|
||||||
|
[CQ "3904"]
|
||||||
|
description = jsch Version: 0.1.37 (using Orbit CQ2014)
|
||||||
|
license = New BSD license
|
||||||
|
use = unmodified binary
|
||||||
|
state = approved
|
||||||
|
|
||||||
[CQ "3655"]
|
[CQ "3655"]
|
||||||
description = Junit Version: 3.8.2 (PB CQ2206)
|
description = Junit Version: 3.8.2 (PB CQ2206)
|
||||||
license = Common Public License 1.0
|
license = Common Public License 1.0
|
||||||
|
|
|
@ -7,6 +7,6 @@ Bundle-Version: 0.8.0.qualifier
|
||||||
Bundle-Vendor: %provider_name
|
Bundle-Vendor: %provider_name
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Export-Package: org.eclipse.jgit.console;version="0.8.0"
|
Export-Package: org.eclipse.jgit.console;version="0.8.0"
|
||||||
Import-Package: com.jcraft.jsch;version="[0.1.41,0.2.0)",
|
Import-Package: org.eclipse.jgit.transport;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)"
|
org.eclipse.jgit.util;version="[0.8.0,0.9.0)"
|
||||||
|
Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)"
|
||||||
|
|
|
@ -7,8 +7,7 @@ Bundle-Localization: plugin
|
||||||
Bundle-Vendor: %provider_name
|
Bundle-Vendor: %provider_name
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
||||||
Import-Package: com.jcraft.jsch;version="[0.1.41,0.2.0)",
|
Import-Package: junit.framework;version="[3.8.2,4.0.0)",
|
||||||
junit.framework;version="[3.8.2,4.0.0)",
|
|
||||||
org.eclipse.jgit.diff;version="[0.8.0,0.9.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.dircache;version="[0.8.0,0.9.0)",
|
||||||
org.eclipse.jgit.errors;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;version="[0.8.0,0.9.0)",
|
||||||
org.eclipse.jgit.util.io;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"
|
Export-Package: org.eclipse.jgit.junit;version="0.8.0"
|
||||||
|
Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)"
|
||||||
|
|
|
@ -60,7 +60,7 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<tycho-version>0.7.0</tycho-version>
|
<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>
|
</properties>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
@ -70,7 +70,7 @@
|
||||||
|
|
||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
<repository>
|
||||||
<id>galileo</id>
|
<id>ganymede</id>
|
||||||
<layout>p2</layout>
|
<layout>p2</layout>
|
||||||
<url>${eclipse-site}</url>
|
<url>${eclipse-site}</url>
|
||||||
</repository>
|
</repository>
|
||||||
|
|
|
@ -7,8 +7,7 @@ Bundle-Localization: plugin
|
||||||
Bundle-Vendor: %provider_name
|
Bundle-Vendor: %provider_name
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
||||||
Import-Package: com.jcraft.jsch;version="[0.1.41,0.2.0)",
|
Import-Package: junit.framework;version="[3.8.2,4.0.0)",
|
||||||
junit.framework;version="[3.8.2,4.0.0)",
|
|
||||||
junit.textui;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.diff;version="[0.8.0,0.9.0)",
|
||||||
org.eclipse.jgit.dircache;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.treewalk.filter;version="[0.8.0,0.9.0)",
|
||||||
org.eclipse.jgit.util;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)"
|
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)"
|
||||||
|
|
|
@ -7,9 +7,9 @@ Bundle-Version: 0.8.0.qualifier
|
||||||
Bundle-Vendor: %provider_name
|
Bundle-Vendor: %provider_name
|
||||||
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
||||||
Export-Package: org.eclipse.jgit.awtui;version="0.8.0"
|
Export-Package: org.eclipse.jgit.awtui;version="0.8.0"
|
||||||
Import-Package: com.jcraft.jsch;version="[0.1.41,0.2.0)",
|
Import-Package: org.eclipse.jgit.lib;version="[0.8.0,0.9.0)",
|
||||||
org.eclipse.jgit.lib;version="[0.8.0,0.9.0)",
|
|
||||||
org.eclipse.jgit.transport;version="[0.8.0,0.9.0)",
|
|
||||||
org.eclipse.jgit.revplot;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.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)"
|
org.eclipse.jgit.util;version="[0.8.0,0.9.0)"
|
||||||
|
Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)"
|
||||||
|
|
|
@ -23,4 +23,4 @@ Export-Package: org.eclipse.jgit.diff;version="0.8.0",
|
||||||
org.eclipse.jgit.util.io;version="0.8.0"
|
org.eclipse.jgit.util.io;version="0.8.0"
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
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)"
|
||||||
|
|
Loading…
Reference in New Issue