devel/maven: update to 3.5.4

PR:		229353
Submitted by:	Jonathan Chen <jonc@chen.org.nz> (maintainer)

3 files changed, 26 insertions, 33 deletions

diff --git a/devel/maven/Makefile b/devel/maven/Makefile
index 5acf906cb06a..ff6d80304c83 100644
--- a/devel/maven/Makefile
+++ b/devel/maven/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	maven
-DISTVERSION=	3.5.3
+DISTVERSION=	3.5.4
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/maven/maven-3/${DISTVERSION}/binaries
 DISTNAME=	apache-maven-${DISTVERSION}-bin
@@ -21,6 +21,7 @@ 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
@@ -29,7 +30,7 @@ INSTANCE_FILE=	${PORTNAME}-${PORTVERSION}
 INSTANCES_DIR=	etc/maven-wrapper/instances.d/
 
 post-extract:
-	${RM} ${WRKSRC}/bin/*.bat
+	${RM} -r ${WRKSRC}/lib/jansi-native ${WRKSRC}/bin/*.bat
 	${ECHO_CMD} "${DATADIR}" > ${WRKSRC}/${INSTANCE_FILE}
 
 do-install:
diff --git a/devel/maven/distinfo b/devel/maven/distinfo
index f23b62bd7012..e2d8b40d6fa6 100644
--- a/devel/maven/distinfo
+++ b/devel/maven/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524639783
-SHA256 (apache-maven-3.5.3-bin.tar.gz) = b52956373fab1dd4277926507ab189fb797b3bc51a2a267a193c931fffad8408
-SIZE (apache-maven-3.5.3-bin.tar.gz) = 8799579
+TIMESTAMP = 1530049274
+SHA256 (apache-maven-3.5.4-bin.tar.gz) = ce50b1c91364cb77efe3776f756a6d92b76d9038b0a0782f7d53acf1e997a14d
+SIZE (apache-maven-3.5.4-bin.tar.gz) = 8842660
diff --git a/devel/maven/pkg-plist b/devel/maven/pkg-plist
index f9fdcb3697a6..21343d0834be 100644
--- a/devel/maven/pkg-plist
+++ b/devel/maven/pkg-plist
@@ -1,4 +1,4 @@
-%%ETCDIR%%-wrapper/instances.d/maven-3.5.3
+%%ETCDIR%%-wrapper/instances.d/maven-3.5.4
 %%DATADIR%%/LICENSE
 %%DATADIR%%/NOTICE
 %%DATADIR%%/README.txt
@@ -23,38 +23,30 @@
 %%DATADIR%%/lib/commons-lang3.license
 %%DATADIR%%/lib/ext/README.txt
 %%DATADIR%%/lib/guava-20.0.jar
-%%DATADIR%%/lib/guice-4.0-no_aop.jar
-%%DATADIR%%/lib/jansi-1.17.jar
-%%DATADIR%%/lib/jansi-native/README.txt
-%%DATADIR%%/lib/jansi-native/freebsd32/libjansi.so
-%%DATADIR%%/lib/jansi-native/freebsd64/libjansi.so
-%%DATADIR%%/lib/jansi-native/linux32/libjansi.so
-%%DATADIR%%/lib/jansi-native/linux64/libjansi.so
-%%DATADIR%%/lib/jansi-native/osx/libjansi.jnilib
-%%DATADIR%%/lib/jansi-native/windows32/jansi.dll
-%%DATADIR%%/lib/jansi-native/windows64/jansi.dll
+%%DATADIR%%/lib/guice-4.2.0-no_aop.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.3.jar
+%%DATADIR%%/lib/maven-artifact-3.5.4.jar
 %%DATADIR%%/lib/maven-artifact.license
-%%DATADIR%%/lib/maven-builder-support-3.5.3.jar
+%%DATADIR%%/lib/maven-builder-support-3.5.4.jar
 %%DATADIR%%/lib/maven-builder-support.license
-%%DATADIR%%/lib/maven-compat-3.5.3.jar
+%%DATADIR%%/lib/maven-compat-3.5.4.jar
 %%DATADIR%%/lib/maven-compat.license
-%%DATADIR%%/lib/maven-core-3.5.3.jar
+%%DATADIR%%/lib/maven-core-3.5.4.jar
 %%DATADIR%%/lib/maven-core.license
-%%DATADIR%%/lib/maven-embedder-3.5.3.jar
+%%DATADIR%%/lib/maven-embedder-3.5.4.jar
 %%DATADIR%%/lib/maven-embedder.license
-%%DATADIR%%/lib/maven-model-3.5.3.jar
-%%DATADIR%%/lib/maven-model-builder-3.5.3.jar
+%%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.3.jar
+%%DATADIR%%/lib/maven-plugin-api-3.5.4.jar
 %%DATADIR%%/lib/maven-plugin-api.license
-%%DATADIR%%/lib/maven-repository-metadata-3.5.3.jar
+%%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
@@ -62,7 +54,7 @@
 %%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.3.jar
+%%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
@@ -70,13 +62,13 @@
 %%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.3.jar
-%%DATADIR%%/lib/maven-settings-builder-3.5.3.jar
+%%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/maven-shared-utils-3.2.1.jar
 %%DATADIR%%/lib/maven-shared-utils.license
-%%DATADIR%%/lib/maven-slf4j-provider-3.5.3.jar
+%%DATADIR%%/lib/maven-slf4j-provider-3.5.4.jar
 %%DATADIR%%/lib/maven-slf4j-provider.license
 %%DATADIR%%/lib/org.eclipse.sisu.inject-0.3.3.jar
 %%DATADIR%%/lib/org.eclipse.sisu.inject.license
@@ -94,10 +86,10 @@
 %%DATADIR%%/lib/plexus-utils.license
 %%DATADIR%%/lib/slf4j-api-1.7.25.jar
 %%DATADIR%%/lib/slf4j-api.license
-%%DATADIR%%/lib/wagon-file-3.0.0.jar
+%%DATADIR%%/lib/wagon-file-3.1.0.jar
 %%DATADIR%%/lib/wagon-file.license
-%%DATADIR%%/lib/wagon-http-3.0.0-shaded.jar
+%%DATADIR%%/lib/wagon-http-3.1.0-shaded.jar
 %%DATADIR%%/lib/wagon-http.license
-%%DATADIR%%/lib/wagon-provider-api-3.0.0.jar
+%%DATADIR%%/lib/wagon-provider-api-3.1.0.jar
 %%DATADIR%%/lib/wagon-provider-api.license
-%%DATADIR%%/maven-3.5.3
+%%DATADIR%%/maven-3.5.4