Update maven to 3.0.4.

Too many changes since 2.2.1.

Apache Maven 3.0.4 should be backwards compatibility with 2.x. For
compatibility issues, see

https://cwiki.apache.org/MAVEN/maven-3x-compatibility-notes.html

5 files changed, 63 insertions, 31 deletions

diff --git a/devel/apache-maven/Makefile b/devel/apache-maven/Makefile
index a691efb6c44..6015a2042dc 100644
--- a/devel/apache-maven/Makefile
+++ b/devel/apache-maven/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2012/10/31 11:16:35 asau Exp $
+# $NetBSD: Makefile,v 1.6 2013/02/17 17:37:41 fhajny Exp $
 #
 
-DISTNAME=	apache-maven-2.2.1
+DISTNAME=	apache-maven-3.0.4
 CATEGORIES=	devel java
-MASTER_SITES=	${MASTER_SITE_APACHE:=maven/binaries/}
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_APACHE:=maven/maven-3/${PKGVERSION_NOREV}/binaries/}
 DISTFILES=	${DISTNAME}-bin${EXTRACT_SUFX}
 
 MAINTAINER=	yyamano@NetBSD.org
 HOMEPAGE=	http://maven.apache.org/
 COMMENT=	Apache Project's software project management and comprehension tool
+LICENSE=	apache-2.0
 
 USE_JAVA=	run
 USE_JAVA2=	1.5
@@ -22,12 +22,16 @@ SUBST_STAGE.maven=	pre-configure
 SUBST_SED.maven=	-e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g'
 SUBST_SED.maven+=	-e 's,@PREFIX@,${PREFIX},g'
 
