From f7ab45d6f6ceb405b392df2bcd51c67eaf232d6c Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Mon, 2 Jun 2014 15:01:23 -0400
Subject: Use xmvn instead of mvn-rpmbuild, and handle <relativePath>.

---
 prepTestBundle.sh    | 1 +
 runAllTestBundles.sh | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/prepTestBundle.sh b/prepTestBundle.sh
index 0271c62..694857f 100755
--- a/prepTestBundle.sh
+++ b/prepTestBundle.sh
@@ -49,6 +49,7 @@ mv ${jarPomPath} .
 rm -rf 'META-INF/maven'
 
 # set the parent
+sed -i '/<relativePath>/ d' pom.xml
 sed -i '/<parent>/,/<\/parent>/ s/<artifactId>.*<\/artifactId>/<artifactId>org.eclipse.tycho.surefire.testbundlerunner<\/artifactId>/ ' pom.xml
 sed -i '/<parent>/,/<\/parent>/ s/<groupId>.*<\/groupId>/<groupId>org.eclipse.tycho<\/groupId>/ ' pom.xml
 sed -i '/<parent>/,/<\/parent>/ s/<version>.*<\/version>/<version>1.0.0-SNAPSHOT<\/version>/ ' pom.xml
diff --git a/runAllTestBundles.sh b/runAllTestBundles.sh
index 97564d6..a198940 100755
--- a/runAllTestBundles.sh
+++ b/runAllTestBundles.sh
@@ -6,7 +6,7 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 
-# Run Tycho Surefire on a set of an Eclipse Test Bundles
+# Run Tycho Surefire on a set of Eclipse Test Bundles
 
 # The definiton of an Eclipse Test Bundle for our purposes is any packaged
 # OSGi bundle containing a pom.xml with a packaging type of
@@ -26,4 +26,4 @@ for jar in `find ${testBundleFolder} -name "*.jar"`; do
   unzip -p ${jar} ${jarPomPath} | grep -q '<packaging>eclipse-test-plugin</packaging>' && ./prepTestBundle.sh ${jar}
 done
 
-mvn-rpmbuild -fae -DskipTychoVersionCheck org.eclipse.tycho:tycho-surefire-plugin:test
+xmvn -o -fae org.eclipse.tycho:tycho-surefire-plugin:test
-- 
cgit