From c14a017aff2bd4ff8ed9ded4daf6f72d542c756c Mon Sep 17 00:00:00 2001
From: Matthias Sohn
Date: Wed, 30 Dec 2009 02:27:55 +0100
Subject: Adapt to JGit build which switched to Apache Felix
 maven-bundle-plugin

Add JGit plugin to EGit feature since JGit feature has been removed.

Configure p2 resolver to refer to org.eclipse.jgit pom-first artifact as
described in [1].

Add maven build output folders to .gitignore

[1] https://docs.sonatype.org/display/TYCHO/Dependency+on+pom-first+artifacts

Change-Id: I3bdf1186b7c5f4f14370109f1afdb5bdd97d4db9
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---
 org.eclipse.egit.core.test/.gitignore |  1 +
 org.eclipse.egit.core.test/pom.xml    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

(limited to 'org.eclipse.egit.core.test')

diff --git a/org.eclipse.egit.core.test/.gitignore b/org.eclipse.egit.core.test/.gitignore
index 5e56e040ec..c87594b161 100644
--- a/org.eclipse.egit.core.test/.gitignore
+++ b/org.eclipse.egit.core.test/.gitignore
@@ -1 +1,2 @@
 /bin
+target
diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml
index 6371a75acc..c86b70feae 100644
--- a/org.eclipse.egit.core.test/pom.xml
+++ b/org.eclipse.egit.core.test/pom.xml
@@ -23,9 +23,25 @@
   <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>
+    </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>
-- 
cgit v1.2.3