forked from pool/maven
This commit is contained in:
parent
8396570b93
commit
30f090199e
@ -20,7 +20,7 @@ index a554c66..818cf70 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
|
@@ -37,12 +37,24 @@
|
||||||
. /etc/mavenrc
|
. /etc/mavenrc
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -45,7 +45,7 @@ index a554c66..818cf70 100755
|
|||||||
# 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
|
@@ -67,7 +79,8 @@
|
||||||
|
|
||||||
saveddir=`pwd`
|
saveddir=`pwd`
|
||||||
|
|
||||||
@ -55,7 +55,7 @@ index a554c66..818cf70 100755
|
|||||||
|
|
||||||
# make it fully qualified
|
# make it fully qualified
|
||||||
MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
|
MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
|
||||||
@@ -102,7 +115,7 @@ if [ ! -x "$JAVACMD" ] ; then
|
@@ -105,7 +118,7 @@
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ diff --git a/pom.xml b/pom.xml
|
|||||||
index 237cdc39e..85436c54d 100644
|
index 237cdc39e..85436c54d 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -328,7 +328,6 @@ under the License.
|
@@ -334,7 +334,6 @@
|
||||||
<groupId>org.apache.maven.wagon</groupId>
|
<groupId>org.apache.maven.wagon</groupId>
|
||||||
<artifactId>wagon-http</artifactId>
|
<artifactId>wagon-http</artifactId>
|
||||||
<version>${wagonVersion}</version>
|
<version>${wagonVersion}</version>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user