From 5c690b6a2b337d467f7e47b69fd960a1c11d987c Mon Sep 17 00:00:00 2001
From: Matthias Sohn <matthias.sohn@sap.com>
Date: Tue, 11 May 2010 14:52:15 +0200
Subject: [PATCH] Use jgit p2 repository to resolve jgit dependencies

EGit Tycho builds on build.eclipse.org frequently hit corrupted artifacts
which leads to broken builds. Cleaning up these corrupted files is tedious
since it requires file system access on the build server. Hence we want to
switch to use job-local m2 repositories. This requires that build artifacts
are shared between the jgit and egit build jobs via p2. Therefore we switch
from pom-first to p2 build dependencies between the egit and the jgit build.

For local builds the egit build assumes that jgit and egit are located
under a common parent folder. If this is not the case the URL of the jgit
update site has to be injected via system property "jgit-site".

- non-default local build:
$ mvn clean install -Djgit-site=file:/path/to/org.eclipse.jgit.updatesite/target/site

- hudson build on build.eclipse.org
$ mvn clean install -Djgit-site=https://build.eclipse.org/hudson/job/jgit/
              lastSuccessfulBuild/artifact/org.eclipse.jgit.packaging/
              org.eclipse.jgit.updatesite/target/site/

Change-Id: I43ee21f23d474a6579df187869c821fc3960583f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---
 org.eclipse.egit-feature/pom.xml    |  8 --------
 org.eclipse.egit-updatesite/pom.xml | 13 -------------
 org.eclipse.egit.core.test/pom.xml  | 13 -------------
 org.eclipse.egit.core/pom.xml       |  8 --------
 org.eclipse.egit.ui.test/pom.xml    | 13 -------------
 org.eclipse.egit.ui/pom.xml         |  8 --------
 pom.xml                             | 16 ++++++----------
 7 files changed, 6 insertions(+), 73 deletions(-)

diff --git a/org.eclipse.egit-feature/pom.xml b/org.eclipse.egit-feature/pom.xml
index c04756ad..67716354 100644
--- a/org.eclipse.egit-feature/pom.xml
+++ b/org.eclipse.egit-feature/pom.xml
@@ -24,12 +24,4 @@
 
   <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/pom.xml b/org.eclipse.egit-updatesite/pom.xml
index ab01bab3..782b888f 100644
--- a/org.eclipse.egit-updatesite/pom.xml
+++ b/org.eclipse.egit-updatesite/pom.xml
@@ -26,19 +26,6 @@
   <!-- see http://issues.sonatype.org/browse/TYCHO-313 -->
   <version>0.8.0</version>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jgit</groupId>
-      <artifactId>org.eclipse.jgit</artifactId>
-      <version>${jgit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jgit</groupId>
-      <artifactId>org.eclipse.jgit.feature</artifactId>
-      <version>${jgit-version}</version>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>
diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml
index b19d6eaa..d8cf8187 100644
--- a/org.eclipse.egit.core.test/pom.xml
+++ b/org.eclipse.egit.core.test/pom.xml
@@ -24,19 +24,6 @@
 
   <name>Test Plug-in (Incubation)</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jgit</groupId>
-      <artifactId>org.eclipse.jgit</artifactId>
-      <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>
diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml
index 5abf4416..6c7a2bd5 100644
--- a/org.eclipse.egit.core/pom.xml
+++ b/org.eclipse.egit.core/pom.xml
@@ -24,14 +24,6 @@
 
   <name>Git Team Provider (Core) (Incubation)</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jgit</groupId>
-      <artifactId>org.eclipse.jgit</artifactId>
-      <version>${jgit-version}</version>
-    </dependency>
-  </dependencies>
-
   <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
   <build>
     <resources>
diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml
index 6bfc5e6a..38f80353 100644
--- a/org.eclipse.egit.ui.test/pom.xml
+++ b/org.eclipse.egit.ui.test/pom.xml
@@ -37,19 +37,6 @@
     </repository>
   </repositories>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jgit</groupId>
-      <artifactId>org.eclipse.jgit</artifactId>
-      <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>
diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml
index 4d3769d5..23953569 100644
--- a/org.eclipse.egit.ui/pom.xml
+++ b/org.eclipse.egit.ui/pom.xml
@@ -24,14 +24,6 @@
 
   <name>Git Team Provider (UI) (Incubation)</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jgit</groupId>
-      <artifactId>org.eclipse.jgit</artifactId>
-      <version>${jgit-version}</version>
-    </dependency>
-  </dependencies>
-
   <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
   <build>
     <resources>
diff --git a/pom.xml b/pom.xml
index df22dd38..f3033c2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,8 +61,8 @@
 
   <properties>
     <tycho-version>0.8.0</tycho-version>
-    <jgit-version>0.8.0-SNAPSHOT</jgit-version>
     <platform-version-name>ganymede</platform-version-name>
+    <jgit-site>file:/${basedir}/../../jgit/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/target/site</jgit-site>
     <eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
     <swtbot-site>http://download.eclipse.org/technology/swtbot/${platform-version-name}/dev-build/update-site</swtbot-site>
   </properties>
@@ -121,6 +121,11 @@
 
   <repositories>
     <repository>
+      <id>jgit</id>
+      <layout>p2</layout>
+      <url>${jgit-site}</url>
+    </repository>
+    <repository>
       <id>ganymede</id>
       <layout>p2</layout>
       <url>${eclipse-site}</url>
@@ -172,15 +177,6 @@
           <artifactId>maven-antrun-plugin</artifactId>
           <version>1.3</version>
         </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>
-- 
2.11.4.GIT