Update devel/apache-maven to 3.5.3.

https://maven.apache.org/docs/3.5.3/release-notes.html

Release Notes - Maven - Version 3.5.3

***Known issues***:
   * [MNG-6372] - On Windows with -T option, Maven can output spurious ANSI escapes such as [0m [0m

Bug:
    * [MNG-6188] - Console color not properly reset when interrupting build process
    * [MNG-6255] - Maven script cannot parse jvm.config with CRLF
    * [MNG-6282] - Console output has no colors in shell (both Git Bash and Cygwin) [regression in Jansi 1.16 / Maven 3.5.1]
    * [MNG-6296] - New option -Dstyle.color is not working
    * [MNG-6298] - 3.5.2: ClassNotFoundException: javax.annotation.security. RolesAllowed
    * [MNG-6300] - Multi module release creates empty directories in war file instead of jars
    * [MNG-6305] - Validation of CI friendly version incorrect
    * [MNG-6320] - Apparently wrong encoding of non-ascii java class filename in error messages in the maven log
    * [MNG-6323] - Deadlock in multithreaded dependency resolution
    * [MNG-6330] - [regression] Parents relativePath not verified anymore

New Feature:
    * [MNG-6302] - Provide some "progress" hints

Improvement:
    * [MNG-5992] - Git passwords are exposed as the Super POM still uses
Maven Release Plugin 2.3.2
    * [MNG-6306] - Replace use of Guava in maven-resolver-provider with a
lighter weight alternative
    * [MNG-6308] - display packaging & groupId:artifactId when building a
module
    * [MNG-6332] - Cleaned up mvn.cmd Script
    * [MNG-6340] - [Performance]To make System.gc() call configurable in
target summary code
    * [MNG-6342] - Emit a WARNING about LATEST/RELEASE in parent
    * [MNG-6352] - Printout version information at the end of the build

Task:
    * [MNG-6331] - Remove maven-bundle-pugin from build pluginManagement

Dependency upgrade:
    * [MNG-6312] - Update Maven Wagon dependency
    * [MNG-6335] - Update test framework Mockito from 1.10 to 2.12
    * [MNG-6353] - Upgrade maven-shared-utils to 3.2.1

https://maven.apache.org/docs/3.5.2/release-notes.html

Release Notes - Maven - Version 3.5.2

Sub-tasks:

    * [MNG-6186] - switch to improved HawtJNI
    * [MNG-6280] - ArrayIndexOutOfBoundsException caused by pom.xml with process instructions

Bugs:

    * [MNG-5935] - Optional true getting lost in managed dependencies when transitive
    * [MNG-6127] - Fix plugin execution configuration interference
    * [MNG-6148] - Can't package and assemble with JDK9/Jigsaw
    * [MNG-6149] - MetadataResolutionResult#getGraph() never resolves request type 'test'
    * [MNG-6205] - Non-ascii chars in name element are displayed as question marks in Win CLI output (regression)
    * [MNG-6210] - can't load @SessionScoped/@MojoExecutionScoped components from .mvn/extensions.xml
    * [MNG-6223] - mvn -f outputs invalid error when specifying POM directory
    * [MNG-6233] - maven-resolver-provider mixes JRS 330 and Plexus annotations
    * [MNG-6234] - Regression 6182a208: library.jansi.path does not point to proper directory
    * [MNG-6240] - Duplicate components in plugin extension realm when plugin depends on maven-aether-resolver
    * [MNG-6242] - No color for maven on Cygwin

Improvements:

    * [MNG-5457] - Show repository id when downloading or uploading from/to a remote repository
    * [MNG-6025] - Add a ProjectArtifactsCache similar to PluginArtifactsCache
    * [MNG-6123] - detect self references in POM and fail fast
    * [MNG-6174] - Clean Up Maven Model
    * [MNG-6196] - Update slf4j and simplify its color integration
    * [MNG-6203] - Minor cleanup in MavenCli.java
    * [MNG-6206] - We should produce a WARNING by using RELEASE, LATEST as versions
    * [MNG-6207] - Create WARNINGs in case of using system scope
    * [MNG-6228] - Optionality not displayed in dependency tree when run in debug mode

New Features:

    * [MNG-6084] - Support JSR 250 annotations
    * [MNG-6220] - Add CLI options to control color output

Tasks:

    * [MNG-6167] - Clean up dependency mess (reported by dependency:analyze)
    * [MNG-6258] - Upgrade to Maven Resolver 1.1.0

devel/apache-maven/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2017/09/06 10:17:50 fhajny Exp $
+# $NetBSD: Makefile,v 1.13 2018/06/04 08:23:11 yyamano Exp $
 #
 
-DISTNAME=	apache-maven-3.5.0
+DISTNAME=	apache-maven-3.5.3
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE:=maven/maven-3/${PKGVERSION_NOREV}/binaries/}
 DISTFILES=	${DISTNAME}-bin${EXTRACT_SUFX}

devel/apache-maven/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2017/09/06 10:17:50 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.9 2018/06/04 08:23:11 yyamano Exp $
 bin/mvn
 lib/java/maven/aopalliance-1.0.jar
 lib/java/maven/boot/plexus-classworlds-2.5.2.jar
@@ -8,9 +8,9 @@ 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/jansi-1.17.jar
 lib/java/maven/javax.inject-1.jar
-lib/java/maven/jcl-over-slf4j-1.7.22.jar
+lib/java/maven/jcl-over-slf4j-1.7.25.jar
 lib/java/maven/jsr250-api-1.0.jar
 lib/java/maven/maven-artifact-${PKGVERSION}.jar
 lib/java/maven/maven-builder-support-${PKGVERSION}.jar
@@ -21,16 +21,16 @@ lib/java/maven/maven-model-${PKGVERSION}.jar
 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-api-1.1.1.jar
+lib/java/maven/maven-resolver-connector-basic-1.1.1.jar
+lib/java/maven/maven-resolver-impl-1.1.1.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-resolver-spi-1.1.1.jar
+lib/java/maven/maven-resolver-transport-wagon-1.1.1.jar
+lib/java/maven/maven-resolver-util-1.1.1.jar
 lib/java/maven/maven-settings-${PKGVERSION}.jar
 lib/java/maven/maven-settings-builder-${PKGVERSION}.jar
-lib/java/maven/maven-shared-utils-3.1.0.jar
+lib/java/maven/maven-shared-utils-3.2.1.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
@@ -38,11 +38,11 @@ lib/java/maven/plexus-cipher-1.7.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
+lib/java/maven/plexus-utils-3.1.0.jar
+lib/java/maven/slf4j-api-1.7.25.jar
+lib/java/maven/wagon-file-3.0.0.jar
+lib/java/maven/wagon-http-3.0.0-shaded.jar
+lib/java/maven/wagon-provider-api-3.0.0.jar
 share/doc/java/maven/LICENSE
 share/doc/java/maven/NOTICE
 share/doc/java/maven/README.txt

devel/apache-maven/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2017/09/06 10:17:50 fhajny Exp $
+$NetBSD: distinfo,v 1.15 2018/06/04 08:23:11 yyamano Exp $
 
-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 (apache-maven-3.5.3-bin.tar.gz) = bbfa43a4ce4ef96732b896d057f8a613aa229801
+RMD160 (apache-maven-3.5.3-bin.tar.gz) = 4d6124a0dc34ea2c0692103dc7113c681ede8a25
+SHA512 (apache-maven-3.5.3-bin.tar.gz) = 5b36a2289606cfaf9177991f889993742a485a48b9fb7ca43b67fbbe1a978a258fc971e0dce3b63d51d235abdf49f771c99900b2e77ee2a793825913ea32971b
+Size (apache-maven-3.5.3-bin.tar.gz) = 8799579 bytes
 SHA1 (patch-bin_m2.conf) = 4fb50adbfb744635281853f0b81ec95a5fdab504
-SHA1 (patch-bin_mvn) = 4c31282a432d5737c22f62ab799eb05288166b2b
+SHA1 (patch-bin_mvn) = 3f7e19b1f1d520bc5dc7965ee3b211453b36f81b

devel/apache-maven/patches/patch-bin_mvn

@@ -1,10 +1,10 @@
-$NetBSD: patch-bin_mvn,v 1.6 2017/09/06 10:17:51 fhajny Exp $
+$NetBSD: patch-bin_mvn,v 1.7 2018/06/04 08:23:11 yyamano Exp $
 
 Reconcile JAVA_HOME evaluated at run time on Darwin vs. hardcoded
 via PKG_JAVA_HOME elsewhere.
 Follow pkgsrc path convention.
 
---- bin/mvn.orig	2017-04-03 19:36:16.000000000 +0000
+--- bin/mvn.orig	2018-02-24 19:46:02.000000000 +0000
 +++ bin/mvn
 @@ -45,6 +45,7 @@ mingw=false;
  case "`uname`" in
@@ -44,13 +44,15 @@ Follow pkgsrc path convention.
  CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
  
  # For Cygwin, switch paths to Windows format before running java
-@@ -190,6 +196,8 @@ exec "$JAVACMD" \
+@@ -192,8 +198,10 @@ exec "$JAVACMD" \
    $MAVEN_OPTS \
    $MAVEN_DEBUG_OPTS \
    -classpath "${CLASSWORLDS_JAR}" \
 -  "-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" \
 +  "-Dclassworlds.conf=@PKG_SYSCONFDIR@/m2.conf" \
-   "-Dmaven.home=${MAVEN_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+   "-Dmaven.home=${MAVEN_HOME}" \
+   "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/jansi-native" \
+   "-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} "$@"