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
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>
-rw-r--r--org.eclipse.egit-feature/feature.xml9
-rw-r--r--org.eclipse.egit-feature/pom.xml8
-rw-r--r--org.eclipse.egit-updatesite/.project1
-rw-r--r--org.eclipse.egit-updatesite/pom.xml17
-rw-r--r--org.eclipse.egit-updatesite/site.xml6
-rw-r--r--org.eclipse.egit.core.test/pom.xml17
-rw-r--r--org.eclipse.egit.core/pom.xml13
-rw-r--r--org.eclipse.egit.ui/pom.xml13
-rw-r--r--pom.xml56
9 files changed, 77 insertions, 63 deletions
diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml
index 5c7817010..4fa09159c 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 b1c5b6e00..f5e9676a2 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>
diff --git a/org.eclipse.egit-updatesite/.project b/org.eclipse.egit-updatesite/.project
index 964220e70..0eb2cc3ab 100644
--- a/org.eclipse.egit-updatesite/.project
+++ b/org.eclipse.egit-updatesite/.project
@@ -8,7 +8,6 @@
<project>org.eclipse.egit.core.test</project>
<project>org.eclipse.egit.ui</project>
<project>org.eclipse.egit-feature</project>
- <project>org.eclipse.jgit</project>
</projects>
<buildSpec>
<buildCommand>
diff --git a/org.eclipse.egit-updatesite/pom.xml b/org.eclipse.egit-updatesite/pom.xml
index 8515a1f40..e689a0042 100644
--- a/org.eclipse.egit-updatesite/pom.xml
+++ b/org.eclipse.egit-updatesite/pom.xml
@@ -22,29 +22,16 @@
<artifactId>org.eclipse.egit-updatesite</artifactId>
<packaging>eclipse-update-site</packaging>
- <name>Eclipse Git Plugin Update Site</name>
+ <name>Eclipse Git Plugin Update Site (Incubation)</name>
<dependencies>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>${jgit-version}</version>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <resolver>p2</resolver>
- <pomDependencies>consider</pomDependencies>
- </configuration>
- </plugin>
- </plugins>
- </build>
<!-- see http://issues.sonatype.org/browse/TYCHO-313 -->
<version>0.6.0</version>
diff --git a/org.eclipse.egit-updatesite/site.xml b/org.eclipse.egit-updatesite/site.xml
index 77f987634..03760fa59 100644
--- a/org.eclipse.egit-updatesite/site.xml
+++ b/org.eclipse.egit-updatesite/site.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<description url="Eclipse Git Plugin">
- This is a pure Java implementation of the Git version control system. The native Git version is also required in this version,
+ This is a pure Java implementation of the Git version control system. The native Git version is also required in this version.
</description>
<feature url="features/org.eclipse.egit_0.0.0.qualifier.jar" id="org.eclipse.egit" version="0.0.0" patch="true">
<category name="Eclipse Git Plugin (Incubation)"/>
</feature>
- <category-def name="Eclipse Git Plugin (Incubation)" label="Eclipse Git Plugin (Incubation)">
+ <category-def name="Eclipse Git Plugin (Incubation)" label="Eclipse Git Team Provider (Incubation)">
<description>
- Eclipse Git Plugin (Incubation)
+ Eclipse Git Team Provider (Incubation)
</description>
</category-def>
</site>
diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml
index c86b70fea..6c180e4e0 100644
--- a/org.eclipse.egit.core.test/pom.xml
+++ b/org.eclipse.egit.core.test/pom.xml
@@ -23,26 +23,23 @@
<packaging>eclipse-test-plugin</packaging>
<name>Test Plug-in (Incubation)</name>
+
<dependencies>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>${jgit-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jgit</groupId>
+ <artifactId>org.eclipse.jgit.junit</artifactId>
+ <version>${jgit-version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <resolver>p2</resolver>
- <pomDependencies>consider</pomDependencies>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-test-plugin</artifactId>
<version>${tycho-version}</version>
diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml
index dcf5277e7..968cff3e3 100644
--- a/org.eclipse.egit.core/pom.xml
+++ b/org.eclipse.egit.core/pom.xml
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>${jgit-version}</version>
</dependency>
</dependencies>
@@ -42,17 +42,6 @@
</excludes>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <resolver>p2</resolver>
- <pomDependencies>consider</pomDependencies>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml
index 6b7538c6f..5bb061c9d 100644
--- a/org.eclipse.egit.ui/pom.xml
+++ b/org.eclipse.egit.ui/pom.xml
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>${jgit-version}</version>
</dependency>
</dependencies>
@@ -42,16 +42,5 @@
</excludes>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <resolver>p2</resolver>
- <pomDependencies>consider</pomDependencies>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
diff --git a/pom.xml b/pom.xml
index 8aa798af8..a8048bd04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,10 +22,48 @@
<version>0.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>EGit Parent</name>
+ <name>EGit Parent (Incubation)</name>
+
+ <mailingLists>
+ <mailingList>
+ <name>egit-dev Mailing List</name>
+ <post>egit-dev@eclipse.org</post>
+ <subscribe>https://dev.eclipse.org/mailman/listinfo/egit-dev</subscribe>
+ <unsubscribe>https://dev.eclipse.org/mailman/listinfo/egit-dev</unsubscribe>
+ <archive>http://dev.eclipse.org/mhonarc/lists/egit-dev</archive>
+ </mailingList>
+
+ <mailingList>
+ <name>GIT Mailing List</name>
+ <post>git@vger.kernel.org</post>
+ <archive>http://marc.info/?l=git</archive>
+ </mailingList>
+ </mailingLists>
+
+ <issueManagement>
+ <url>https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;product=EGit;classification=Technology</url>
+ <system>Bugzilla</system>
+ </issueManagement>
+
+ <licenses>
+ <license>
+ <name>Eclipse Public License v1.0</name>
+ <comments>
+ All rights reserved.
+
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.htm
+ </comments>
+ </license>
+ </licenses>
<properties>
<tycho-version>0.6.0</tycho-version>
+ <jgit-version>0.6.0-SNAPSHOT</jgit-version>
+ <jgit-site>${project.baseUri}../../jgit/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/target/site</jgit-site>
+ <eclipse-site>http://download.eclipse.org/releases/galileo</eclipse-site>
</properties>
<modules>
@@ -43,7 +81,12 @@
<repository>
<id>galileo</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/releases/galileo</url>
+ <url>${eclipse-site}</url>
+ </repository>
+ <repository>
+ <id>jgit</id>
+ <layout>p2</layout>
+ <url>${jgit-site}</url>
</repository>
</repositories>
@@ -82,6 +125,15 @@
<encoding>ISO-8859-1</encoding>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <pomDependencies>consider</pomDependencies>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>

Back to the top