c4daf2616b
pkgsrc changes:
- Add missing $PKG_SYSCONFDIR/logging directory and config file
- Improve Makefile readability
Changes in 3.2.3:
- Switch access to Maven Central to HTTPS (MNG-5672)
Changes in 3.2.2:
- Support version ranges in parent elements (MNG-2199)
- Requiring multiple profile activation conditions to be true does
not work (MNG-4565)
- Support resolution of Import Scope POMs from Repo that contains
a ${parameter} (MNG-5639)
- Update maven-plugin-plugin:descriptor default binding from
generate-resources phase to process-classes (MNG-5346)
- ${maven.build.timestamp} should use UTC instead of local timezone
(or be configurable) (MNG-5452)
- ${maven.build.timestamp} uses incorrect ISO datetime separator
(MNG-5647)
36 lines
1 KiB
Text
36 lines
1 KiB
Text
$NetBSD: patch-bin_mvn,v 1.3 2014/12/09 11:43:40 fhajny Exp $
|
|
|
|
Follow pkgsrc path convention.
|
|
|
|
--- bin/mvn.orig 2013-02-19 13:54:21.000000000 +0000
|
|
+++ bin/mvn
|
|
@@ -69,6 +69,15 @@ if [ -z "$JAVA_HOME" ] ; then
|
|
fi
|
|
fi
|
|
|
|
+if [ "$JAVA_HOME" = "" ] ; then
|
|
+ JAVA_HOME=@PKG_JAVA_HOME@
|
|
+fi
|
|
+
|
|
+if [ "$M2_HOME" = "" ] ; then
|
|
+ # try to find maven
|
|
+ M2_HOME=@PREFIX@
|
|
+fi
|
|
+
|
|
if [ -z "$M2_HOME" ] ; then
|
|
## resolve links - $0 may be a link to maven's home
|
|
PRG="$0"
|
|
@@ -166,7 +175,9 @@ fi
|
|
|
|
exec "$JAVACMD" \
|
|
$MAVEN_OPTS \
|
|
- -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
|
|
- "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
|
|
+ -classpath "${M2_HOME}"/lib/java/maven/boot/plexus-classworlds-*.jar \
|
|
+ "-Dclassworlds.conf=@PKG_SYSCONFDIR@/m2.conf" \
|
|
"-Dmaven.home=${M2_HOME}" \
|
|
- ${CLASSWORLDS_LAUNCHER} "$@"
|
|
\ No newline at end of file
|
|
+ "-Dorg.apache.maven.global-settings=@PKG_SYSCONFDIR@/settings.xml" \
|
|
+ "-Dorg.apache.maven.global-plugin-registry=@PKG_SYSCONFDIR@/plugin-registry.xml" \
|
|
+ ${CLASSWORLDS_LAUNCHER} "$@"
|