commit 2f9257426482df83e76df2137dbc60a0f05bc7ba Author: Mikolaj Izdebski mizdebsk@redhat.com Date: Wed Mar 6 11:11:39 2013 +0100
Update mvn-rpmbuild to support XMvn 0.4.0
scripts/mvn-local | 3 +++ scripts/mvn-rpmbuild | 26 ++++++++++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) --- diff --git a/scripts/mvn-local b/scripts/mvn-local index 3dc0b09..c278c30 100755 --- a/scripts/mvn-local +++ b/scripts/mvn-local @@ -35,4 +35,7 @@ export TYCHO_MVN_LOCAL=true unset TYCHO_MVN_RPMBUILD export TYCHO_MVN_RPMBUILD
+# Maven needs to have M2_HOME exported. See: rhbz#912333 +export M2_HOME=/usr/share/maven + exec xmvn "${@}" diff --git a/scripts/mvn-rpmbuild b/scripts/mvn-rpmbuild index f370793..26dcb55 100755 --- a/scripts/mvn-rpmbuild +++ b/scripts/mvn-rpmbuild @@ -30,24 +30,34 @@ # # Authors: Mikolaj Izdebski mizdebsk@redhat.com
-# XMvn default repo location is .xm2, but for backwards-compatibility -# we use .m2 if called as mvn-rpmbuild. -: "${XMVN_REPO_LOCAL:=.m2}" -export XMVN_REPO_LOCAL - # A marker informing Tycho that mvn-rpmbuild was ran. export TYCHO_MVN_RPMBUILD=true unset TYCHO_MVN_LOCAL export TYCHO_MVN_LOCAL
# Support local depmaps -XMVN_RESOLV_DEPMAPS=, +depmap=/some/nonexistent/path for arg in "$@"; do if egrep -q '^-Dmaven.local.depmap.file=' <<<"$arg"; then - XMVN_RESOLV_DEPMAPS="$XMVN_RESOLV_DEPMAPS,"$(sed 's/[^=]*=//' <<<"$arg") + depmap="$XMVN_RESOLV_DEPMAPS,"$(sed 's/[^=]*=//' <<<"$arg") fi done -export XMVN_RESOLV_DEPMAPS + +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 .m2 if called as mvn-rpmbuild. --> + <localRepositories> + <repository>.m2</repository> + <localRepositories> + <metadataRepositories> + <repository>$depmap</repository> + </metadataRepositories> + </resolverSettings> +</configuration> +EOF
# Install maven metadata for plugins in groups org.apache.maven.plugins # and org.codehaus.mojo. This is to allow plugins in these groups to be
java-sig-commits@lists.fedoraproject.org