Drop dependency on javapackages-tools
This commit is contained in:
parent
08c5f55d99
commit
f7004f1462
@ -1,14 +1,14 @@
|
|||||||
From 056c94f86450c7c27f5bb11f98653c73bfe3d8e4 Mon Sep 17 00:00:00 2001
|
From 247eafd819d6092661ebc57c54815acd20abd3de Mon Sep 17 00:00:00 2001
|
||||||
From: Michael Simacek <msimacek@redhat.com>
|
From: Michael Simacek <msimacek@redhat.com>
|
||||||
Date: Wed, 1 Feb 2017 14:54:26 +0100
|
Date: Wed, 1 Feb 2017 14:54:26 +0100
|
||||||
Subject: [PATCH 1/4] Adapt mvn script
|
Subject: [PATCH 1/4] Adapt mvn script
|
||||||
|
|
||||||
---
|
---
|
||||||
apache-maven/src/bin/mvn | 17 +++++++++++++++--
|
apache-maven/src/bin/mvn | 9 +++++++--
|
||||||
1 file changed, 15 insertions(+), 2 deletions(-)
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
|
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
|
||||||
index a554c6617..0c07ba6e2 100755
|
index a554c6617..739501af4 100755
|
||||||
--- a/apache-maven/src/bin/mvn
|
--- a/apache-maven/src/bin/mvn
|
||||||
+++ b/apache-maven/src/bin/mvn
|
+++ b/apache-maven/src/bin/mvn
|
||||||
@@ -22,7 +22,7 @@
|
@@ -22,7 +22,7 @@
|
||||||
@ -20,13 +20,11 @@ index a554c6617..0c07ba6e2 100755
|
|||||||
# MAVEN_OPTS (Optional) Java runtime options used when Maven is executed.
|
# MAVEN_OPTS (Optional) Java runtime options used when Maven is executed.
|
||||||
# MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files.
|
# MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files.
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
@@ -33,12 +33,24 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
|
@@ -33,12 +33,16 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
|
||||||
. /etc/mavenrc
|
. /etc/mavenrc
|
||||||
fi
|
fi
|
||||||
|
|
||||||
+ if [ -f /etc/java/maven.conf ] ; then
|
|
||||||
+ . /etc/java/maven.conf
|
+ . /etc/java/maven.conf
|
||||||
+ fi
|
|
||||||
+
|
+
|
||||||
if [ -f "$HOME/.mavenrc" ] ; then
|
if [ -f "$HOME/.mavenrc" ] ; then
|
||||||
. "$HOME/.mavenrc"
|
. "$HOME/.mavenrc"
|
||||||
@ -34,18 +32,12 @@ index a554c6617..0c07ba6e2 100755
|
|||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
+if [ -f /usr/share/java-utils/java-functions ] ; then
|
|
||||||
+ . /usr/share/java-utils/java-functions
|
|
||||||
+ set_jvm
|
|
||||||
+ set_javacmd
|
|
||||||
+fi
|
|
||||||
+export JAVA_HOME
|
+export JAVA_HOME
|
||||||
+export JAVACMD
|
|
||||||
+
|
+
|
||||||
# OS specific support. $var _must_ be set to either true or false.
|
# OS specific support. $var _must_ be set to either true or false.
|
||||||
cygwin=false;
|
cygwin=false;
|
||||||
mingw=false;
|
mingw=false;
|
||||||
@@ -63,7 +75,8 @@ done
|
@@ -63,7 +67,8 @@ done
|
||||||
|
|
||||||
saveddir=`pwd`
|
saveddir=`pwd`
|
||||||
|
|
||||||
|
@ -85,10 +85,6 @@ Requires(post): chkconfig
|
|||||||
Requires(postun): chkconfig
|
Requires(postun): chkconfig
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Require full javapackages-tools since maven-script uses
|
|
||||||
# /usr/share/java-utils/java-functions
|
|
||||||
Requires: javapackages-tools
|
|
||||||
|
|
||||||
%if 0%{?module_prefix:1}
|
%if 0%{?module_prefix:1}
|
||||||
%description -n %{module_prefix}%{name}
|
%description -n %{module_prefix}%{name}
|
||||||
%{summary}.
|
%{summary}.
|
||||||
|
Loading…
Reference in New Issue
Block a user