[java-sig-commits] [javapackages] Fix local repository setting in mvn-rpmbuild

[Mikolaj Izdebski]

commit 16e13ceb5f234b23d1495d9a8ed3ab3f20e8cacb
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Mon Sep 9 18:36:41 2013 +0200

    Fix local repository setting in mvn-rpmbuild

 bin/mvn-rpmbuild |   25 +++++++++----------------
 1 files changed, 9 insertions(+), 16 deletions(-)
---
diff --git a/bin/mvn-rpmbuild b/bin/mvn-rpmbuild
index 387ba97..cf80d72 100755
--- a/bin/mvn-rpmbuild
+++ b/bin/mvn-rpmbuild
@@ -40,11 +40,17 @@ depmap=
 for arg in "$@"; do
     if egrep -q '^-Dmaven\.local\.depmap\.file=' <<<"$arg"; then
 	depmap=$(sed 's/[^=]*=//' <<<"$arg")
-	depmap="
-    <!-- Use local depmap file. -->
+
+	mkdir -p .xmvn/config.d
+	cat >>.xmvn/config.d/mvn-rpmbuild-config.xml <<EOF
+<configuration>
+  <resolverSettings>
     <metadataRepositories>
       <repository>$depmap</repository>
-    </metadataRepositories>"
+    </metadataRepositories>
+  </resolverSettings>
+</configuration>
+EOF
     fi
 done
 
@@ -60,19 +66,6 @@ done
 
 export MAVEN_OPTS="$MAVEN_OPTS $repo_arg"
 
-mkdir -p .xmvn/config.d
-cat >>.xmvn/config.d/mvn-rpmbuild-config.xml <<EOF
-<configuration>
-  <resolverSettings>
-    <!-- XMvn default repo location is .xm2, but for backwards-compatibility
-         we use $repo if called as mvn-rpmbuild. -->
-    <localRepositories>
-      <repository>$repo</repository>
-    </localRepositories>$depmap
-  </resolverSettings>
-</configuration>
-EOF
-
 # Allow -Dmaven.local.effective.pom=false to be used to disable
 # resolution from effective POM repository.
 XMVN_COMPAT=19-rpmbuild