Date: Fri, 6 Nov 2015 19:28:42 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400953 - in head/devel/maven33: . files Message-ID: <201511061928.tA6JSge1027896@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Fri Nov 6 19:28:42 2015 New Revision: 400953 URL: https://svnweb.freebsd.org/changeset/ports/400953 Log: devel/maven33: fix mvn launcher PR: 204239 Submitted by: Jonathan Chen <jonc@chen.org.nz> Approved by: yerenkow@gmail.com (maintainer) Modified: head/devel/maven33/Makefile head/devel/maven33/files/mvn.sh.in Modified: head/devel/maven33/Makefile ============================================================================== --- head/devel/maven33/Makefile Fri Nov 6 18:57:01 2015 (r400952) +++ head/devel/maven33/Makefile Fri Nov 6 19:28:42 2015 (r400953) @@ -2,6 +2,7 @@ PORTNAME= maven33 DISTVERSION= 3.3.3 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= APACHE/maven/maven-3/${DISTVERSION}/binaries DISTNAME= apache-maven-${DISTVERSION}-bin Modified: head/devel/maven33/files/mvn.sh.in ============================================================================== --- head/devel/maven33/files/mvn.sh.in Fri Nov 6 18:57:01 2015 (r400952) +++ head/devel/maven33/files/mvn.sh.in Fri Nov 6 19:28:42 2015 (r400953) @@ -34,18 +34,12 @@ concat_lines() { fi } -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" -export MAVEN_CMD_LINE_ARGS - -JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" \ - $MAVEN_OPTS \ - -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \ - "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${CLASSWORLDS_LAUNCHER} "$@" - +JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \ + -classpath "${M2_HOME}/boot/%%CLASSWORLDS_JAR%%" \ + "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + org.codehaus.classworlds.Launcher "$@"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511061928.tA6JSge1027896>