diff -r -u /usr/ports/devel/maven3/Makefile maven/Makefile
--- /usr/ports/devel/maven3/Makefile	2014-06-11 16:55:34.000000000 +0200
+++ maven/Makefile	2015-03-30 10:43:53.000000000 +0200
@@ -1,28 +1,28 @@
 # Created by: Herve Quiroz <hq@FreeBSD.org>
-# $FreeBSD: head/devel/maven3/Makefile 357428 2014-06-11 08:09:32Z marino $
+# $FreeBSD: head/devel/maven31/Makefile 343834 2014-02-12 02:26:25Z fluffy $
 
-PORTNAME=	maven3
-DISTVERSION=	3.0.5
+PORTNAME=	maven
+DISTVERSION=	3.3.1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	maven/binaries
+MASTER_SITE_SUBDIR=	maven/maven-3/${DISTVERSION}/binaries
 DISTNAME=	apache-maven-${DISTVERSION}-bin
 
-MAINTAINER=	wombat@marsupial.org
-COMMENT=	Java project management tool, 3.x branch
+MAINTAINER=	yerenkow@gmail.com
+COMMENT=	Java project management tool
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	mvn:${PORTSDIR}/devel/maven-wrapper
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
+JAVA_VERSION=	1.7+
 NO_BUILD=	yes
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 WRKSRC=		${WRKDIR}/apache-maven-${DISTVERSION}
 SUB_FILES=	mvn.sh
-SUB_LIST=	CLASSWORLDS_JAR=plexus-classworlds-2.4.jar
-INSTANCE_FILE=	030005-${PORTNAME}-${PORTVERSION}
+SUB_LIST=	CLASSWORLDS_JAR=plexus-classworlds-2.5.2.jar
+INSTANCE_FILE=	030205-${PORTNAME}-${PORTVERSION}
 INSTANCES_DIR=	etc/maven-wrapper/instances.d/
 
 post-extract:
@@ -30,14 +30,11 @@
 	${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
+	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}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${INSTANCES_DIR}
+	${INSTALL_DATA} ${WRKSRC}/${INSTANCE_FILE} ${STAGEDIR}${PREFIX}/${INSTANCES_DIR}
 
 .include <bsd.port.mk>
diff -r -u /usr/ports/devel/maven3/distinfo maven/distinfo
--- /usr/ports/devel/maven3/distinfo	2014-06-11 16:55:34.000000000 +0200
+++ maven/distinfo	2015-03-30 10:44:03.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (apache-maven-3.0.5-bin.tar.gz) = d98d766be9254222920c1d541efd466ae6502b82a39166c90d65ffd7ea357dd9
-SIZE (apache-maven-3.0.5-bin.tar.gz) = 5144659
+SHA256 (apache-maven-3.3.1-bin.tar.gz) = 153564900617218a126f78d2603d060d0a15f19f3ec1689fc2b7692a3c15b9aa
+SIZE (apache-maven-3.3.1-bin.tar.gz) = 8059952
diff -r -u /usr/ports/devel/maven3/files/mvn.sh.in maven/files/mvn.sh.in
--- /usr/ports/devel/maven3/files/mvn.sh.in	2014-06-09 10:12:25.000000000 +0200
+++ maven/files/mvn.sh.in	2015-03-09 13:11:07.000000000 +0100
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/devel/maven3/files/mvn.sh.in,v 1.1 2011-09-01 21:53:01 hq Exp $
+# $FreeBSD$
 
 if [ -f /etc/mavenrc ] ; then
 	. /etc/mavenrc
diff -r -u /usr/ports/devel/maven3/pkg-descr maven/pkg-descr
--- /usr/ports/devel/maven3/pkg-descr	2014-06-09 10:12:25.000000000 +0200
+++ maven/pkg-descr	2015-03-09 13:11:07.000000000 +0100
@@ -2,4 +2,4 @@
 the concept of a project object model (POM), Maven can manage a project's
 build, reporting and documentation from a central piece of information. 
 
