Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2009-12-30 01:27:55 +0000
committerMatthias Sohn2009-12-30 12:03:10 +0000
commitc14a017aff2bd4ff8ed9ded4daf6f72d542c756c (patch)
treedcadd9bfafa7cb7e82afcaa3886f14855cdc78f4 /org.eclipse.egit.core.test
parent10564f315f2e755302c24af4064281e2ed0f2711 (diff)
downloadegit-c14a017aff2bd4ff8ed9ded4daf6f72d542c756c.tar.gz
egit-c14a017aff2bd4ff8ed9ded4daf6f72d542c756c.tar.xz
egit-c14a017aff2bd4ff8ed9ded4daf6f72d542c756c.zip
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>
Diffstat (limited to 'org.eclipse.egit.core.test')
-rw-r--r--org.eclipse.egit.core.test/.gitignore1
-rw-r--r--org.eclipse.egit.core.test/pom.xml16
2 files changed, 17 insertions, 0 deletions
diff --git a/org.eclipse.egit.core.test/.gitignore b/org.eclipse.egit.core.test/.gitignore
index 5e56e040e..c87594b16 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 6371a75ac..c86b70fea 100644
--- a/org.eclipse.egit.core.test/pom.xml
+++ b/org.eclipse.egit.core.test/pom.xml
@@ -23,10 +23,26 @@
<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>
<version>${tycho-version}</version>

Back to the top