Update devel/apache-maven to 2.2.0

Maven 2.2.0 contains a few important changes that justify the version
upgrade, instead of simply naming it 2.1.1. First, the Java requirement
for Maven 2.2.0 has been upgraded to 1.5 or later. This upgrade was
planned for 2.1.0, but that release still contained binaries that were
compatible with JDK 1.4. In addition, due to some serious flaws in the
version-expression POM transformation included in 2.1.0, this feature
has been removed for the time being. Finally, some new default execution
IDs have been added to Maven to enable the separation of configuration
for plugins bound by the default lifecycle mappings, and for those
invoked directly from the command line.

Changes that may affect existing builds

* MNG-4143 - Starting in 2.2.0, Maven will run only on Java 1.5 and later.
  You can still build projects for JDK1.4 and earlier using the approach
  documented in the Guide to Building JDK 1.4 Projects on JDK 1.5.
* MNG-3401 - Executions with an id equal to default-phase (where phase is
  a valid lifecycle phase) may have unexpected results as it will be merged
  into the default lifecycle.
* MNG-4140/4179 - Version-expression resolution during installation and
  deployment has been removed, returning to Maven 2.0.x behaviour.

3 files changed, 9 insertions, 8 deletions

diff --git a/devel/apache-maven/Makefile b/devel/apache-maven/Makefile
index e8702d02a68..eb8cdaa0f82 100644
--- a/devel/apache-maven/Makefile
+++ b/devel/apache-maven/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2009/05/28 23:27:12 yyamano Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/29 17:45:59 yyamano Exp $
 #
 
-DISTNAME=	apache-maven-2.1.0
+DISTNAME=	apache-maven-2.2.0
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE:=maven/binaries/}
 EXTRACT_SUFX=	.tar.bz2
@@ -14,7 +14,7 @@ COMMENT=	Apache Project's software project management and comprehension tool
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_JAVA=	run
-USE_JAVA2=	yes
+USE_JAVA2=	1.5
 USE_TOOLS+=	pax
 NO_BUILD=	yes
 
diff --git a/devel/apache-maven/distinfo b/devel/apache-maven/distinfo
index 533f0181b04..2448c706bcf 100644
--- a/devel/apache-maven/distinfo
+++ b/devel/apache-maven/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2009/05/28 23:27:12 yyamano Exp $
+$NetBSD: distinfo,v 1.3 2009/07/29 17:45:59 yyamano Exp $
 
-SHA1 (apache-maven-2.1.0-bin.tar.bz2) = 7b18c2968b3c4e0c32aceb3203b776572c161fd3
-RMD160 (apache-maven-2.1.0-bin.tar.bz2) = fde285896606d8a380ad07656a6401f6d66b4f6b
-Size (apache-maven-2.1.0-bin.tar.bz2) = 2903842 bytes
+SHA1 (apache-maven-2.2.0-bin.tar.bz2) = c301aefcd7dd9a6fb605937e1e049ed485f75188
+RMD160 (apache-maven-2.2.0-bin.tar.bz2) = 96b0c1afe229bb047f3bd4045390b8f6a54a86a0
+Size (apache-maven-2.2.0-bin.tar.bz2) = 2854567 bytes
 SHA1 (patch-aa) = 74c4607226b3d783648c4fc369460dcce4a0144f
 SHA1 (patch-ab) = d9219f96473c4a929cad15990e1c131e08f8ed13
diff --git a/doc/CHANGES-2009 b/doc/CHANGES-2009
index 67c297110a5..6b895f44cb4 100644
--- a/doc/CHANGES-2009
+++ b/doc/CHANGES-2009
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2009,v 1.2875 2009/07/29 11:03:34 joerg Exp $
+$NetBSD: CHANGES-2009,v 1.2876 2009/07/29 17:45:59 yyamano Exp $
 
 Changes to the packages collection and infrastructure in 2009:
 
@@ -3823,3 +3823,4 @@ Changes to the packages collection and infrastructure in 2009:
 	Added databases/postgresql84-plpython version 8.4.0 [adam 2009-07-29]
 	Added databases/postgresql84-pltcl version 8.4.0 [adam 2009-07-29]
 	Updated www/py-django to 1.0.3 [joerg 2009-07-29]
+	Updated devel/apache-maven to 2.2.0 [yyamano 2009-07-29]