cvs commit: jakarta-commons/collections maven.xml
scolebourne2004/06/28 16:22:22 Modified:collections maven.xml Log: Fix javadoc generation of tagged versions Revision ChangesPath 1.16 +1 -0 jakarta-commons/collections/maven.xml Index: maven.xml === RCS file: /home/cvs/jakarta-commons/collections/maven.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- maven.xml 22 Jun 2004 22:24:29 - 1.15 +++ maven.xml 28 Jun 2004 23:22:22 - 1.16 @@ -177,6 +177,7 @@ j:set var=collections.javadoc.tag value=COLLECTIONS_3_0 / j:set var=collections.javadoc.tag.windowtitle value=Collections 3.0 release API / j:set var=collections.javadoc.tag.overview value=src/java/org/apache/commons/collections/overview.html / +attainGoal name=javadoc:generate / j:set var=collections.javadoc.tag value=COLLECTIONS_3_1 / j:set var=collections.javadoc.tag.windowtitle value=Collections 3.1 release API / j:set var=collections.javadoc.tag.overview value=src/java/org/apache/commons/collections/overview.html / - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections maven.xml
scolebourne2004/06/22 15:24:29 Modified:collections maven.xml Log: Prepare for version 3.1 Revision ChangesPath 1.15 +7 -0 jakarta-commons/collections/maven.xml Index: maven.xml === RCS file: /home/cvs/jakarta-commons/collections/maven.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- maven.xml 29 May 2004 14:22:21 - 1.14 +++ maven.xml 22 Jun 2004 22:24:29 - 1.15 @@ -165,6 +165,10 @@ j:set var=collections.javadoc.tag.windowtitle value=Collections 3.0 release API / j:set var=collections.javadoc.tag.overview value=src/java/org/apache/commons/collections/overview.html / attainGoal name=javadoc:generate / +j:set var=collections.javadoc.tag value=COLLECTIONS_3_1 / +j:set var=collections.javadoc.tag.windowtitle value=Collections 3.1 release API / +j:set var=collections.javadoc.tag.overview value=src/java/org/apache/commons/collections/overview.html / +attainGoal name=javadoc:generate / /postGoal postGoal name=site:generate!-- NEW MAVEN -- j:set var=collections.javadoc.tag value=COLLECTIONS_2_1_1 / @@ -172,6 +176,9 @@ attainGoal name=javadoc:generate / j:set var=collections.javadoc.tag value=COLLECTIONS_3_0 / j:set var=collections.javadoc.tag.windowtitle value=Collections 3.0 release API / +j:set var=collections.javadoc.tag.overview value=src/java/org/apache/commons/collections/overview.html / +j:set var=collections.javadoc.tag value=COLLECTIONS_3_1 / +j:set var=collections.javadoc.tag.windowtitle value=Collections 3.1 release API / j:set var=collections.javadoc.tag.overview value=src/java/org/apache/commons/collections/overview.html / attainGoal name=javadoc:generate / /postGoal - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections maven.xml
scolebourne2004/05/29 07:22:21 Modified:collections maven.xml Log: Version 2.1.1 released Revision ChangesPath 1.14 +4 -4 jakarta-commons/collections/maven.xml Index: maven.xml === RCS file: /home/cvs/jakarta-commons/collections/maven.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- maven.xml 19 Feb 2004 21:41:04 - 1.13 +++ maven.xml 29 May 2004 14:22:21 - 1.14 @@ -158,8 +158,8 @@ /postGoal postGoal name=site:run-reports!-- OLD MAVEN -- -j:set var=collections.javadoc.tag value=COLLECTIONS_2_1 / -j:set var=collections.javadoc.tag.windowtitle value=Collections 2.1 release API / +j:set var=collections.javadoc.tag value=COLLECTIONS_2_1_1 / +j:set var=collections.javadoc.tag.windowtitle value=Collections 2.1.1 release API / attainGoal name=javadoc:generate / j:set var=collections.javadoc.tag value=COLLECTIONS_3_0 / j:set var=collections.javadoc.tag.windowtitle value=Collections 3.0 release API / @@ -167,8 +167,8 @@ attainGoal name=javadoc:generate / /postGoal postGoal name=site:generate!-- NEW MAVEN -- -j:set var=collections.javadoc.tag value=COLLECTIONS_2_1 / -j:set var=collections.javadoc.tag.windowtitle value=Collections 2.1 release API / +j:set var=collections.javadoc.tag value=COLLECTIONS_2_1_1 / +j:set var=collections.javadoc.tag.windowtitle value=Collections 2.1.1 release API / attainGoal name=javadoc:generate / j:set var=collections.javadoc.tag value=COLLECTIONS_3_0 / j:set var=collections.javadoc.tag.windowtitle value=Collections 3.0 release API / - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections maven.xml project.properties
scolebourne2004/01/24 05:31:29 Modified:collections maven.xml project.properties Log: Update to site generation Revision ChangesPath 1.11 +1 -1 jakarta-commons/collections/maven.xml Index: maven.xml === RCS file: /home/cvs/jakarta-commons/collections/maven.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- maven.xml 14 Jan 2004 21:23:35 - 1.10 +++ maven.xml 24 Jan 2004 13:31:29 - 1.11 @@ -125,8 +125,8 @@ packagenames=${pom.package}.* destdir=${collections.javadoc.tag.destdir} sourcepath=${taggedSourceDir} +access=${collections.javadoc.tag.access} author=true -protected=true version=true use=true windowtitle=${collections.javadoc.tag.windowtitle} 1.8 +2 -1 jakarta-commons/collections/project.properties Index: project.properties === RCS file: /home/cvs/jakarta-commons/collections/project.properties,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- project.properties15 Jan 2004 21:06:20 - 1.7 +++ project.properties24 Jan 2004 13:31:29 - 1.8 @@ -7,7 +7,7 @@ maven.javadoc.author=false maven.javadoc.links=http://java.sun.com/j2se/1.3/docs/api/ maven.javadoc.overview=src/java/org/apache/commons/collections/overview.html -maven.javadoc.public=true +#maven.javadoc.public=true #maven.javadoc.package=false #maven.javadoc.private=false @@ -18,6 +18,7 @@ #collections.javadoc.tag.windowtitle =Collections 2.1 release API #collections.javadoc.tag = COLLECTIONS_3_0 #collections.javadoc.tag.windowtitle =Collections 3.0 release API +collections.javadoc.tag.access=public maven.compile.debug=on maven.compile.deprecation=off - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections maven.xml
scolebourne2004/01/24 10:58:06 Modified:collections maven.xml Log: Generate checksums Revision ChangesPath 1.12 +14 -0 jakarta-commons/collections/maven.xml Index: maven.xml === RCS file: /home/cvs/jakarta-commons/collections/maven.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- maven.xml 24 Jan 2004 13:31:29 - 1.11 +++ maven.xml 24 Jan 2004 18:58:06 - 1.12 @@ -219,4 +219,18 @@ /postGoal + postGoal name=dist:build-bin +j:set var=distDir value=${pom.getPluginContext('maven-dist-plugin').getVariable('maven.dist.dir')}/ +j:set var=finalName value=${pom.getPluginContext('maven-dist-plugin').getVariable('maven.final.name')}/ +ant:checksum file=${distDir}/${finalName}.tar.gz/ +ant:checksum file=${distDir}/${finalName}.zip/ + /postGoal + + postGoal name=dist:build-src +j:set var=distDir value=${pom.getPluginContext('maven-dist-plugin').getVariable('maven.dist.dir')}/ +j:set var=finalName value=${pom.getPluginContext('maven-dist-plugin').getVariable('maven.final.name')}/ +ant:checksum file=${distDir}/${finalName}-src.tar.gz/ +ant:checksum file=${distDir}/${finalName}-src.zip/ + /postGoal + /project - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections maven.xml
scolebourne2004/01/14 01:15:57 Modified:collections maven.xml Log: Build all javadocs in site generation Revision ChangesPath 1.9 +23 -9 jakarta-commons/collections/maven.xml Index: maven.xml === RCS file: /home/cvs/jakarta-commons/collections/maven.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- maven.xml 12 Jan 2004 21:54:27 - 1.8 +++ maven.xml 14 Jan 2004 09:15:57 - 1.9 @@ -91,21 +91,19 @@ j:set var=maven.javadoc.destdir value=${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.destdir')} / j:set var=maven.javadoc.stylesheet value=${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.stylesheet')} / - ant:property name=collections.javadoc.tag.destdir value=${maven.javadoc.destdir}-${collections.javadoc.tag}/ - ant:property name=collections.javadoc.tag.stylesheet value=${maven.javadoc.stylesheet}/ + j:set var=collections.javadoc.tag.destdir value=${maven.javadoc.destdir}-${collections.javadoc.tag}/ + j:set var=collections.javadoc.tag.stylesheet value=${maven.javadoc.stylesheet}/ - ant:property name=taggedBaseDir value=${maven.build.dir}/javadoc/${collections.javadoc.tag} / + j:set var=taggedBaseDir value=${maven.build.dir}/javadoc/${collections.javadoc.tag} / ant:mkdir dir=${taggedBaseDir} / maven:makeRelativePath var=relativeSrcDir basedir=${basedir} path=${pom.build.sourceDirectory} / util:replace var=relativeSrcDir oldChar=\ newChar=/ value=${relativeSrcDir} / - ant:property name=taggedSourceDir - value=${taggedBaseDir}/${pom.repository.cvsModule}/${relativeSrcDir}/ + j:set var=taggedSourceDir value=${taggedBaseDir}/${pom.repository.cvsModule}/${relativeSrcDir}/ ant:cvs cvsRoot=${pom.repository.cvsRoot} package=${pom.repository.cvsModule}/${relativeSrcDir} dest=${taggedBaseDir} - tag=${collections.javadoc.tag} - / + tag=${collections.javadoc.tag} / ant:mkdir dir=${collections.javadoc.tag.destdir} / ant:tstamp @@ -121,8 +119,7 @@ /j:otherwise /j:choose /ant:tstamp - ant:property name=copyright -value=Copyright amp;copy; ${year} ${pom.organization.name}. All Rights Reserved. / + j:set var=copyright value=Copyright amp;copy; ${year} ${pom.organization.name}. All Rights Reserved. / ant:javadoc packagenames=${pom.package}.* @@ -141,6 +138,23 @@ /j:if /postGoal + postGoal name=site:run-reports!-- OLD MAVEN -- +j:set var=collections.javadoc.tag value=COLLECTIONS_2_1 / +j:set var=collections.javadoc.tag.windowtitle value=Collections 2.1 release API / +attainGoal name=javadoc:generate / +j:set var=collections.javadoc.tag value=COLLECTIONS_3_0 / +j:set var=collections.javadoc.tag.windowtitle value=Collections 3.0 release API / +attainGoal name=javadoc:generate / + /postGoal + postGoal name=site:generate!-- NEW MAVEN -- +j:set var=collections.javadoc.tag value=COLLECTIONS_2_1 / +j:set var=collections.javadoc.tag.windowtitle value=Collections 2.1 release API / +attainGoal name=javadoc:generate / +j:set var=collections.javadoc.tag value=COLLECTIONS_3_0 / +j:set var=collections.javadoc.tag.windowtitle value=Collections 3.0 release API / +attainGoal name=javadoc:generate / + /postGoal + !-- == DIST == -- postGoal name=dist:prepare-bin-filesystem j:set var=maven.dist.bin.assembly.dir value=${pom.getPluginContext('maven-dist-plugin').getVariable('maven.dist.bin.assembly.dir')} / - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections maven.xml
scolebourne2004/01/14 13:23:35 Modified:collections maven.xml Log: Include overview in version 3 javadoc Revision ChangesPath 1.10 +6 -0 jakarta-commons/collections/maven.xml Index: maven.xml === RCS file: /home/cvs/jakarta-commons/collections/maven.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- maven.xml 14 Jan 2004 09:15:57 - 1.9 +++ maven.xml 14 Jan 2004 21:23:35 - 1.10 @@ -134,6 +134,10 @@ bottom=${copyright} stylesheetfile=${maven.javadoc.stylesheet} +j:if test=${context.getVariable('collections.javadoc.tag.overview') != null} + ant:setProperty name=overview value=${collections.javadoc.tag.overview} / +/j:if + /ant:javadoc /j:if /postGoal @@ -144,6 +148,7 @@ attainGoal name=javadoc:generate / j:set var=collections.javadoc.tag value=COLLECTIONS_3_0 / j:set var=collections.javadoc.tag.windowtitle value=Collections 3.0 release API / +j:set var=collections.javadoc.tag.overview value=src/java/org/apache/commons/collections/overview.html / attainGoal name=javadoc:generate / /postGoal postGoal name=site:generate!-- NEW MAVEN -- @@ -152,6 +157,7 @@ attainGoal name=javadoc:generate / j:set var=collections.javadoc.tag value=COLLECTIONS_3_0 / j:set var=collections.javadoc.tag.windowtitle value=Collections 3.0 release API / +j:set var=collections.javadoc.tag.overview value=src/java/org/apache/commons/collections/overview.html / attainGoal name=javadoc:generate / /postGoal - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections maven.xml project.properties
scolebourne2004/01/10 10:09:32 Modified:collections maven.xml project.properties Log: Add to maven build scripts for 3.0 release Revision ChangesPath 1.7 +114 -0jakarta-commons/collections/maven.xml Index: maven.xml === RCS file: /home/cvs/jakarta-commons/collections/maven.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- maven.xml 29 Dec 2003 23:56:15 - 1.6 +++ maven.xml 10 Jan 2004 18:09:32 - 1.7 @@ -77,4 +77,118 @@ tofile=${jardir__}/${testfwkName}.jar / /postGoal + !-- == JAVADOC PREVIOUS VERSIONS == -- + postGoal name=javadoc:generate +!-- This is a postGoal because we need data from the javadoc plugin which I can't get another way -- +!--description=Retrieves a tagged version of the source and generates the javadoc-- + +j:if test=${context.getVariable('collections.javadoc.tag') == null} + ant:echo message=The collections.javadoc.tag property must be set for javadoc:tag / +/j:if +j:if test=${context.getVariable('collections.javadoc.tag') != null} + ant:echo message=Generate javadoc for ${collections.javadoc.tag} / + !-- not in javadoc plugin, so have to setup properties -- + j:set var=maven.javadoc.destdir value=${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.destdir')} / + j:set var=maven.javadoc.stylesheet value=${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.stylesheet')} / + + ant:property name=collections.javadoc.tag.destdir value=${maven.javadoc.destdir}-${collections.javadoc.tag}/ + ant:property name=collections.javadoc.tag.stylesheet value=${maven.javadoc.stylesheet}/ + + ant:property name=taggedBaseDir value=${maven.build.dir}/javadoc/${collections.javadoc.tag} / + ant:mkdir dir=${taggedBaseDir} / + maven:makeRelativePath var=relativeSrcDir basedir=${basedir} path=${pom.build.sourceDirectory} / + util:replace var=relativeSrcDir oldChar=\ newChar=/ value=${relativeSrcDir} / + ant:property name=taggedSourceDir + value=${taggedBaseDir}/${pom.repository.cvsModule}/${relativeSrcDir}/ + ant:cvs + cvsRoot=${pom.repository.cvsRoot} + package=${pom.repository.cvsModule}/${relativeSrcDir} + dest=${taggedBaseDir} + tag=${collections.javadoc.tag} + / + + ant:mkdir dir=${collections.javadoc.tag.destdir} / + ant:tstamp + ant:format property=currentYear pattern=/ + /ant:tstamp + ant:tstamp +j:choose + j:when test=${pom.inceptionYear.equals(currentYear)} +ant:format property=year pattern=/ + /j:when + j:otherwise +ant:format property=year pattern=${pom.inceptionYear}-/ + /j:otherwise +/j:choose + /ant:tstamp + ant:property name=copyright +value=Copyright amp;copy; ${year} ${pom.organization.name}. All Rights Reserved. / + + ant:javadoc +packagenames=${pom.package}.* +destdir=${collections.javadoc.tag.destdir} +sourcepath=${taggedSourceDir} +author=true +protected=true +version=true +use=true +windowtitle=${collections.javadoc.tag.windowtitle} +doctitle=${collections.javadoc.tag.windowtitle} +bottom=${copyright} +stylesheetfile=${maven.javadoc.stylesheet} + + /ant:javadoc +/j:if + /postGoal + + !-- == DIST == -- + postGoal name=dist:prepare-bin-filesystem +j:set var=maven.dist.bin.assembly.dir value=${pom.getPluginContext('maven-dist-plugin').getVariable('maven.dist.bin.assembly.dir')} / + +!-- Copy Files -- +ant:copy todir=${maven.dist.bin.assembly.dir} + ant:fileset dir=. +ant:include name=RELEASE-NOTES.html/ + /ant:fileset +/ant:copy + +!-- Copy Jars -- +ant:copy todir=${maven.dist.bin.assembly.dir} + ant:fileset dir=${maven.build.dir} +ant:include name=*testframework*.jar/ + /ant:fileset +/ant:copy + +!-- Delete tagged old release documentation -- +ant:delete includeEmptyDirs=true + ant:fileset dir=${maven.dist.bin.assembly.dir}/docs includes=apidocs-*/** / +/ant:delete + + /postGoal + + postGoal name=dist:prepare-src-filesystem +j:set var=maven.dist.src.assembly.dir value=${pom.getPluginContext('maven-dist-plugin').getVariable('maven.dist.src.assembly.dir')} / + +!-- Copy Files -- +ant:copy todir=${maven.dist.src.assembly.dir} + ant:fileset dir=. +ant:include
cvs commit: jakarta-commons/collections maven.xml
scolebourne2003/12/29 15:56:15 Modified:collections maven.xml Log: Update to handle testframework jar creation and install Revision ChangesPath 1.6 +70 -13jakarta-commons/collections/maven.xml Index: maven.xml === RCS file: /home/cvs/jakarta-commons/collections/maven.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- maven.xml 29 Dec 2003 18:52:01 - 1.5 +++ maven.xml 29 Dec 2003 23:56:15 - 1.6 @@ -1,23 +1,80 @@ -project default=java:jar xmlns:j=jelly:core xmlns:ant=jelly:ant +project +default=java:jar +xmlns:j=jelly:core +xmlns:license=license +xmlns:maven=jelly:maven +xmlns:util=jelly:util +xmlns:ant=jelly:ant postGoal name=clover:on j:set var=maven.junit.sysproperties value=${maven.junit.sysproperties} org.apache.commons.collections:with-clover/ j:set var=org.apache.commons.collections:with-clover value=true/ /postGoal - postGoal name=jar:jar - ant:tstamp/ - ant:property name=workdir value=${java.io.tmpdir}/buildtemp_${DSTAMP}${TSTAMP}/ - ant:unjar dest=${workdir} src=${maven.build.dir}/${maven.final.name}.jar/ + !-- == JAR == -- + postGoal name=jar:jar +j:set var=finalName value=${pom.getPluginContext('maven-jar-plugin').getVariable('maven.final.name')}/ +j:set var=finalVersion value=${finalName.substring(20)} / +j:set var=testfwkBase value=${pom.artifactId}-testframework / +j:set var=testfwkName value=${testfwkBase}-${finalVersion} / + +ant:jar +jarfile=${maven.build.dir}/${testfwkName}.jar + j:set var=licenseFileNamelicense:fileName//j:set + util:file name=${licenseFileName} var=licenseFile/ + ant:metainf dir=${licenseFile.canonicalFile.parent} +ant:include name=${licenseFile.canonicalFile.name}/ + /ant:metainf + ant:manifest +ant:attribute name=Built-By value=${user.name}/ +ant:attribute name=Created-By value=Apache Jakarta Maven/ +ant:attribute name=Package value=${pom.package}/ +ant:attribute name=Build-Jdk value=${java.version}/ +!-- added supplementary entries -- +ant:attribute name=Extension-Name value=Commons Collections Test Framework/ +ant:attribute name=Specification-Version value=${pom.specificationVersion}/ +ant:attribute name=Specification-Vendor value=${pom.organization.name}/ +ant:attribute name=Specification-Title value=Commons Collections Test Framework/ +ant:attribute name=Implementation-Version value=${pom.currentVersion}/ +ant:attribute name=Implementation-Vendor value=${pom.organization.name}/ +ant:attribute name=Implementation-Vendor-Id value=${pom.organization.identifier}/ + /ant:manifest + ant:fileset dir=${maven.build.dir}/test-classes +ant:include name=**/AbstractTest*.class/ +ant:include name=**/BulkTest*.class/ + /ant:fileset +/ant:jar + /postGoal + + postGoal name=jar:install +j:set var=finalName value=${pom.getPluginContext('maven-jar-plugin').getVariable('maven.final.name')}/ +j:set var=finalVersion value=${finalName.substring(20)} / +j:set var=testfwkBase value=${pom.artifactId}-testframework / +j:set var=testfwkName value=${testfwkBase}-${finalVersion} / + +ant:property name=jardir__ value=${maven.repo.local}/${pom.artifactDirectory}/jars/ +ant:mkdir dir=${jardir__}/ +ant:copy +file=${maven.build.dir}/${testfwkName}.jar +todir=${jardir__} +overwrite=true / + /postGoal + + postGoal name=jar:install-snapshot +j:set var=finalName value=${pom.getPluginContext('maven-jar-plugin').getVariable('maven.final.name')}/ +j:set var=finalVersion value=${finalName.substring(20)} / +j:set var=testfwkBase value=${pom.artifactId}-testframework / +j:set var=testfwkName value=${testfwkBase}-${finalVersion} / - ant:jar jarfile=${maven.build.dir}/${pom.artifactId}-testframework-${pom.currentVersion}.jar manifest=${workdir}/META-INF/MANIFEST.MF - ant:fileset dir=${maven.build.dir}/test-classes -ant:include name=**/AbstractTest*.class/ -ant:include name=**/BulkTest*.class/ - /ant:fileset - /ant:jar - - delete dir=${workdir}/ +ant:property name=jardir__ value=${maven.repo.local}/${pom.artifactDirectory}/jars/ +ant:mkdir dir=${jardir__}/ +ant:copy +file=${maven.build.dir}/${testfwkName}.jar +tofile=${jardir__}/${testfwkBase}-SNAPSHOT.jar +overwrite=true / +ant:copy +file=${maven.build.dir}/${testfwkName}.jar +tofile=${jardir__}/${testfwkName}.jar /
Re: cvs commit: jakarta-commons/collections maven.xml
Cool, works for me. michael On 29 Dec 2003 [EMAIL PROTECTED] wrote: scolebourne2003/12/29 15:56:15 Modified:collections maven.xml Log: Update to handle testframework jar creation and install Revision ChangesPath 1.6 +70 -13jakarta-commons/collections/maven.xml Index: maven.xml === RCS file: /home/cvs/jakarta-commons/collections/maven.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- maven.xml 29 Dec 2003 18:52:01 - 1.5 +++ maven.xml 29 Dec 2003 23:56:15 - 1.6 @@ -1,23 +1,80 @@ -project default=java:jar xmlns:j=jelly:core xmlns:ant=jelly:ant +project +default=java:jar +xmlns:j=jelly:core +xmlns:license=license +xmlns:maven=jelly:maven +xmlns:util=jelly:util +xmlns:ant=jelly:ant postGoal name=clover:on j:set var=maven.junit.sysproperties value=${maven.junit.sysproperties} org.apache.commons.collections:with-clover/ j:set var=org.apache.commons.collections:with-clover value=true/ /postGoal - postGoal name=jar:jar - ant:tstamp/ - ant:property name=workdir value=${java.io.tmpdir}/buildtemp_${DSTAMP}${TSTAMP}/ - ant:unjar dest=${workdir} src=${maven.build.dir}/${maven.final.name}.jar/ + !-- == JAR == -- + postGoal name=jar:jar +j:set var=finalName value=${pom.getPluginContext('maven-jar-plugin').getVariable('maven.final.name')}/ +j:set var=finalVersion value=${finalName.substring(20)} / +j:set var=testfwkBase value=${pom.artifactId}-testframework / +j:set var=testfwkName value=${testfwkBase}-${finalVersion} / + +ant:jar +jarfile=${maven.build.dir}/${testfwkName}.jar + j:set var=licenseFileNamelicense:fileName//j:set + util:file name=${licenseFileName} var=licenseFile/ + ant:metainf dir=${licenseFile.canonicalFile.parent} +ant:include name=${licenseFile.canonicalFile.name}/ + /ant:metainf + ant:manifest +ant:attribute name=Built-By value=${user.name}/ +ant:attribute name=Created-By value=Apache Jakarta Maven/ +ant:attribute name=Package value=${pom.package}/ +ant:attribute name=Build-Jdk value=${java.version}/ +!-- added supplementary entries -- +ant:attribute name=Extension-Name value=Commons Collections Test Framework/ +ant:attribute name=Specification-Version value=${pom.specificationVersion}/ +ant:attribute name=Specification-Vendor value=${pom.organization.name}/ +ant:attribute name=Specification-Title value=Commons Collections Test Framework/ +ant:attribute name=Implementation-Version value=${pom.currentVersion}/ +ant:attribute name=Implementation-Vendor value=${pom.organization.name}/ +ant:attribute name=Implementation-Vendor-Id value=${pom.organization.identifier}/ + /ant:manifest + ant:fileset dir=${maven.build.dir}/test-classes +ant:include name=**/AbstractTest*.class/ +ant:include name=**/BulkTest*.class/ + /ant:fileset +/ant:jar + /postGoal + + postGoal name=jar:install +j:set var=finalName value=${pom.getPluginContext('maven-jar-plugin').getVariable('maven.final.name')}/ +j:set var=finalVersion value=${finalName.substring(20)} / +j:set var=testfwkBase value=${pom.artifactId}-testframework / +j:set var=testfwkName value=${testfwkBase}-${finalVersion} / + +ant:property name=jardir__ value=${maven.repo.local}/${pom.artifactDirectory}/jars/ +ant:mkdir dir=${jardir__}/ +ant:copy +file=${maven.build.dir}/${testfwkName}.jar +todir=${jardir__} +overwrite=true / + /postGoal + + postGoal name=jar:install-snapshot +j:set var=finalName value=${pom.getPluginContext('maven-jar-plugin').getVariable('maven.final.name')}/ +j:set var=finalVersion value=${finalName.substring(20)} / +j:set var=testfwkBase value=${pom.artifactId}-testframework / +j:set var=testfwkName value=${testfwkBase}-${finalVersion} / - ant:jar jarfile=${maven.build.dir}/${pom.artifactId}-testframework-${pom.currentVersion}.jar manifest=${workdir}/META-INF/MANIFEST.MF - ant:fileset dir=${maven.build.dir}/test-classes -ant:include name=**/AbstractTest*.class/ -ant:include name=**/BulkTest*.class/ - /ant:fileset - /ant:jar - - delete dir=${workdir}/ +ant:property name=jardir__ value=${maven.repo.local}/${pom.artifactDirectory}/jars/ +ant:mkdir dir=${jardir__}/ +ant:copy +file=${maven.build.dir}/${testfwkName}.jar +