Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2010-01-14 01:30:15 +0000
committerMatthias Sohn2010-01-20 21:51:16 +0000
commit0f01d482036afcfeb94b91c8cc534803a8577c50 (patch)
treebe409283ff3b979d76f73f59ac2d929ace73a7ee /org.eclipse.egit-feature
parent1f01c420bf94681560d2ab2153728305767576ef (diff)
downloadegit-0f01d482036afcfeb94b91c8cc534803a8577c50.tar.gz
egit-0f01d482036afcfeb94b91c8cc534803a8577c50.tar.xz
egit-0f01d482036afcfeb94b91c8cc534803a8577c50.zip
Fix EGit Tycho build
- Add missing pom-first dependencies as described in [1] to fix the build. - Create EGit update site. - The build of the update site assumes that egit and jgit are checked out under a common root folder, this is needed to refer to the JGit update site. If the layout is different the URL pointing to the JGit update site has to be passed to the maven build as system property jgit-site, e.g. mvn -Djgit-site=file:/C:/tmp/site clean install or mvn -Djgit-site=http://point.to.jgit/site clean install - Introduce property for Eclipse p2 repository to prepare builds against other versions of Eclipse. - Adding information about mailing lists, issue tracker and license. This change depends on the following JGit change : - Ie4026f15f6250c4933dccf6f31b5009b90c036bc [1] https://docs.sonatype.org/display/TYCHO/Dependency+on+pom-first+artifacts BUT: since Tycho 0.6.0 target-platform-configuration has groupId org.sonatype.tycho ! Change-Id: Idf90bd4a29c36013f582c8f99424c8fc72597bc5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit-feature')
-rw-r--r--org.eclipse.egit-feature/feature.xml9
-rw-r--r--org.eclipse.egit-feature/pom.xml8
2 files changed, 9 insertions, 8 deletions
diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml
index 5c78170103..4fa09159cf 100644
--- a/org.eclipse.egit-feature/feature.xml
+++ b/org.eclipse.egit-feature/feature.xml
@@ -44,7 +44,7 @@ Changes on @branch@ since @refversion@:
<import plugin="org.eclipse.jsch.ui" version="1.1.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.jsch.core"/>
<import plugin="com.jcraft.jsch"/>
- <import feature="org.eclipse.jgit" version="0.6.0" match="compatible"/>
+ <import plugin="org.eclipse.jgit" version="0.6.0" match="greaterOrEqual"/>
</requires>
<plugin
@@ -68,11 +68,4 @@ Changes on @branch@ since @refversion@:
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.jgit"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
diff --git a/org.eclipse.egit-feature/pom.xml b/org.eclipse.egit-feature/pom.xml
index b1c5b6e009..f5e9676a21 100644
--- a/org.eclipse.egit-feature/pom.xml
+++ b/org.eclipse.egit-feature/pom.xml
@@ -24,4 +24,12 @@
<name>Eclipse Git Feature (Incubation)</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jgit</groupId>
+ <artifactId>org.eclipse.jgit</artifactId>
+ <version>${jgit-version}</version>
+ </dependency>
+ </dependencies>
+
</project>

Back to the top