-WWW: http://maven.apache.org/
+WWW:	http://maven.apache.org/
diff -r -u /usr/ports/devel/maven3/pkg-plist maven/pkg-plist
--- /usr/ports/devel/maven3/pkg-plist	2014-10-27 21:25:12.000000000 +0100
+++ maven/pkg-plist	2015-03-30 19:42:23.000000000 +0200
@@ -1,41 +1,88 @@
-etc/maven-wrapper/instances.d/030005-maven3-3.0.5
-%%DATADIR%%/030005-maven3-3.0.5
-%%DATADIR%%/LICENSE.txt
-%%DATADIR%%/NOTICE.txt
+%%ETCDIR%%-wrapper/instances.d/030205-maven-3.3.1
+%%DATADIR%%/030205-maven-3.3.1
+%%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.4.jar
+%%DATADIR%%/boot/plexus-classworlds-2.5.2.jar
+%%DATADIR%%/conf/logging/simplelogger.properties
 %%DATADIR%%/conf/settings.xml
-%%DATADIR%%/lib/aether-api-1.13.1.jar
-%%DATADIR%%/lib/aether-connector-wagon-1.13.1.jar
-%%DATADIR%%/lib/aether-impl-1.13.1.jar
-%%DATADIR%%/lib/aether-spi-1.13.1.jar
-%%DATADIR%%/lib/aether-util-1.13.1.jar
+%%DATADIR%%/conf/toolchains.xml
+%%DATADIR%%/lib/aether-api-1.0.2.v20150114.jar
+%%DATADIR%%/lib/aether-api.license
+%%DATADIR%%/lib/aether-connector-basic-1.0.2.v20150114.jar
+%%DATADIR%%/lib/aether-connector-basic.license
+%%DATADIR%%/lib/aether-impl-1.0.2.v20150114.jar
+%%DATADIR%%/lib/aether-impl.license
+%%DATADIR%%/lib/aether-spi-1.0.2.v20150114.jar
+%%DATADIR%%/lib/aether-spi.license
+%%DATADIR%%/lib/aether-transport-wagon-1.0.2.v20150114.jar
+%%DATADIR%%/lib/aether-transport-wagon.license
+%%DATADIR%%/lib/aether-util-1.0.2.v20150114.jar
+%%DATADIR%%/lib/aether-util.license
+%%DATADIR%%/lib/aopalliance-1.0.jar
+%%DATADIR%%/lib/cdi-api-1.0.jar
+%%DATADIR%%/lib/cdi-api.license
 %%DATADIR%%/lib/commons-cli-1.2.jar
+%%DATADIR%%/lib/commons-io-2.2.jar
+%%DATADIR%%/lib/commons-lang-2.6.jar
 %%DATADIR%%/lib/ext/README.txt
