CVS commit: pkgsrc/devel/apache-maven

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Wed Sep  6 10:17:51 UTC 2017

Modified Files:
        pkgsrc/devel/apache-maven: Makefile PLIST distinfo
        pkgsrc/devel/apache-maven/patches: patch-bin_m2.conf patch-bin_mvn

Log Message:
Update devel/apache-maven to 3.5.0.

3.5.0

Bugs
- Site should tell 'prerequisites.maven is deprecated'
- UnsupportedOperationException thrown when version range is not correct
  in dependencyManagement definitions
- ClosedChannelException from DefaultUpdateCheckManager.read
- "mvn.cmd" does not indicate failure properly when using "&&"
- mvnDebug doesn't work with M2_HOME with spaces - missing quotes
- mvn shell script fails with syntax error on Solaris 10
- logging config is overridden by $M2_HOME/lib/ext/*.jar
- mvn shell script invokes /bin/sh but requires Bash functions
- Problem with CI friendly usage of '${..}'' which is already defined
  via property in pom file.
- java.lang.String cannot be cast to
  org.apache.maven.lifecycle.mapping.LifecyclePhase
- Maven possibly not aware of log4j2
- mvn.cmd fails when the current directory has spaces in between
- mvn.cmd does not return ERROR_CODE
- mvn.cmd fails if directory contains an ampersand (&)
- Unsafe System Properties copy in MavenRepositorySystemUtils, causing
  NPEs
- Problem with CI friendly usage of '${..} reactor order is changed
- CI friendly properties break submodule builds
- properties.internal.SystemProperties.addSystemProperties() is not
  really thread-safe
- PluginDescriptor doesn't read since value of parameter
- ${session.parallel} not correctly set
- DefaultWagonManagerTest#testGetMissingJarForced() passed incorrect
  value
- mvn dependency:go-offline fails due to missing transitive dependency
  jdom:jdom:jar:1.1
- Fix unclosed streams
- NPE in cases using Multithreaded -T X versions:set
  -DnewVersion=1.0-SNAPSHOT
- REGRESSION: WARNING about usage of a non threadsafe marked plugin is
  not showed anymore
- Precedence of command-line system property options has changed
- MavenSession.getAllProjects() should return all projects in the
  reactor
- Javadoc errors prevent release with Java 8
- The --file command line option of the Windows and Unix launchers does
  not work for directory names like "Spaces & Special Char"
- groupId has plain color when goal fails
- HttpClient produces a lot of noise at debug loglevel
- Dependency management debug message corrections.
- maven-resolver-provider's DefaultArtifactDescriptorReader has
  mismatched constructor and initService methods
- mvn -f complains about illegal readlink option under macOS
- distribution zip file has unordered entries
- Use consistent quoting forms in mvn launcher script
- mvn script fails to locate .mvn directory when pom.xml location
  specified with -f

Dependency upgrade
- Dependency updates
- Upgrade Aether to Maven Resolver

Improvements
- Unify error output/check logic from shell and batch scripts
- Don't use M2_HOME in mvn shell/command scripts anymore
- Silence unnecessary legacy local repository warning
- .mvn directory should be picked when using --file
- Remove the whole Ant build
- Fixing documentation
- String handling issues identified by PMD
- Fix links etc. in README.txt which is part of the delivery
- Default plugin version updates
- Use Java 7's SimpleDateFormat in CLIReportingUtils#formatTimestamp
- Improve output readability of our MavenTransferListener
  implementations
- Confusing error message in case of missing/empty artifactId and
  version in pluginManagement
- Replace %HOME% with %USERPROFILE% in mvn.cmd
- Drastically reduce JAVA_HOME discovery code
- Removing ArtifactHandler for ejb3 lifecycle
- Removing ArtifactHandler for par lifecycle
- ReactorModelCache not used effectively after maven version 3.0.5 which
  cause a large memory footprint
- WARNING during build based on absolute path in assembly-descriptor.
- Document default scope compile in pom XSD and reference documentation
- Can't overwrite properties which have been defined in
  .mvn/maven.config
- Log refactoring - Method Invocation Replaced By Variable
- Introduce ${maven.conf} in m2.conf
- Add Jansi native library search path to our start scripts to avoid
  extraction to temp file on each run
- Remove non-existent m2 include in component.xml
- Several small stylistic and spelling improvements to code and
  documentation
- 'MetadataResolutionResult#getGraph()'' contains duplicate if clause
- Javadoc improvements for 3.5.0
- Introduce CLASSWORLDS_JAR in shell startup scripts
- Deprecate and replace incorrectly spelled public API
- Remove unused prerequisites
- Replace doclettag explanation with annotations in AbstractMojo javadoc
- WARN if maven-site-plugin configuration contains reportPlugins element

New Features
- ANSI color logging for improved output visibility
- add support for module name != artifactId in every calculated URLs
  (project, SCM, site): special project.directory property
- create a slf4j-simple provider extension that supports level color
  rendering
- ModelResolver interface enhancement: addition of
  resolveModel(Dependency) supporting version ranges

Tasks
- Remove outdated maven-embedder/src/main/resources/META-INF/MANIFEST.MF
- Remove maven.home default value setter from m2.conf
- Upgrade Maven Wagon from 2.10 to 2.12
- Clean up duplicate dependencies caused by incomplete Wagon HTTP
  Provider exclusions
- Remove obsolete message_*.properties from maven-core
- update documentation's dependency graph with resolver +
  resolver-provider + slf4j-provider
- Force Push master from 737de43e392fc15a0ce366db98d70aa18b3f6c03
- Add a Jenkinsfile so that builds.apache.org can use multibranch
  pipeline

Wishes
- Support version ranges in parent elements
- after forked execution success, add an empty line
- warn if prerequisites.maven is used for non-plugin projects

3.3.9

Bug
- default-value on mojo parameter of type collection or array
  effectively make parameter read-only
- Properties on command line with leading or trailing quotes are
  stripped
- Possible NullPointerException in org.apache.maven.repository.
  MetadataResolutionResult
- Variable maven.multiModuleProjectDirectory may be set incorrectly
- Moving from Maven 3.0.5 to 3.3.3 breaks plugins with some dependencies
  on the class path
- mvn fails when the current directory is a root drive on Windows
- Project base dir not fully working in Cygwin
- Make MAVEN_OPTS env variable with mvnDebug correctly
- Empy maven.config cause Maven to exit with failure
- <relativePath> is used if the groupId and artifactId match
  irrespective of the version
- mvn script fails to locate .mvn in current directory
- maven-aether-provider/maven-compat does not always generate snapshot
  versions using Gregorian calendar year
- Nonportable shell constructs cause bin/mvn errors on Debian
- mvn script doesn't handle directories containing spaces
- Broken link of ' Building Maven' in README.md on Github
- Log file command line option description contains an extra word
- Multi-module build with ear fails to resolve war in 3.3.3
- org.apache.maven.repository.internal.RemoteSnapshotMetadataTest fails
  to start at midnight
- Maven selects wrong JVM

Improvement
- Use Commons Lang's Validate to intercept invalid input
- Custom packaging types: configuring DefaultLifecycleMapping mojo
  executions
- Close IO Streams in finally or try-with-resource statement
- make url inheritance algorithm more visible
- Update used modello version from 1.8.1 to 1.8.3
- Removing par lifecycle from default life cycle bindings
- Make used plugin version for maven-resources-plugin in
  default-bindings.xml consistent
- Removed binding for maven-ejb3-plugin from default binding
- Maven build does not work with Maven 2.2.1
- Use canonical name for UTC timezone
- Upgrade maven-parent to version 27
- Upgrade Wagon version to 2.10
- Upgraded to plexus-component-* 1.6 that uses asm 5.x
- Upgrade plexus-utils to 3.0.22 to support combine.id as configuration
  attribute for Map merging
- Switch to official Guice 4.0
- Upgrade to Eclipse/Sisu 0.3.2
- Update animal-sniffer-maven-plugin to 1.14. MANIMALSNIFFER-49 required
  when building with JDK9

3.3.3

Bug
- ssh-wagon hangs
- same class realm registered both with plugin and extensions realm
  caches
- Maven extensions can not be retrieved from authenticated repositories
- 'mvn deploy' sends HTTP User-Agent twice

Improvement
- Warn about Proxies with duplicate id, but different protocols
- Upgrade Maven to use Wagon 2.9

3.3.1

Bug
- mvn cannot execute /usr/libexec/java_home/bin/java on OS X.
- mvn script is not compatible with OSX (Darwin) - PATCH ATTACHED
- Wrong reactor summary output while using -T option
- inconsistent classloading for extensions=true plugins
- Add example of toolchains.xml to Maven distribution
- DefaultMavenExecutionRequest.copy() doesn't keep
  useLegacyLocalRepository
- DefaultMavenExecutionRequest.copy() doesn't keep builderId
- execution request populate ignores plugin repositories
- LifecycleModuleBuilder effectively swallows runtime exceptions and
  errors
- NoClassDefFoundError: org/slf4j/spi/LocationAwareLogger when
  generating javadoc during site reporting
- cobertura-maven-plugin:instrument failing NoClassDefFoundError:
  org/slf4j/LoggerFactory

Improvement
- Modify maven-toolchain to look in ${maven.home}/conf/toolchains.xml
  and in ${user.home}/.m2/toolchains.xml
- Empty module entry should fail instead of just producing a WARNING
- avoid hardcoded system classloader references
- Toolchains should be read during initialization
- project-specific default jvm options and command line parameters
- specify execution-id for direct plugin goal invocation from command
  line
- improved user-configurable core extensions mechanism
- upgrade to sisu 0.3.0 and sisu guice 3.2.5

New Feature
- Add module maven-builder-support
- Allow plugin implementors to choose how they want the configuration
  created for a particular MojoExecution
- Access toolchains without maven-toolchain-plugin
- Provide an extension point to provide alternate CLI configuration
  mechanism
- Provide extension point for alternate implementations to construct
  build graph

Task
- update aether to 1.0.2
- Drop support for Win9x in mvn launch scripts
- switch from 3.2.x to 3.3.x
- upgrade Java minimum version prerequisite from Java 6 to Java 7

3.2.5

Bug
- [Regression] resolveAlways does not force dependency resolution in
  Maven 3.0.4
- ComparableVersion's breaks contract for Comparable, in some edgecases
  the comparisons are not transitive
- Maven dependency resolution locks up
- mvn -U crashes with IBM JDK
- java.lang.UnsupportedOperationException on DefaultProjectBuilder.build
- Parallel Builds can build in wrong order
- inconsistent custom scope bindings
- Remove dependency on Easymock
- Update to plexus-interpolation 1.21 to avoid potential thread safety
  problems
- spell mistake, Log4JLoggerFactory should be Log4jLoggerFactory
- LinkageError
  org.apache.maven.surefire.shade.org.apache.maven.shared.utils.io.IOUtil
- ToolchainManagerPrivate.getToolchainsForType() returns toolchains that
  are not of expected type
- Maven downloads same artifact from all repositories defined in POM
- unexpected InvalidArtifactRTException from ProjectBuilder#build

Improvement
- Improve toolchains descriptor documentation
- Improve Toolchains API description
- Enrich toolchain xml with merge information
- Change 'provides' from Object to Properties in toolchains.xml
- Upgrade to last Wagon 2.8

New Feature
- Add Merger for Maven Toolchain
- Provide a tool to test Maven version parsing and comparison

Task
- Upgrade Aether 1.0 when available
- Upgrade JUnit (for tests only)

Wish
- rename JavaToolChain to JavaToolchain for consistency and don't
  declare it as Plexus component


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/apache-maven/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/apache-maven/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/apache-maven/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/apache-maven/patches/patch-bin_m2.conf
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/apache-maven/patches/patch-bin_mvn

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/apache-maven/Makefile
diff -u pkgsrc/devel/apache-maven/Makefile:1.11 pkgsrc/devel/apache-maven/Makefile:1.12
--- pkgsrc/devel/apache-maven/Makefile:1.11     Tue Dec  9 11:52:03 2014
+++ pkgsrc/devel/apache-maven/Makefile  Wed Sep  6 10:17:50 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2014/12/09 11:52:03 fhajny Exp $
+# $NetBSD: Makefile,v 1.12 2017/09/06 10:17:50 fhajny Exp $
 #
 
-DISTNAME=      apache-maven-3.2.3
+DISTNAME=      apache-maven-3.5.0
 CATEGORIES=    devel java
 MASTER_SITES=  ${MASTER_SITE_APACHE:=maven/maven-3/${PKGVERSION_NOREV}/binaries/}
 DISTFILES=     ${DISTNAME}-bin${EXTRACT_SUFX}
@@ -12,7 +12,7 @@ COMMENT=      Apache Project's software proje
 LICENSE=       apache-2.0
 
 USE_JAVA=      run
-USE_JAVA2=     1.5
+USE_JAVA2=     7
 USE_TOOLS+=    pax
 NO_BUILD=      yes
 

Index: pkgsrc/devel/apache-maven/PLIST
diff -u pkgsrc/devel/apache-maven/PLIST:1.7 pkgsrc/devel/apache-maven/PLIST:1.8
--- pkgsrc/devel/apache-maven/PLIST:1.7 Tue Dec  9 11:43:40 2014
+++ pkgsrc/devel/apache-maven/PLIST     Wed Sep  6 10:17:50 2017
@@ -1,22 +1,19 @@
-@comment $NetBSD: PLIST,v 1.7 2014/12/09 11:43:40 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.8 2017/09/06 10:17:50 fhajny Exp $
 bin/mvn
-lib/java/maven/aether-api-0.9.0.M2.jar
-lib/java/maven/aether-connector-wagon-0.9.0.M2.jar
-lib/java/maven/aether-impl-0.9.0.M2.jar
-lib/java/maven/aether-spi-0.9.0.M2.jar
-lib/java/maven/aether-util-0.9.0.M2.jar
 lib/java/maven/aopalliance-1.0.jar
-lib/java/maven/boot/plexus-classworlds-2.5.1.jar
+lib/java/maven/boot/plexus-classworlds-2.5.2.jar
 lib/java/maven/cdi-api-1.0.jar
-lib/java/maven/commons-cli-1.2.jar
-lib/java/maven/commons-io-2.2.jar
-lib/java/maven/commons-lang-2.6.jar
-lib/java/maven/guava-14.0.1.jar
+lib/java/maven/commons-cli-1.4.jar
+lib/java/maven/commons-io-2.5.jar
+lib/java/maven/commons-lang3-3.5.jar
+lib/java/maven/guava-20.0.jar
+lib/java/maven/guice-4.0-no_aop.jar
+lib/java/maven/jansi-1.13.jar
 lib/java/maven/javax.inject-1.jar
-lib/java/maven/jsoup-1.7.2.jar
+lib/java/maven/jcl-over-slf4j-1.7.22.jar
 lib/java/maven/jsr250-api-1.0.jar
-lib/java/maven/maven-aether-provider-${PKGVERSION}.jar
 lib/java/maven/maven-artifact-${PKGVERSION}.jar
+lib/java/maven/maven-builder-support-${PKGVERSION}.jar
 lib/java/maven/maven-compat-${PKGVERSION}.jar
 lib/java/maven/maven-core-${PKGVERSION}.jar
 lib/java/maven/maven-embedder-${PKGVERSION}.jar
@@ -24,22 +21,28 @@ lib/java/maven/maven-model-${PKGVERSION}
 lib/java/maven/maven-model-builder-${PKGVERSION}.jar
 lib/java/maven/maven-plugin-api-${PKGVERSION}.jar
 lib/java/maven/maven-repository-metadata-${PKGVERSION}.jar
+lib/java/maven/maven-resolver-api-1.0.3.jar
+lib/java/maven/maven-resolver-connector-basic-1.0.3.jar
+lib/java/maven/maven-resolver-impl-1.0.3.jar
+lib/java/maven/maven-resolver-provider-${PKGVERSION}.jar
+lib/java/maven/maven-resolver-spi-1.0.3.jar
+lib/java/maven/maven-resolver-transport-wagon-1.0.3.jar
+lib/java/maven/maven-resolver-util-1.0.3.jar
 lib/java/maven/maven-settings-${PKGVERSION}.jar
 lib/java/maven/maven-settings-builder-${PKGVERSION}.jar
-lib/java/maven/org.eclipse.sisu.inject-0.0.0.M5.jar
-lib/java/maven/org.eclipse.sisu.plexus-0.0.0.M5.jar
+lib/java/maven/maven-shared-utils-3.1.0.jar
+lib/java/maven/maven-slf4j-provider-${PKGVERSION}.jar
+lib/java/maven/org.eclipse.sisu.inject-0.3.3.jar
+lib/java/maven/org.eclipse.sisu.plexus-0.3.3.jar
 lib/java/maven/plexus-cipher-1.7.jar
-lib/java/maven/plexus-component-annotations-1.5.5.jar
-lib/java/maven/plexus-interpolation-1.19.jar
-lib/java/maven/plexus-sec-dispatcher-1.3.jar
-lib/java/maven/plexus-utils-3.0.17.jar
-lib/java/maven/sisu-guice-3.1.3-no_aop.jar
-lib/java/maven/slf4j-api-1.7.5.jar
-lib/java/maven/slf4j-simple-1.7.5.jar
-lib/java/maven/wagon-file-2.6.jar
-lib/java/maven/wagon-http-2.6-shaded.jar
-lib/java/maven/wagon-http-shared-2.6.jar
-lib/java/maven/wagon-provider-api-2.6.jar
+lib/java/maven/plexus-component-annotations-1.7.1.jar
+lib/java/maven/plexus-interpolation-1.24.jar
+lib/java/maven/plexus-sec-dispatcher-1.4.jar
+lib/java/maven/plexus-utils-3.0.24.jar
+lib/java/maven/slf4j-api-1.7.22.jar
+lib/java/maven/wagon-file-2.12.jar
+lib/java/maven/wagon-http-2.12-shaded.jar
+lib/java/maven/wagon-provider-api-2.12.jar
 share/doc/java/maven/LICENSE
 share/doc/java/maven/NOTICE
 share/doc/java/maven/README.txt

Index: pkgsrc/devel/apache-maven/distinfo
diff -u pkgsrc/devel/apache-maven/distinfo:1.13 pkgsrc/devel/apache-maven/distinfo:1.14
--- pkgsrc/devel/apache-maven/distinfo:1.13     Tue Jun 20 11:52:08 2017
+++ pkgsrc/devel/apache-maven/distinfo  Wed Sep  6 10:17:50 2017
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2017/06/20 11:52:08 jperkin Exp $
+$NetBSD: distinfo,v 1.14 2017/09/06 10:17:50 fhajny Exp $
 
-SHA1 (apache-maven-3.2.3-bin.tar.gz) = 1ce6641f7dcb4fd5785bedcdca2979da83f6d23f
-RMD160 (apache-maven-3.2.3-bin.tar.gz) = 45d5e349f232ba6ec32239bda107e59d31a1a231
-SHA512 (apache-maven-3.2.3-bin.tar.gz) = 9c211b17a8109939a776a4ad0e833ce9b301941eb0cfd4e8978634589ea48227cb979b5819c4b151184cff46bb44139c09477e904daa00ac769b0c756859f6f0
-Size (apache-maven-3.2.3-bin.tar.gz) = 6956162 bytes
-SHA1 (patch-bin_m2.conf) = e267855998ee06efa649aee9e30a28833b7223cb
-SHA1 (patch-bin_mvn) = 563b35793cc90893a60b62bdac75b986554d1291
+SHA1 (apache-maven-3.5.0-bin.tar.gz) = 878b8b93a8f9685aefba5c21a17b46eb141b1122
+RMD160 (apache-maven-3.5.0-bin.tar.gz) = 01648cb322d39dd71f1324f547ea251f6413e0e9
+SHA512 (apache-maven-3.5.0-bin.tar.gz) = d5a520ca8765ddbc86dca71249c602e2f798dedcc7430bc4979dd01918464c8dc69b694ec0dbbeeff6044179e1b98fce72af952663dd49503203d9742e328f3b
+Size (apache-maven-3.5.0-bin.tar.gz) = 8534562 bytes
+SHA1 (patch-bin_m2.conf) = 4fb50adbfb744635281853f0b81ec95a5fdab504
+SHA1 (patch-bin_mvn) = 4c31282a432d5737c22f62ab799eb05288166b2b

Index: pkgsrc/devel/apache-maven/patches/patch-bin_m2.conf
diff -u pkgsrc/devel/apache-maven/patches/patch-bin_m2.conf:1.2 pkgsrc/devel/apache-maven/patches/patch-bin_m2.conf:1.3
--- pkgsrc/devel/apache-maven/patches/patch-bin_m2.conf:1.2     Tue Dec  9 11:52:03 2014
+++ pkgsrc/devel/apache-maven/patches/patch-bin_m2.conf Wed Sep  6 10:17:51 2017
@@ -1,16 +1,15 @@
-$NetBSD: patch-bin_m2.conf,v 1.2 2014/12/09 11:52:03 fhajny Exp $
+$NetBSD: patch-bin_m2.conf,v 1.3 2017/09/06 10:17:51 fhajny Exp $
 
 Follow pkgsrc path convention.
 
---- bin/m2.conf.orig   2014-08-11 20:59:27.000000000 +0000
+--- bin/m2.conf.orig   2017-04-03 19:36:16.000000000 +0000
 +++ bin/m2.conf
 @@ -3,6 +3,6 @@ main is org.apache.maven.cli.MavenCli fr
- set maven.home default ${user.home}/m2
+ set maven.conf default ${maven.home}/conf
  
  [plexus.core]
+-load       ${maven.conf}/logging
 -optionally ${maven.home}/lib/ext/*.jar
++load       @PKG_SYSCONFDIR@/logging
 +optionally ${maven.home}/lib/java/maven/*.jar
  load       ${maven.home}/lib/*.jar
--load       ${maven.home}/conf/logging
-\ No newline at end of file
-+load       @PKG_SYSCONFDIR@/logging

Index: pkgsrc/devel/apache-maven/patches/patch-bin_mvn
diff -u pkgsrc/devel/apache-maven/patches/patch-bin_mvn:1.5 pkgsrc/devel/apache-maven/patches/patch-bin_mvn:1.6
--- pkgsrc/devel/apache-maven/patches/patch-bin_mvn:1.5 Tue Jun 20 11:52:08 2017
+++ pkgsrc/devel/apache-maven/patches/patch-bin_mvn     Wed Sep  6 10:17:51 2017
@@ -1,46 +1,56 @@
-$NetBSD: patch-bin_mvn,v 1.5 2017/06/20 11:52:08 jperkin Exp $
+$NetBSD: patch-bin_mvn,v 1.6 2017/09/06 10:17:51 fhajny Exp $
 
-Darwin's java_home needs to be evaluated not set.
+Reconcile JAVA_HOME evaluated at run time on Darwin vs. hardcoded
+via PKG_JAVA_HOME elsewhere.
 Follow pkgsrc path convention.
 
---- bin/mvn.orig       2014-08-11 20:59:27.000000000 +0000
+--- bin/mvn.orig       2017-04-03 19:36:16.000000000 +0000
 +++ bin/mvn
-@@ -83,7 +83,7 @@ case "`uname`" in
-              #
-              # Apple JDKs
-              #
--             export JAVA_HOME=/usr/libexec/java_home
-+             export JAVA_HOME=`/usr/libexec/java_home 2>/dev/null`
-            fi
-            ;;
+@@ -45,6 +45,7 @@ mingw=false;
+ case "`uname`" in
+   CYGWIN*) cygwin=true;;
+   MINGW*) mingw=true;;
++  Darwin) darwin=true;;
  esac
-@@ -94,6 +94,15 @@ if [ -z "$JAVA_HOME" ] ; then
-   fi
+ 
+ ## resolve links - $0 may be a link to Maven's home
+@@ -89,12 +90,17 @@ if $mingw ; then
+   # TODO classpath?
  fi
  
-+if [ "$JAVA_HOME" = "" ] ; then
-+  JAVA_HOME=@PKG_JAVA_HOME@
++if $darwin ; then
++  [ -n "$JAVA_HOME" ] &&
++  JAVA_HOME="`/usr/libexec/java_home 2>/dev/null`"
 +fi
 +
-+if [ "$M2_HOME" = "" ] ; then
-+  # try to find maven
-+  M2_HOME=@PREFIX@
-+fi
+ if [ -z "$JAVA_HOME" ] ; then
+-  JAVACMD=`which java`
+-else
+-  JAVACMD="$JAVA_HOME/bin/java"
++  JAVA_HOME="@PKG_JAVA_HOME@"
+ fi
+ 
++JAVACMD="$JAVA_HOME/bin/java"
 +
- if [ -z "$M2_HOME" ] ; then
-   ## resolve links - $0 may be a link to maven's home
-   PRG="$0"
-@@ -196,7 +205,9 @@ export MAVEN_CMD_LINE_ARGS
+ if [ ! -x "$JAVACMD" ] ; then
+   echo "The JAVA_HOME environment variable is not defined correctly" >&2
+   echo "This environment variable is needed to run this program" >&2
+@@ -102,7 +108,7 @@ if [ ! -x "$JAVACMD" ] ; then
+   exit 1
+ fi
+ 
+-CLASSWORLDS_JAR=`echo "${MAVEN_HOME}"/boot/plexus-classworlds-*.jar`
++CLASSWORLDS_JAR=`echo "${MAVEN_HOME}"/lib/java/maven/boot/plexus-classworlds-*.jar`
+ CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
  
- exec "$JAVACMD" \
+ # For Cygwin, switch paths to Windows format before running java
+@@ -190,6 +196,8 @@ 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 \
+   $MAVEN_DEBUG_OPTS \
+   -classpath "${CLASSWORLDS_JAR}" \
+-  "-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" \
 +  "-Dclassworlds.conf=@PKG_SYSCONFDIR@/m2.conf" \
-   "-Dmaven.home=${M2_HOME}"  \
--  ${CLASSWORLDS_LAUNCHER} "$@"
-\ No newline at end of file
+   "-Dmaven.home=${MAVEN_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
 +  "-Dorg.apache.maven.global-settings=@PKG_SYSCONFDIR@/settings.xml" \
 +  "-Dorg.apache.maven.global-plugin-registry=@PKG_SYSCONFDIR@/plugin-registry.xml" \
-+  ${CLASSWORLDS_LAUNCHER} "$@"
+   ${CLASSWORLDS_LAUNCHER} "$@"