From 0cc6979ba19fbf51f1fc95727561a835f956666d Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 23 Dec 2013 10:40:37 +0100
Subject: [PATCH] Read user and system config files in maven-script

---
 maven-script | 11 +++++++++++
 maven.spec   |  5 ++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/maven-script b/maven-script
index 0792f41..5ee3af3 100644
--- a/maven-script
+++ b/maven-script
@@ -1,4 +1,15 @@
 #!/bin/sh
+
+# Source system prefs
+if [ -f /etc/java/maven.conf ] ; then
+  . /etc/java/maven.conf
+fi
+
+# Source user prefs
+if [ -f $HOME/.mavenrc ] ; then
+  . $HOME/.mavenrc
+fi
+
 if [ -f /usr/share/java-utils/java-functions ] ; then
   . /usr/share/java-utils/java-functions
   set_jvm
diff --git a/maven.spec b/maven.spec
index db09d94..74d127a 100644
--- a/maven.spec
+++ b/maven.spec
@@ -1,6 +1,6 @@
 Name:           maven
 Version:        3.1.1
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Java project management and project comprehension tool
 
 Group:          Development/Tools
@@ -268,6 +268,9 @@ ln -sf $(build-classpath plexus/classworlds) \
 
 
 %changelog
+* Mon Dec 23 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-15
+- Read user and system config files in maven-script
+
 * Wed Nov 13 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-14
 - Update to Sisu 0.1.0 and Guice 3.1.6