Wed Jul 29 17:45:59 2009 UTC ()
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.


(yyamano)
diff -r1.2 -r1.3 pkgsrc/devel/apache-maven/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/apache-maven/distinfo
diff -r1.2875 -r1.2876 pkgsrc/doc/CHANGES-2009
cvs diff -r1.2 -r1.3 pkgsrc/devel/apache-maven/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/apache-maven/Makefile 2009/05/28 23:27:12 1.2
+++ pkgsrc/devel/apache-maven/Makefile 2009/07/29 17:45:59 1.3
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: Makefile,v 1.2 2009/05/28 23:27:12 yyamano Exp $ 1# $NetBSD: Makefile,v 1.3 2009/07/29 17:45:59 yyamano Exp $
2# 2#
3 3
4DISTNAME= apache-maven-2.1.0 4DISTNAME= apache-maven-2.2.0
5CATEGORIES= devel java 5CATEGORIES= devel java
6MASTER_SITES= ${MASTER_SITE_APACHE:=maven/binaries/} 6MASTER_SITES= ${MASTER_SITE_APACHE:=maven/binaries/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8DISTFILES= ${DISTNAME}-bin${EXTRACT_SUFX} 8DISTFILES= ${DISTNAME}-bin${EXTRACT_SUFX}
9 9
10MAINTAINER= yyamano@NetBSD.org 10MAINTAINER= yyamano@NetBSD.org
11HOMEPAGE= http://maven.apache.org/ 11HOMEPAGE= http://maven.apache.org/
12COMMENT= Apache Project's software project management and comprehension tool 12COMMENT= Apache Project's software project management and comprehension tool
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16USE_JAVA= run 16USE_JAVA= run
17USE_JAVA2= yes 17USE_JAVA2= 1.5
18USE_TOOLS+= pax 18USE_TOOLS+= pax
19NO_BUILD= yes 19NO_BUILD= yes
20 20
21SUBST_CLASSES+= maven 21SUBST_CLASSES+= maven
22SUBST_FILES.maven= bin/mvn 22SUBST_FILES.maven= bin/mvn
23SUBST_STAGE.maven= pre-configure 23SUBST_STAGE.maven= pre-configure
24SUBST_SED.maven= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' 24SUBST_SED.maven= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g'
25SUBST_SED.maven+= -e 's,@PREFIX@,${PREFIX},g' 25SUBST_SED.maven+= -e 's,@PREFIX@,${PREFIX},g'
26 26
27INSTALLATION_DIRS= bin etc/maven lib/java/maven lib/java/maven/boot share/doc/java/maven 27INSTALLATION_DIRS= bin etc/maven lib/java/maven lib/java/maven/boot share/doc/java/maven
28 28
29do-install: 29do-install:
30 ${INSTALL_SCRIPT} ${WRKSRC}/bin/mvn ${DESTDIR}${PREFIX}/bin 30 ${INSTALL_SCRIPT} ${WRKSRC}/bin/mvn ${DESTDIR}${PREFIX}/bin
cvs diff -r1.2 -r1.3 pkgsrc/devel/apache-maven/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/apache-maven/distinfo 2009/05/28 23:27:12 1.2
+++ pkgsrc/devel/apache-maven/distinfo 2009/07/29 17:45:59 1.3
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.2 2009/05/28 23:27:12 yyamano Exp $ 1$NetBSD: distinfo,v 1.3 2009/07/29 17:45:59 yyamano Exp $
2 2
3SHA1 (apache-maven-2.1.0-bin.tar.bz2) = 7b18c2968b3c4e0c32aceb3203b776572c161fd3 3SHA1 (apache-maven-2.2.0-bin.tar.bz2) = c301aefcd7dd9a6fb605937e1e049ed485f75188
4RMD160 (apache-maven-2.1.0-bin.tar.bz2) = fde285896606d8a380ad07656a6401f6d66b4f6b 4RMD160 (apache-maven-2.2.0-bin.tar.bz2) = 96b0c1afe229bb047f3bd4045390b8f6a54a86a0
5Size (apache-maven-2.1.0-bin.tar.bz2) = 2903842 bytes 5Size (apache-maven-2.2.0-bin.tar.bz2) = 2854567 bytes
6SHA1 (patch-aa) = 74c4607226b3d783648c4fc369460dcce4a0144f 6SHA1 (patch-aa) = 74c4607226b3d783648c4fc369460dcce4a0144f
7SHA1 (patch-ab) = d9219f96473c4a929cad15990e1c131e08f8ed13 7SHA1 (patch-ab) = d9219f96473c4a929cad15990e1c131e08f8ed13
cvs diff -r1.2875 -r1.2876 pkgsrc/doc/CHANGES-2009 (expand / switch to unified diff)

--- pkgsrc/doc/CHANGES-2009 2009/07/29 11:03:34 1.2875
+++ pkgsrc/doc/CHANGES-2009 2009/07/29 17:45:59 1.2876
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: CHANGES-2009,v 1.2875 2009/07/29 11:03:34 joerg Exp $ 1$NetBSD: CHANGES-2009,v 1.2876 2009/07/29 17:45:59 yyamano Exp $
2 2
3Changes to the packages collection and infrastructure in 2009: 3Changes to the packages collection and infrastructure in 2009:
4 4
5 Updated databases/py-postgresql to 4.0 [darcy 2009-01-01] 5 Updated databases/py-postgresql to 4.0 [darcy 2009-01-01]
6 Updated security/amavisd-new to 2.6.2 [obache 2009-01-01] 6 Updated security/amavisd-new to 2.6.2 [obache 2009-01-01]
7 Updated devel/cpuflags to 1.31 [abs 2009-01-02] 7 Updated devel/cpuflags to 1.31 [abs 2009-01-02]
8 Updated databases/rrdtool to 1.3.5 [martti 2009-01-02] 8 Updated databases/rrdtool to 1.3.5 [martti 2009-01-02]
9 Updated databases/rrdtool12 to 1.2.29 [martti 2009-01-02] 9 Updated databases/rrdtool12 to 1.2.29 [martti 2009-01-02]
10 Updated textproc/p5-Text-WrapI18N to 0.06nb2 [he 2009-01-02] 10 Updated textproc/p5-Text-WrapI18N to 0.06nb2 [he 2009-01-02]
11 Updated devel/p5-Rose-Object to 0.85.4 [he 2009-01-02] 11 Updated devel/p5-Rose-Object to 0.85.4 [he 2009-01-02]
12 mk/bsd.pkg.mk: freeze ended for pkgsrc-2008Q4 branch [agc 2009-01-03] 12 mk/bsd.pkg.mk: freeze ended for pkgsrc-2008Q4 branch [agc 2009-01-03]
13 Updated archivers/pbzip2 to 1.0.4 [wiz 2009-01-03] 13 Updated archivers/pbzip2 to 1.0.4 [wiz 2009-01-03]
14 Added emulators/gambatte version 0.4.0 [wiz 2009-01-03] 14 Added emulators/gambatte version 0.4.0 [wiz 2009-01-03]
@@ -3813,13 +3813,14 @@ Changes to the packages collection and i @@ -3813,13 +3813,14 @@ Changes to the packages collection and i
3813 Added sysutils/gnome-commander version 1.2.8 [drochner 2009-07-28] 3813 Added sysutils/gnome-commander version 1.2.8 [drochner 2009-07-28]
3814 Updated databases/sqlite to 2.8.17 [drochner 2009-07-28] 3814 Updated databases/sqlite to 2.8.17 [drochner 2009-07-28]
3815 Updated textproc/db2latex to 0.8pre1nb6 [minskim 2009-07-28] 3815 Updated textproc/db2latex to 0.8pre1nb6 [minskim 2009-07-28]
3816 Updated www/wordpress to 2.8.2 [adrianp 2009-07-28] 3816 Updated www/wordpress to 2.8.2 [adrianp 2009-07-28]
3817 Added devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion version 0.01 [seb 2009-07-28] 3817 Added devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion version 0.01 [seb 2009-07-28]
3818 Added databases/postgresql84 version 8.4.0 [adam 2009-07-29] 3818 Added databases/postgresql84 version 8.4.0 [adam 2009-07-29]
3819 Added databases/postgresql84-client version 8.4.0 [adam 2009-07-29] 3819 Added databases/postgresql84-client version 8.4.0 [adam 2009-07-29]
3820 Added databases/postgresql84-server version 8.4.0 [adam 2009-07-29] 3820 Added databases/postgresql84-server version 8.4.0 [adam 2009-07-29]
3821 Added databases/postgresql84-adminpack version 8.4.0 [adam 2009-07-29] 3821 Added databases/postgresql84-adminpack version 8.4.0 [adam 2009-07-29]
3822 Added databases/postgresql84-plperl version 8.4.0 [adam 2009-07-29] 3822 Added databases/postgresql84-plperl version 8.4.0 [adam 2009-07-29]
3823 Added databases/postgresql84-plpython version 8.4.0 [adam 2009-07-29] 3823 Added databases/postgresql84-plpython version 8.4.0 [adam 2009-07-29]
3824 Added databases/postgresql84-pltcl version 8.4.0 [adam 2009-07-29] 3824 Added databases/postgresql84-pltcl version 8.4.0 [adam 2009-07-29]
3825 Updated www/py-django to 1.0.3 [joerg 2009-07-29] 3825 Updated www/py-django to 1.0.3 [joerg 2009-07-29]
 3826 Updated devel/apache-maven to 2.2.0 [yyamano 2009-07-29]