[eclipse-jgit] Use maven repo as p2 repo

[Mat Booth]

commit 29fb5a22fba2028f8c4100be14f13834f711c32a
Author: Mat Booth <mat.booth at redhat.com>
Date:   Tue Nov 11 14:22:42 2014 +0000

    Use maven repo as p2 repo

 eclipse-jgit.spec |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec
index fef8a97..420b374 100644
--- a/eclipse-jgit.spec
+++ b/eclipse-jgit.spec
@@ -57,13 +57,17 @@ Command line Git tool built entirely in Java.
 #javaewah change
 sed -i -e "s/javaewah/com.googlecode.javaewah.JavaEWAH/g" org.eclipse.jgit.packaging/org.eclipse.jgit{,.pgm}.feature/feature.xml
 
-#don't try to get it from local *maven* repo, use tycho resolved one
+# Don't try to get deps from local *maven* repo, use tycho resolved ones
 %pom_remove_dep com.googlecode.javaewah:JavaEWAH
+for p in $(find org.eclipse.jgit.packaging -name pom.xml) ; do
+  grep -q dependencies $p && %pom_xpath_remove "pom:dependencies" $p
+done
 
 #those bundles don't compile with latest jetty
 %pom_disable_module org.eclipse.jgit.http.test
 %pom_disable_module org.eclipse.jgit.pgm.test
 %pom_disable_module org.eclipse.jgit.junit.http
+%pom_disable_module org.eclipse.jgit.junit.feature org.eclipse.jgit.packaging
 
 %pom_disable_module org.eclipse.jgit.ant.test
 %pom_disable_module org.eclipse.jgit.java7.test
@@ -73,11 +77,8 @@ sed -i -e "s/javaewah/com.googlecode.javaewah.JavaEWAH/g" org.eclipse.jgit.packa
 %pom_disable_module org.eclipse.jgit.target org.eclipse.jgit.packaging
 %pom_disable_module org.eclipse.jgit.repository org.eclipse.jgit.packaging
 %pom_xpath_remove "pom:build/pom:pluginManagement/pom:plugins/pom:plugin/pom:configuration/pom:target" org.eclipse.jgit.packaging/pom.xml
-for p in $(find org.eclipse.jgit.packaging -name pom.xml) ; do
-  grep -q dependencies $p && %pom_xpath_remove "pom:dependencies" $p
-done
 
-%pom_disable_module org.eclipse.jgit.junit.feature org.eclipse.jgit.packaging
+# Don't build source features
 %pom_disable_module org.eclipse.jgit.source.feature org.eclipse.jgit.packaging
 %pom_disable_module org.eclipse.jgit.pgm.source.feature org.eclipse.jgit.packaging
 %pom_disable_module org.eclipse.jgit.http.apache.feature org.eclipse.jgit.packaging
@@ -97,9 +98,9 @@ sed -i -e 's/0.7.9,0.8.0/0.7.9,0.9.0/g' org.eclipse.jgit.test/META-INF/MANIFEST.
 %mvn_build -f --post install:install \
   -- -Dmaven.repo.local=$(pwd)/org.eclipse.jgit.packaging/.m2
 
-# Second invocation builds the eclipse plugin
+# Second invocation builds the eclipse features
 pushd org.eclipse.jgit.packaging
-%mvn_build -j -f
+%mvn_build -j -f -- -Dfedora.p2.repos=$(pwd)/.m2
 popd
 
 %install