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
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>
-rw-r--r--org.eclipse.egit-feature/.gitignore1
-rw-r--r--org.eclipse.egit-feature/feature.xml8
-rw-r--r--org.eclipse.egit-updatesite/.gitignore1
-rw-r--r--org.eclipse.egit-updatesite/pom.xml21
-rw-r--r--org.eclipse.egit-updatesite/site.xml3
-rw-r--r--org.eclipse.egit.core.test/.gitignore1
-rw-r--r--org.eclipse.egit.core.test/pom.xml16
-rw-r--r--org.eclipse.egit.core/.gitignore1
-rw-r--r--org.eclipse.egit.core/pom.xml19
-rw-r--r--org.eclipse.egit.ui/.gitignore1
-rw-r--r--org.eclipse.egit.ui/pom.xml19
-rw-r--r--org.eclipse.egit/.gitignore1
12 files changed, 88 insertions, 4 deletions
diff --git a/org.eclipse.egit-feature/.gitignore b/org.eclipse.egit-feature/.gitignore
new file mode 100644
index 000000000..eb5a316cb
--- /dev/null
+++ b/org.eclipse.egit-feature/.gitignore
@@ -0,0 +1 @@
+target
diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml
index f9ed1f7f9..5c7817010 100644
--- a/org.eclipse.egit-feature/feature.xml
+++ b/org.eclipse.egit-feature/feature.xml
@@ -15,7 +15,6 @@ An Eclipse Git Team provider in pure Java.
Changes on @branch@ since @refversion@:
<![CDATA[@shortlog@]]>
-
</description>
<copyright>
@@ -69,4 +68,11 @@ 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-updatesite/.gitignore b/org.eclipse.egit-updatesite/.gitignore
new file mode 100644
index 000000000..eb5a316cb
--- /dev/null
+++ b/org.eclipse.egit-updatesite/.gitignore
@@ -0,0 +1 @@
+target
diff --git a/org.eclipse.egit-updatesite/pom.xml b/org.eclipse.egit-updatesite/pom.xml
index a12a5879c..8515a1f40 100644
--- a/org.eclipse.egit-updatesite/pom.xml
+++ b/org.eclipse.egit-updatesite/pom.xml
@@ -24,6 +24,27 @@
<name>Eclipse Git Plugin Update Site</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>
+ </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 d9e4adfb4..77f987634 100644
--- a/org.eclipse.egit-updatesite/site.xml
+++ b/org.eclipse.egit-updatesite/site.xml
@@ -6,9 +6,6 @@
<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>
- <feature url="features/org.eclipse.jgit_0.0.0.qualifier.jar" id="org.eclipse.jgit" version="0.0.0">
- <category name="Eclipse Git Plugin (Incubation)"/>
- </feature>
<category-def name="Eclipse Git Plugin (Incubation)" label="Eclipse Git Plugin (Incubation)">
<description>
Eclipse Git Plugin (Incubation)
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>
diff --git a/org.eclipse.egit.core/.gitignore b/org.eclipse.egit.core/.gitignore
index ba077a403..d567ba01e 100644
--- a/org.eclipse.egit.core/.gitignore
+++ b/org.eclipse.egit.core/.gitignore
@@ -1 +1,2 @@
bin
+target
diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml
index 4aca30577..dcf5277e7 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>
diff --git a/org.eclipse.egit.ui/.gitignore b/org.eclipse.egit.ui/.gitignore
index ba077a403..d567ba01e 100644
--- a/org.eclipse.egit.ui/.gitignore
+++ b/org.eclipse.egit.ui/.gitignore
@@ -1 +1,2 @@
bin
+target
diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml
index 97d8a724e..6b7538c6f 100644
--- a/org.eclipse.egit.ui/pom.xml
+++ b/org.eclipse.egit.ui/pom.xml
@@ -24,6 +24,14 @@
<name>Git Team Provider (UI) (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,5 +42,16 @@
</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/.gitignore b/org.eclipse.egit/.gitignore
new file mode 100644
index 000000000..eb5a316cb
--- /dev/null
+++ b/org.eclipse.egit/.gitignore
@@ -0,0 +1 @@
+target

Back to the top