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/pom.xml
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/pom.xml')
-rw-r--r--org.eclipse.egit.core/pom.xml19
1 files changed, 19 insertions, 0 deletions
diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml
index 4aca30577f..dcf5277e7f 100644
--- a/org.eclipse.egit.core/pom.xml
+++ b/org.eclipse.egit.core/pom.xml
@@ -24,6 +24,14 @@
<name>Git Team Provider (Core) (Incubation)</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jgit</groupId>
+ <artifactId>org.eclipse.jgit</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
<!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
<build>
<resources>
@@ -34,6 +42,17 @@
</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>

Back to the top