-INSTALLATION_DIRS=	bin etc/maven lib/java/maven lib/java/maven/boot share/doc/java/maven
+INSTALLATION_DIRS=	bin etc/maven lib/java/maven lib/java/maven/boot
+INSTALLATION_DIRS+=	share/doc/java/maven share/examples/maven
+
+CONF_FILES+=	share/examples/maven/m2.conf ${PKG_SYSCONFDIR}/m2.conf
+CONF_FILES+=	share/examples/maven/settings.xml ${PKG_SYSCONFDIR}/settings.xml
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/mvn ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/bin/m2.conf ${DESTDIR}${PREFIX}/etc/maven
-	${INSTALL_DATA} ${WRKSRC}/conf/settings.xml ${DESTDIR}${PREFIX}/etc/maven
+	${INSTALL_DATA} ${WRKSRC}/bin/m2.conf ${DESTDIR}${PREFIX}/share/examples/maven
+	${INSTALL_DATA} ${WRKSRC}/conf/settings.xml ${DESTDIR}${PREFIX}/share/examples/maven
 	${INSTALL_DATA} ${WRKSRC}/boot/*.jar ${DESTDIR}${PREFIX}/lib/java/maven/boot
 	${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${DESTDIR}${PREFIX}/lib/java/maven
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${DESTDIR}${PREFIX}/share/doc/java/maven
diff --git a/devel/apache-maven/PLIST b/devel/apache-maven/PLIST
index a78bccfad9e..5087024f08c 100644
--- a/devel/apache-maven/PLIST
+++ b/devel/apache-maven/PLIST
@@ -1,9 +1,37 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:48:08 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/02/17 17:37:41 fhajny Exp $
 bin/mvn
-etc/maven/m2.conf
-etc/maven/settings.xml
-lib/java/maven/boot/classworlds-1.1.jar
-lib/java/maven/maven-${PKGVERSION}-uber.jar
+lib/java/maven/aether-api-1.13.1.jar
+lib/java/maven/aether-connector-wagon-1.13.1.jar
+lib/java/maven/aether-impl-1.13.1.jar
+lib/java/maven/aether-spi-1.13.1.jar
+lib/java/maven/aether-util-1.13.1.jar
+lib/java/maven/boot/plexus-classworlds-2.4.jar
+lib/java/maven/commons-cli-1.2.jar
+lib/java/maven/maven-aether-provider-${PKGVERSION}.jar
+lib/java/maven/maven-artifact-${PKGVERSION}.jar
+lib/java/maven/maven-compat-${PKGVERSION}.jar
+lib/java/maven/maven-core-${PKGVERSION}.jar
+lib/java/maven/maven-embedder-${PKGVERSION}.jar
+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-settings-${PKGVERSION}.jar
+lib/java/maven/maven-settings-builder-${PKGVERSION}.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.14.jar
+lib/java/maven/plexus-sec-dispatcher-1.3.jar
+lib/java/maven/plexus-utils-2.0.6.jar
+lib/java/maven/sisu-guava-0.9.9.jar
+lib/java/maven/sisu-guice-3.1.0-no_aop.jar
+lib/java/maven/sisu-inject-bean-2.3.0.jar
+lib/java/maven/sisu-inject-plexus-2.3.0.jar
+lib/java/maven/wagon-file-2.2.jar
+lib/java/maven/wagon-http-2.2-shaded.jar
+lib/java/maven/wagon-provider-api-2.2.jar
 share/doc/java/maven/LICENSE.txt
 share/doc/java/maven/NOTICE.txt
 share/doc/java/maven/README.txt
+share/examples/maven/m2.conf
+share/examples/maven/settings.xml
diff --git a/devel/apache-maven/distinfo b/devel/apache-maven/distinfo
index 2bf0a105e5a..e21f467178f 100644
--- a/devel/apache-maven/distinfo
+++ b/devel/apache-maven/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2009/11/07 00:14:53 yyamano Exp $
+$NetBSD: distinfo,v 1.5 2013/02/17 17:37:41 fhajny Exp $
 
-SHA1 (apache-maven-2.2.1-bin.tar.bz2) = 47ac0417a200cbc6d1b967d6b7c6ae1138e9e3e0
-RMD160 (apache-maven-2.2.1-bin.tar.bz2) = 25d523d3dc86cf4695b0e343cf0f6e58ea8a54e3
-Size (apache-maven-2.2.1-bin.tar.bz2) = 2839688 bytes
-SHA1 (patch-aa) = 74c4607226b3d783648c4fc369460dcce4a0144f
-SHA1 (patch-ab) = d9219f96473c4a929cad15990e1c131e08f8ed13
+SHA1 (apache-maven-3.0.4-bin.tar.gz) = 0de5dc162bafde3fcb0a6b009cfeea81a042523b
+RMD160 (apache-maven-3.0.4-bin.tar.gz) = c55335fb5c10380db64e6b56ee26cd6f42307a72
+Size (apache-maven-3.0.4-bin.tar.gz) = 4873043 bytes
+SHA1 (patch-aa) = 2f7e8890e95eaf10d585f756e0089789d366e5b9
+SHA1 (patch-ab) = d2e86da0eea13c1f918bd43615b530dda0aa4141
diff --git a/devel/apache-maven/patches/patch-aa b/devel/apache-maven/patches/patch-aa
index 448a0df1c82..2c81d6db941 100644
--- a/devel/apache-maven/patches/patch-aa
+++ b/devel/apache-maven/patches/patch-aa
@@ -1,10 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/12/16 07:39:41 yyamano Exp $
+$NetBSD: patch-aa,v 1.2 2013/02/17 17:37:41 fhajny Exp $
 
---- bin/m2.conf.orig	2008-04-07 09:04:44.000000000 -0700
+--- bin/m2.conf.orig	2012-01-17 08:47:39.000000000 +0000
 +++ bin/m2.conf
-@@ -3,4 +3,4 @@ main is org.apache.maven.cli.MavenCli fr
+@@ -3,5 +3,5 @@ main is org.apache.maven.cli.MavenCli fr
  set maven.home default ${user.home}/m2

  

  [plexus.core]

--load ${maven.home}/lib/*.jar

-+load ${maven.home}/lib/java/maven/*.jar

+-optionally ${maven.home}/lib/ext/*.jar

++optionally ${maven.home}/lib/java/maven/*.jar

+ load       ${maven.home}/lib/*.jar

diff --git a/devel/apache-maven/patches/patch-ab b/devel/apache-maven/patches/patch-ab
index 84f3c5f1228..6250f32ecba 100644
--- a/devel/apache-maven/patches/patch-ab
+++ b/devel/apache-maven/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/12/16 07:39:41 yyamano Exp $
+$NetBSD: patch-ab,v 1.2 2013/02/17 17:37:41 fhajny Exp $
 
---- bin/mvn.orig	2008-04-07 09:04:44.000000000 -0700
+--- bin/mvn.orig	2012-01-17 08:47:39.000000000 +0000
 +++ bin/mvn
-@@ -74,6 +74,15 @@ if [ -z "$JAVA_HOME" ] ; then
+@@ -69,6 +69,15 @@ if [ -z "$JAVA_HOME" ] ; then
    fi
  fi
  
@@ -18,16 +18,15 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/12/16 07:39:41 yyamano Exp $
  if [ -z "$M2_HOME" ] ; then
    ## resolve links - $0 may be a link to maven's home
    PRG="$0"
-@@ -156,8 +165,10 @@ fi
+@@ -166,7 +175,9 @@ fi
  
  exec "$JAVACMD" \
    $MAVEN_OPTS \
--  -classpath "${M2_HOME}"/boot/classworlds-*.jar \
+-  -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
 -  "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
-+  -classpath "${M2_HOME}"/lib/java/maven/boot/classworlds-*.jar \
++  -classpath "${M2_HOME}"/lib/java/maven/boot/plexus-classworlds-*.jar \
 +  "-Dclassworlds.conf=${M2_HOME}/etc/maven/m2.conf" \
    "-Dmaven.home=${M2_HOME}"  \
 +  "-Dorg.apache.maven.global-settings=${M2_HOME}/etc/maven/settings.xml" \
 +  "-Dorg.apache.maven.global-plugin-registry=${M2_HOME}/etc/maven/plugin-registry.xml" \
-   ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS
- 
+   ${CLASSWORLDS_LAUNCHER} "$@"