Index: head/devel/maven/Makefile
===================================================================
--- head/devel/maven/Makefile	(revision 487340)
+++ head/devel/maven/Makefile	(revision 487341)
@@ -1,47 +1,47 @@
 # Created by: JonathanChen <jonc@chen.org.nz>
 # $FreeBSD$
 
 PORTNAME=	maven
-DISTVERSION=	3.5.4
+DISTVERSION=	3.6.0
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/maven/maven-3/${DISTVERSION}/binaries
 DISTNAME=	apache-maven-${DISTVERSION}-bin
 
 MAINTAINER=	jonc@chen.org.nz
 COMMENT=	Java project management tool
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	mvn:devel/maven-wrapper
 
 USES=		cpe
+USE_JAVA=	yes
+
 CPE_PRODUCT=	maven
 CPE_VENDOR=	apache
-
-USE_JAVA=	yes
 JAVA_VERSION=	1.7+
 NO_BUILD=	yes
 NO_ARCH=	yes
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 WRKSRC=		${WRKDIR}/apache-maven-${DISTVERSION}
 SUB_FILES=	mvn.sh
 SUB_LIST=	CLASSWORLDS_JAR=plexus-classworlds-2.5.2.jar
 INSTANCE_FILE=	${PORTNAME}-${PORTVERSION}
 INSTANCES_DIR=	etc/maven-wrapper/instances.d/
 
 post-extract:
 	${RM} -r ${WRKSRC}/lib/jansi-native ${WRKSRC}/bin/*.bat
 	${ECHO_CMD} "${DATADIR}" > ${WRKSRC}/${INSTANCE_FILE}
 
 do-install:
 	cd ${WRKSRC} && ${FIND} . -type d -exec ${MKDIR} \
 		${STAGEDIR}${DATADIR}/{} \;
 	cd ${WRKSRC} && ${FIND} . -type f -not -path "\./bin/" \
 		-exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} \;
 	${INSTALL_DATA} ${WRKSRC}/bin/m2.conf ${STAGEDIR}${DATADIR}/bin
 	${INSTALL_SCRIPT} ${WRKDIR}/mvn.sh ${STAGEDIR}${DATADIR}/bin/mvn
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTANCES_DIR}
 	${INSTALL_DATA} ${WRKSRC}/${INSTANCE_FILE} \
 		${STAGEDIR}${PREFIX}/${INSTANCES_DIR}
 
 .include <bsd.port.mk>
Index: head/devel/maven/distinfo
===================================================================
--- head/devel/maven/distinfo	(revision 487340)
+++ head/devel/maven/distinfo	(revision 487341)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530049274
-SHA256 (apache-maven-3.5.4-bin.tar.gz) = ce50b1c91364cb77efe3776f756a6d92b76d9038b0a0782f7d53acf1e997a14d
-SIZE (apache-maven-3.5.4-bin.tar.gz) = 8842660
+TIMESTAMP = 1544639955
+SHA256 (apache-maven-3.6.0-bin.tar.gz) = 6a1b346af36a1f1a491c1c1a141667c5de69b42e6611d3687df26868bc0f4637
+SIZE (apache-maven-3.6.0-bin.tar.gz) = 9063587
Index: head/devel/maven/pkg-plist
===================================================================
--- head/devel/maven/pkg-plist	(revision 487340)
+++ head/devel/maven/pkg-plist	(revision 487341)
@@ -1,95 +1,70 @@
-%%ETCDIR%%-wrapper/instances.d/maven-3.5.4
+%%ETCDIR%%-wrapper/instances.d/maven-3.6.0
 %%DATADIR%%/LICENSE
 %%DATADIR%%/NOTICE
 %%DATADIR%%/README.txt
 %%DATADIR%%/bin/m2.conf
 %%DATADIR%%/bin/mvn
 %%DATADIR%%/bin/mvn.cmd
 %%DATADIR%%/bin/mvnDebug
 %%DATADIR%%/bin/mvnDebug.cmd
 %%DATADIR%%/bin/mvnyjp
 %%DATADIR%%/boot/plexus-classworlds-2.5.2.jar
 %%DATADIR%%/conf/logging/simplelogger.properties
 %%DATADIR%%/conf/settings.xml
 %%DATADIR%%/conf/toolchains.xml
+%%DATADIR%%/lib/animal-sniffer-annotations-1.14.jar
+%%DATADIR%%/lib/animal-sniffer-annotations.license
 %%DATADIR%%/lib/aopalliance-1.0.jar
 %%DATADIR%%/lib/cdi-api-1.0.jar
-%%DATADIR%%/lib/cdi-api.license
+%%DATADIR%%/lib/checker-compat-qual-2.0.0.jar
+%%DATADIR%%/lib/checker-compat-qual.license
 %%DATADIR%%/lib/commons-cli-1.4.jar
-%%DATADIR%%/lib/commons-cli.license
 %%DATADIR%%/lib/commons-io-2.5.jar
-%%DATADIR%%/lib/commons-io.license
-%%DATADIR%%/lib/commons-lang3-3.5.jar
-%%DATADIR%%/lib/commons-lang3.license
+%%DATADIR%%/lib/commons-lang3-3.8.1.jar
+%%DATADIR%%/lib/error_prone_annotations-2.1.3.jar
 %%DATADIR%%/lib/ext/README.txt
-%%DATADIR%%/lib/guava-20.0.jar
-%%DATADIR%%/lib/guice-4.2.0-no_aop.jar
+%%DATADIR%%/lib/guava-25.1-android.jar
+%%DATADIR%%/lib/guice-4.2.1-no_aop.jar
+%%DATADIR%%/lib/j2objc-annotations-1.1.jar
 %%DATADIR%%/lib/jansi-1.17.1.jar
 %%DATADIR%%/lib/javax.inject-1.jar
 %%DATADIR%%/lib/jcl-over-slf4j-1.7.25.jar
 %%DATADIR%%/lib/jcl-over-slf4j.license
 %%DATADIR%%/lib/jsr250-api-1.0.jar
 %%DATADIR%%/lib/jsr250-api.license
-%%DATADIR%%/lib/maven-artifact-3.5.4.jar
-%%DATADIR%%/lib/maven-artifact.license
-%%DATADIR%%/lib/maven-builder-support-3.5.4.jar
-%%DATADIR%%/lib/maven-builder-support.license
-%%DATADIR%%/lib/maven-compat-3.5.4.jar
-%%DATADIR%%/lib/maven-compat.license
-%%DATADIR%%/lib/maven-core-3.5.4.jar
-%%DATADIR%%/lib/maven-core.license
-%%DATADIR%%/lib/maven-embedder-3.5.4.jar
-%%DATADIR%%/lib/maven-embedder.license
-%%DATADIR%%/lib/maven-model-3.5.4.jar
-%%DATADIR%%/lib/maven-model-builder-3.5.4.jar
-%%DATADIR%%/lib/maven-model-builder.license
-%%DATADIR%%/lib/maven-model.license
-%%DATADIR%%/lib/maven-plugin-api-3.5.4.jar
-%%DATADIR%%/lib/maven-plugin-api.license
-%%DATADIR%%/lib/maven-repository-metadata-3.5.4.jar
-%%DATADIR%%/lib/maven-repository-metadata.license
-%%DATADIR%%/lib/maven-resolver-api-1.1.1.jar
-%%DATADIR%%/lib/maven-resolver-api.license
-%%DATADIR%%/lib/maven-resolver-connector-basic-1.1.1.jar
-%%DATADIR%%/lib/maven-resolver-connector-basic.license
-%%DATADIR%%/lib/maven-resolver-impl-1.1.1.jar
-%%DATADIR%%/lib/maven-resolver-impl.license
-%%DATADIR%%/lib/maven-resolver-provider-3.5.4.jar
-%%DATADIR%%/lib/maven-resolver-provider.license
-%%DATADIR%%/lib/maven-resolver-spi-1.1.1.jar
-%%DATADIR%%/lib/maven-resolver-spi.license
-%%DATADIR%%/lib/maven-resolver-transport-wagon-1.1.1.jar
-%%DATADIR%%/lib/maven-resolver-transport-wagon.license
-%%DATADIR%%/lib/maven-resolver-util-1.1.1.jar
-%%DATADIR%%/lib/maven-resolver-util.license
-%%DATADIR%%/lib/maven-settings-3.5.4.jar
-%%DATADIR%%/lib/maven-settings-builder-3.5.4.jar
-%%DATADIR%%/lib/maven-settings-builder.license
-%%DATADIR%%/lib/maven-settings.license
+%%DATADIR%%/lib/jsr305-3.0.2.jar
+%%DATADIR%%/lib/maven-artifact-3.6.0.jar
+%%DATADIR%%/lib/maven-builder-support-3.6.0.jar
+%%DATADIR%%/lib/maven-compat-3.6.0.jar
+%%DATADIR%%/lib/maven-core-3.6.0.jar
+%%DATADIR%%/lib/maven-embedder-3.6.0.jar
+%%DATADIR%%/lib/maven-model-3.6.0.jar
+%%DATADIR%%/lib/maven-model-builder-3.6.0.jar
+%%DATADIR%%/lib/maven-plugin-api-3.6.0.jar
+%%DATADIR%%/lib/maven-repository-metadata-3.6.0.jar
+%%DATADIR%%/lib/maven-resolver-api-1.3.1.jar
+%%DATADIR%%/lib/maven-resolver-connector-basic-1.3.1.jar
+%%DATADIR%%/lib/maven-resolver-impl-1.3.1.jar
+%%DATADIR%%/lib/maven-resolver-provider-3.6.0.jar
+%%DATADIR%%/lib/maven-resolver-spi-1.3.1.jar
+%%DATADIR%%/lib/maven-resolver-transport-wagon-1.3.1.jar
+%%DATADIR%%/lib/maven-resolver-util-1.3.1.jar
+%%DATADIR%%/lib/maven-settings-3.6.0.jar
+%%DATADIR%%/lib/maven-settings-builder-3.6.0.jar
 %%DATADIR%%/lib/maven-shared-utils-3.2.1.jar
-%%DATADIR%%/lib/maven-shared-utils.license
-%%DATADIR%%/lib/maven-slf4j-provider-3.5.4.jar
-%%DATADIR%%/lib/maven-slf4j-provider.license
+%%DATADIR%%/lib/maven-slf4j-provider-3.6.0.jar
 %%DATADIR%%/lib/org.eclipse.sisu.inject-0.3.3.jar
 %%DATADIR%%/lib/org.eclipse.sisu.inject.license
 %%DATADIR%%/lib/org.eclipse.sisu.plexus-0.3.3.jar
 %%DATADIR%%/lib/org.eclipse.sisu.plexus.license
 %%DATADIR%%/lib/plexus-cipher-1.7.jar
-%%DATADIR%%/lib/plexus-cipher.license
 %%DATADIR%%/lib/plexus-component-annotations-1.7.1.jar
-%%DATADIR%%/lib/plexus-component-annotations.license
-%%DATADIR%%/lib/plexus-interpolation-1.24.jar
-%%DATADIR%%/lib/plexus-interpolation.license
+%%DATADIR%%/lib/plexus-interpolation-1.25.jar
 %%DATADIR%%/lib/plexus-sec-dispatcher-1.4.jar
-%%DATADIR%%/lib/plexus-sec-dispatcher.license
 %%DATADIR%%/lib/plexus-utils-3.1.0.jar
-%%DATADIR%%/lib/plexus-utils.license
 %%DATADIR%%/lib/slf4j-api-1.7.25.jar
 %%DATADIR%%/lib/slf4j-api.license
-%%DATADIR%%/lib/wagon-file-3.1.0.jar
-%%DATADIR%%/lib/wagon-file.license
-%%DATADIR%%/lib/wagon-http-3.1.0-shaded.jar
-%%DATADIR%%/lib/wagon-http.license
-%%DATADIR%%/lib/wagon-provider-api-3.1.0.jar
-%%DATADIR%%/lib/wagon-provider-api.license
-%%DATADIR%%/maven-3.5.4
+%%DATADIR%%/lib/wagon-file-3.2.0.jar
+%%DATADIR%%/lib/wagon-http-3.2.0-shaded.jar
+%%DATADIR%%/lib/wagon-provider-api-3.2.0.jar
+%%DATADIR%%/maven-3.6.0