-%%DATADIR%%/lib/maven-aether-provider-3.0.5.jar
-%%DATADIR%%/lib/maven-artifact-3.0.5.jar
-%%DATADIR%%/lib/maven-compat-3.0.5.jar
-%%DATADIR%%/lib/maven-core-3.0.5.jar
-%%DATADIR%%/lib/maven-embedder-3.0.5.jar
-%%DATADIR%%/lib/maven-model-3.0.5.jar
-%%DATADIR%%/lib/maven-model-builder-3.0.5.jar
-%%DATADIR%%/lib/maven-plugin-api-3.0.5.jar
-%%DATADIR%%/lib/maven-repository-metadata-3.0.5.jar
-%%DATADIR%%/lib/maven-settings-3.0.5.jar
-%%DATADIR%%/lib/maven-settings-builder-3.0.5.jar
+%%DATADIR%%/lib/guava-18.0.jar
+%%DATADIR%%/lib/javax.inject-1.jar
+%%DATADIR%%/lib/jsoup-1.7.2.jar
+%%DATADIR%%/lib/jsoup.license
+%%DATADIR%%/lib/jsr250-api-1.0.jar
+%%DATADIR%%/lib/jsr250-api.license
+%%DATADIR%%/lib/maven-aether-provider-3.3.1.jar
+%%DATADIR%%/lib/maven-aether-provider.license
+%%DATADIR%%/lib/maven-artifact-3.3.1.jar
+%%DATADIR%%/lib/maven-artifact.license
+%%DATADIR%%/lib/maven-builder-support-3.3.1.jar
+%%DATADIR%%/lib/maven-builder-support.license
+%%DATADIR%%/lib/maven-compat-3.3.1.jar
+%%DATADIR%%/lib/maven-compat.license
+%%DATADIR%%/lib/maven-core-3.3.1.jar
+%%DATADIR%%/lib/maven-core.license
+%%DATADIR%%/lib/maven-embedder-3.3.1.jar
+%%DATADIR%%/lib/maven-embedder.license
+%%DATADIR%%/lib/maven-model-3.3.1.jar
+%%DATADIR%%/lib/maven-model-builder-3.3.1.jar
+%%DATADIR%%/lib/maven-model-builder.license
+%%DATADIR%%/lib/maven-model.license
+%%DATADIR%%/lib/maven-plugin-api-3.3.1.jar
+%%DATADIR%%/lib/maven-plugin-api.license
+%%DATADIR%%/lib/maven-repository-metadata-3.3.1.jar
+%%DATADIR%%/lib/maven-repository-metadata.license
+%%DATADIR%%/lib/maven-settings-3.3.1.jar
+%%DATADIR%%/lib/maven-settings-builder-3.3.1.jar
+%%DATADIR%%/lib/maven-settings-builder.license
+%%DATADIR%%/lib/maven-settings.license
+%%DATADIR%%/lib/org.eclipse.sisu.inject-0.3.0.jar
+%%DATADIR%%/lib/org.eclipse.sisu.inject.license
+%%DATADIR%%/lib/org.eclipse.sisu.plexus-0.3.0.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.5.5.jar
-%%DATADIR%%/lib/plexus-interpolation-1.14.jar
+%%DATADIR%%/lib/plexus-interpolation-1.21.jar
 %%DATADIR%%/lib/plexus-sec-dispatcher-1.3.jar
-%%DATADIR%%/lib/plexus-utils-2.0.6.jar
-%%DATADIR%%/lib/sisu-guava-0.9.9.jar
-%%DATADIR%%/lib/sisu-guice-3.1.0-no_aop.jar
-%%DATADIR%%/lib/sisu-inject-bean-2.3.0.jar
-%%DATADIR%%/lib/sisu-inject-plexus-2.3.0.jar
-%%DATADIR%%/lib/wagon-file-2.4.jar
-%%DATADIR%%/lib/wagon-http-2.4-shaded.jar
-%%DATADIR%%/lib/wagon-provider-api-2.4.jar
+%%DATADIR%%/lib/plexus-sec-dispatcher.license
+%%DATADIR%%/lib/plexus-utils-3.0.20.jar
+%%DATADIR%%/lib/sisu-guice-3.2.5-no_aop.jar
+%%DATADIR%%/lib/slf4j-api-1.7.5.jar
+%%DATADIR%%/lib/slf4j-api.license
+%%DATADIR%%/lib/slf4j-simple-1.7.5.jar
+%%DATADIR%%/lib/slf4j-simple.license
+%%DATADIR%%/lib/wagon-file-2.8.jar
+%%DATADIR%%/lib/wagon-file.license
+%%DATADIR%%/lib/wagon-http-2.8-shaded.jar
+%%DATADIR%%/lib/wagon-http-shared-2.8.jar
+%%DATADIR%%/lib/wagon-http-shared.license
+%%DATADIR%%/lib/wagon-http.license
+%%DATADIR%%/lib/wagon-provider-api-2.8.jar
+%%DATADIR%%/lib/wagon-provider-api.license