Nabble - Maven - Commits

svn commit: r883543 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

2009-11-23T15:22:26Z

Author: carlos
Date: Mon Nov 23 23:22:26 2009
New Revision: 883543

URL: http://svn.apache.org/viewvc?rev=883543&view=rev
Log:
Reorder by groupId

Modified:
maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
URL: http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv?rev=883543&r1=883542&r2=883543&view=diff
==============================================================================
--- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original)
+++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Mon Nov 23 23:22:26 2009
@@ -1,9 +1,20 @@
-ï»¿"groupId","location","protocol","contactName","contactMail","ssh options","svn url"
+"groupId","location","protocol","contactName","contactMail","ssh options","svn url"
,"mavensync@...:/repository","rsync_ssh",,"repo-maintainers@...","-i $HOME/.ssh/new-id_dsa",
+"ant-contrib","mavensync@...:/home/groups/a/an/ant-contrib/htdocs/m2-repo","rsync_ssh","Curt Arnold","carnold@...",,
"asm","maven@...:../../groups/maven/htdocs/maven2","rsync_ssh","EugeneKuleshov","eu@...",,
+"be.roam.hue","mavensync@...:/home/groups/h/hu/hue/htdocs/m2-repo","rsync_ssh","Kevin Wetzels","kevin@...",,
+"br.com.caelum.seleniumdsl","mavensync@...:/home/groups/s/se/seleniumdsl/htdocs/maven","rsync_ssh","Caue Guerra","caue.guerra@...",,
+"br.com.caelum.stella","mavensync@...:/home/groups/c/ca/caelum-stella/htdocs/maven","rsync_ssh","Caue Guerra","caue.guerra@...",,
+"br.com.caelum.tubaina","mavensync@...:/home/groups/t/tu/tubaina/htdocs/maven","rsync_ssh","Luiz Real","luiz.real@...",,
"ca.grimoire","rsync://alchemy.grimoire.ca/m2/releases","rsync","Owen Jacobson","owen.jacobson@...",,
"ch.qos","rsync://pixie.qos.ch/mvnrepo","rsync","Ceki Gulcu","ceki@...",,
+"com.adenki","mavensync@...:/home/groups/s/sm/smppapi/htdocs/maven-repo","rsync_ssh","Oran Kelly","orank@...",,
+"com.adobe.blazeds","mavensync@...:/home/groups/e/en/enunciate/persistent/m2","rsync_ssh","Ryan Heaton","ryan@...",,
+"com.agical.rmock","mavensync@...:/home/groups/r/rm/rmock/htdocs/repository","rsync_ssh","Daniel brolund","daniel.brolund@...",,
+"com.agilejava.blammo","mavensync@...:/home/groups/b/bl/blammo/htdocs/repository","rsync_ssh","Wilfred Springer","wilfred@...",,
+"com.agilejava.docbkx","mavensync@...:/home/groups/d/do/docbkx-tools/htdocs/repository","rsync_ssh","Wilfred Springer","wilfred@...",,
"com.atlassian","maven@...:/home/maven/incoming/","rsync_ssh","James William Dumay","james@...",,
+"com.capgemini.platina","mavensync@...:/home/groups/p/pl/platina/htdocs/releases","rsync_ssh","Nicolas De Loof","nicolas.deloof@...",,
"com.cedarsoft","mavensync@...:/home/maven/public/release","rsync_ssh",,"info@...",,
"com.cenqua","maven@...:/home/maven/incoming/","rsync_ssh","James William Dumay","james@...",,
"com.extjs","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
@@ -13,22 +24,32 @@
"com.google.code.gwt-log","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
"com.google.code.gwt-math","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
"com.google.code.gwtx","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
+"com.google.code.jbusycomponent","mavensync@...:/home/users/o/ou/ouaibsky/maven/m2repo","rsync_ssh","Ouaibsky","ouaibsky@...",,
+"com.google.code.protoj","mavensync@...:/home/groups/p/pr/protojrepo/htdocs/mavensync","rsync_ssh","Ashley Williams","ashpublic@...",,
"com.google.gwt","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
"com.googlecode.lambdaj","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Mario Fusco","mario.fusco@...",,"http://lambdaj.googlecode.com/svn/repo/releases/"
"com.googlecode.maven-overview-plugin","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Hubert Iwaniuk","neotyk@...",,"http://kungfoo-m2.googlecode.com/svn/release-repo/"
+"com.h2database","mavensync@...:/home/groups/h/hs/hsql/htdocs/m2-repo","rsync_ssh","Thomas Mueller","thomas.tom.mueller@...",,
+"com.hazelcast","mavensync@...:/home/groups/h/ha/hazelcast/htdocs/m2repo","rsync_ssh","Talip Ozturk","talip@...",,
"com.healthmarketscience","maven@...:/home/repo/html/maven2","rsync_ssh",,"openhms-bugs@...",,
"com.hp.hpl.jena","mavensync@...:/var/repo","rsync_ssh","Andy Seaborne","andy.seaborne@...",,
-"com.ingres.jdbc","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Alan Raison","Alan.Raison@...",,http://code.ingres.com/apps/maven
-"com.kenai.swingjavabuilderext","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Alexandre Navarro","schumnana@...",,"https://kenai.com/svn/swingjavabuilderext~others/maven/release-repository"
+"com.ingres.jdbc","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Alan Raison","Alan.Raison@...",,"http://code.ingres.com/apps/maven"
"com.kenai.jbosh","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Mike Cumings","maven.mc@...",,"https://kenai.com/svn/jbosh~maven/release"
+"com.kenai.swingjavabuilderext","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Alexandre Navarro","schumnana@...",,"https://kenai.com/svn/swingjavabuilderext~others/maven/release-repository"
"com.miglayout","rsync://maven@.../maven/releases","rsync","Mikael Grev","miglayout@...",,
+"com.mobilvox.ossi","mavensync@...:/home/groups/m/ma/maven-js-plugin/htdocs/m2repo","rsync_ssh","Adam Altemus","aaltemus@...",,
"com.mycila","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Mathieu Carbou","mathieu.carbou@...",,"http://mc-repo.googlecode.com/svn/maven2/releases/"
"com.mysema","rsync://source.mysema.com/releases","rsync","Timo WestkÃ¤mper","info@...",,
+"com.nexirius","mavensync@...:/home/users/n/ne/nexirius/htdocs/m2repo","rsync_ssh","Marcel Baumann","marcel.baumann@...",,
"com.ocpsoft","dlink@...:/home/dlink/ocpsoft.com/repository","rsync_ssh","Lincoln Baxter III","lincoln@...",,
+"com.octo.captcha","mavensync@...:/home/groups/j/jc/jcaptcha/maven-repo","rsync_ssh","Antoine Veret","averet@...",,
"com.opensymphony","maven2.opensymphony.com:/opt/repository/maven2","rsync_ssh","Patrick Lightbody","plightbo@...",,
"com.pyx4j","mavensync@...::maven2-release","rsync","Vlad Skarzhevskyy","skarzhevskyy@...",,
"com.pyx4me","mavensync@...::maven2-release","rsync","Vlad Skarzhevskyy","skarzhevskyy@...",,
-"com.surelogic","rsync@...:/home/rsync/m2repo","rsync_ssh","Nathan Boy","nathan.boy@..."
+"com.seitenbau.testing","mavensync@...:/home/groups/j/ju/junitrecorder/htdocs/m2","rsync_ssh","Rainer Weinhold","rainer.weinhold@...",,
+"com.sourcetohtml","mavensync@...:/home/users/j/ji/jirkacelak/userweb/htdocs/maven2","rsync_ssh","Jiri Celak","jiri@...",,
+"com.surelogic","rsync@...:/home/rsync/m2repo","rsync_ssh","Nathan Boy","nathan.boy@...",,
+"com.unboundid","mavensync@...:/home/groups/l/ld/ldap-sdk/htdocs/maven","rsync_ssh","Neil Wilson","neil.wilson@...",,
"com.yahoo.platform.yui","jvanzyl@...:/x1/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
"commons-beanutils","jvanzyl@...:/www/people.apache.org/repo/m2-ibiblio-rsync-repository","rsync_ssh","Niall Pemberton","niallp@...",,
"commons-chain","jvanzyl@...:/www/people.apache.org/repo/m2-ibiblio-rsync-repository","rsync_ssh","Niall Pemberton","niallp@...",,
@@ -48,127 +69,49 @@
"commons-net","jvanzyl@...:/www/people.apache.org/repo/m2-ibiblio-rsync-repository","rsync_ssh",,,,
"commons-pool","jvanzyl@...:/www/people.apache.org/repo/m2-ibiblio-rsync-repository","rsync_ssh",,,,
"commons-scxml","jvanzyl@...:/www/people.apache.org/repo/m2-ibiblio-rsync-repository","rsync_ssh","Rahul Akolkar","rahul.akolkar@...",,
+"de.huxhorn.lilith","mavensync@...:/home/groups/l/li/lilith/htdocs/repository","rsync_ssh","Joern Huxhorn","huxhorn@...",,
+"de.huxhorn.sulky","mavensync@...:/home/groups/s/su/sulky/htdocs/repository","rsync_ssh","Joern Huxhorn","huxhorn@...",,
+"de.jflex","mavensync@...:/home/groups/j/jf/jflex/htdocs/m2repo","rsync_ssh","Regis Decamps","decamps@...",,
+"de.sven-jacobs.loremipsum","mavensync@...:/home/groups/l/lo/loremipsum/htdocs/repository","rsync_ssh","Sven Jacobs","sven.jacobs@...",,
+"displaytag","mavensync@...:/home/groups/d/di/displaytag/htdocs/m2repo","rsync_ssh","fabrizio giustina","fgiust@...",,
+"dk.eobjects","mavensync@...:/home/groups/d/da/datacleaner/htdocs/m2-repo","rsync_ssh","Kasper Sorensen","kasper@...",,
+"edu.gmu.cs","mavensync@...:/home/groups/a/ag/agsyslib/htdocs/m2repo","rsync_ssh","Serban Iordache","beryx@...",,
+"eu.medsea.mimeutil","mavensync@...:/home/groups/m/mi/mime-util/htdocs/maven2/repo","rsync_ssh","Steven McArdle","smcardle@...",,
+"foxtrot","mavensync@...:/home/groups/f/fo/foxtrot/htdocs/maven2","rsync_ssh","Simone Bordet","simone.bordet@...",,
"fr.loof","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
+"gr.abiss.js.sarissa","mavensync@...:/home/groups/s/sa/sarissa/htdocs/repository/releases","rsync_ssh","Manos Batsis","mbatsis@...",,
+"gr.abiss.md4j","mavensync@...:/home/groups/m/md/md4j/htdocs/repository/releases","rsync_ssh","Manos Batsis","mbatsis@...",,
+"gr.abiss.mvn.plugins","mavensync@...:/home/groups/m/mv/mvn-jstools/htdocs/repository/releases","rsync_ssh","Manos Batsis","mbatsis@...",,
+"gr.spinellis","mavensync@...:/home/groups/c/ck/ckjm/htdocs/m2repo","rsync_ssh","Nicolas Dordet","dordet.n@...",,
"info.magnolia","mavensync@...:synched-to-central","rsync_ssh","Gregory Joseph","gregory.joseph@...",,
-"it.tidalwave.thesefoolishthings","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Fabrizio Giudici","fabrizio.giudici@...",,"https://kenai.com/svn/tidalwave~maven-repo/release/2/"
"it.tidalwave.betterbeansbinding","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Fabrizio Giudici","fabrizio.giudici@...",,"https://kenai.com/svn/tidalwave~maven-repo/release/2/"
+"it.tidalwave.thesefoolishthings","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Fabrizio Giudici","fabrizio.giudici@...",,"https://kenai.com/svn/tidalwave~maven-repo/release/2/"
"javassist","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
-"javax.portlet","jvanzyl@...:/www/people.apache.org/repo/m2-ibiblio-rsync-repository","rsync_ssh",,,,
"javax.jdo","jvanzyl@...:/www/people.apache.org/repo/m2-ibiblio-rsync-repository","rsync_ssh","Craig Russell","Craig.Russell@...",,
+"javax.portlet","jvanzyl@...:/www/people.apache.org/repo/m2-ibiblio-rsync-repository","rsync_ssh",,,,
"jp.objectfanatics","mvnsync@...:/home/groups/d/do/domaingen/htdocs/m2central","rsync_ssh","Makoto Sato","beyondseeker@...",,
"junit","jvanzyl@...:/home/ptahchiev/maven-repo","rsync_ssh","Petar Tahchiev","ptahchiev@...",,
"log4j","jvanzyl@...:/www/people.apache.org/repo/m2-ibiblio-rsync-repository","rsync_ssh",,,,
+"me.springframework","mavensync@...:/home/groups/s/sp/springme/htdocs/repository","rsync_ssh","Wilfred Springer","wilfred@...",,
"mysql","maven@...:/web/sites/live/maven","rsync_ssh","Mark Matthews","mark@...",,
"net.databinder","maven@...:/var/dbwww/maven","rsync_ssh","Nathan Hamblen","nathan@...",,
"net.fckeditor","rsync://java.fckeditor.net/m2repo","rsync","Wiktor Walc","w.walc@...",,
"net.homeip.yusuke","mavensync@...:/Users/mavensync/maven2","rsync_ssh","Yusuke Yamamoto","yusuke@...",,
"net.incongru","mavensync@...:synched-hosted-3rdparty-to-central","rsync_ssh","GrÃ©gory Joseph","greg.jos@...",,
"net.israfil","ibiblio@...:maven2","rsync_ssh","Christian Gruber","cgruber@...","-l ibiblio",
+"net.java.dev.jets3t","mavensync@...:/home/groups/j/je/jets3t/htdocs/maven2/","rsync_ssh","James Murty","jmurty@...",,
+"net.java.dev.jvyaml","mavensync@...:/home/users/o/ou/ouaibsky/maven/m2repo","rsync_ssh","Ouaibsky","ouaibsky@...",,
"net.javacrumbs","rsync://javacrumbs.net/m2repo","rsync","Lukas Krecan","lukas@...",,
"net.jcip","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
"net.liftweb","mavensync@...:/home/scalatools/hudson/www/repo-releases","rsync_ssh","Josh Suereth","admin@...",,
-"net.rootdev","maven@...:/home/maven/site/repo","rsync_ssh","Damian Steer","pldms@...",,
-"net.sf.beanlib","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
-"net.sf.bluecove","mavensync@...::maven2-release","rsync","Vlad Skarzhevskyy","skarzhevskyy@...",,
-"net.sf.gwt-widget","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
-"net.sf.hibernate4gwt","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
-"net.sf.jacob-project","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
-"net.sf.jour","mavensync@...::maven2-release","rsync","Vlad Skarzhevskyy","skarzhevskyy@...",,
-"net.sf.scannotation","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
-"net.sf.sfac","mavensync@...:/home/groups/s/sf/sfac/mavenRepo","rsync_ssh","Olivier Berlanger","olivier.berlanger@...",,
-"net.sourceforge.wurfl","mavensync@...:/home/nexus/sonatype-work/nexus/storage/public-releases","rsync_ssh","Filippo De Luca","filippo.deluca@...",,
-"net.vidageek","maven_sync@...:/home/maven_sync/maven.vidageek.net/","rsync_ssh","Jonas Abreu","jonas@...",,
-"no.tornado.brap","mavensync@...:/home/brap/webapps/maven/repository","rsync_ssh","Edvin Syse","edvin@...",,
-"ognl","maven2.opensymphony.com:/opt/repository/maven2","rsync_ssh","Patrick Lightbody","plightbo@...",,
-"opensymphony","maven2.opensymphony.com:/opt/repository/maven2","rsync_ssh","Patrick Lightbody","plightbo@...",,
-"org.amplecode","mavensync@...:/var/www/amplecode/maven2","rsync_ssh","Lars Helge Oeverland","larshelge@...",,
-"org.antlr","mavensync@...:/home/mavensync/antlr-repo","rsync_ssh","Jim Idle","jimi@...",,
-"org.apache","jvanzyl@...:/www/people.apache.org/repo/m2-ibiblio-rsync-repository","rsync_ssh",,,,
-"org.apache","central@...:/export/home/central/rsync-sources/releases","rsync_ssh",Brian Fox,"brianf@...",,
-"org.appfuse","mavensync@...:/var/www/appfuse-releases","rsync_ssh",,"mraible@...",,
-"org.aspectj","rsync@...:/home/mavenrsync/repo","rsync_ssh","Simone Gianni","simoneg@...",,
-"org.asteriskjava","rsync://mavensync.reucon.com/opensource","rsync","Stefan Reuter","stefan.reuter@...",,
-"org.bouncycastle","bcmavensync@...:/home/users/bcmavensync/maven/maven2","rsync_ssh","David Hook","dgh@...",,
-"org.bluestemsoftware","archiva@...:/var/archiva/data/repositories/internal","rsync_ssh","Todd Wolff","twolff@...",,
-"org.bushe","rsync@...:/home/rsync/m2repo/releases","rsync_ssh","Michael Bushe","michael@...",,
-"org.chromattic","mavensync@...:/home/nexus/data/storage/hosted/chromattic-releases","rsync_ssh","Arnaud Heritier","aheritier@...",,
-"org.compass-project","maven@...:/var/www/domains/compass-project.org/repo/htdocs","rsync_ssh","Shay Banon","kimchy@...",,
-"org.concordion","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Jose M Beas","jose.m.beas@...",,"http://concordion.googlecode.com/svn/repos/releases/"
-"org.criticalsection","rsync@...:/srv/maven/repositories/cs-releases","rsync_ssh","Tim Kettler","tik@...",,
-"org.datanucleus","jpox@...:/home/jpox/htdocs/downloads/maven2","rsync_ssh","Andy Jefferson","info@...",,
-"org.drizzle.jdbc","mavensync@...:mavenrepo/releases","rsync_ssh","Marcus Eriksson","krummas@...",,
-"org.dspace","mavensync@...:/var/maven/release","rsync_ssh","DSpace Developers","dspace-devel@...",,
-"org.easyb","maven@...:/var/maven/repo/release","rsync_ssh","Rod Coffin","rod@...",,
-"org.glassfish","rsync@...:/export/home/rsync/master-pom-repo","rsync_ssh","Jane Young","jane.young@...",,
-"org.gmock","rsync@...:/home/rsync/gmock/releases","rsync_ssh","Julien Gagnet","julien.gagnet@...",,
-"org.hsqldb","dedmike@...:m2repo","rsync_ssh","Blaine Simpson","blaine.simpson@...",,
-"org.icefaces","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Ted Goddard","ted.goddard@...",,"http://anonsvn.icefaces.org/repo/maven2/releases/"
-"org.jminix","maven@...:m2repo/releases","rsync_ssh","Laurent Bovet","lbovet@...",,
-"org.libvirt","rsync://libvirt.org/maven2","rsync","Daniel Veillard","daniel@...",,
-"org.mockito","mockito@...:/","rsync_ssh","Erik Brakkee","erik@...",,
-"org.mongodb","rsync://buildbot.mongodb.org/maven/","rsync","Eliot Horowitz","eliot@...",,
-"org.neodatis.odb","mavensync@...:/home/groups/n/ne/neodatis-odb/htdocs/m2-repo","rsync_ssh","Olivier Smadja","olivier@...",,
-"org.objectweb","maven@...:../../groups/maven/htdocs/maven2","rsync_ssh","xavier moghrabi","xavier.moghrabi@...",,
-"org.ops4j","maven-sync@...:/var/http/repository.ops4j.org/m2release","rsync_ssh","Niclas Hedhman","niclas@...",,
-"org.ow2","maven@...:../../groups/maven/htdocs/maven2","rsync_ssh","xavier moghrabi","xavier.moghrabi@...",,
-"org.parancoe","web3160@...:/home/web/maven2.parancoe.org/repository/repo","rsync_ssh","Lucio Benfante","lucio.benfante@...",,
-"org.puremvc","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Anthony Quinault","aquinault@...",,"http://svn.puremvc.org/PureMVC_Java_MultiCore/repo"
-"org.reflext","mavensync@...:/home/nexus/data/storage/hosted/reflext-releases","rsync_ssh","Arnaud Heritier","aheritier@...",,
-"org.scala-lang","mavensync@...:/home/scalatools/hudson/www/repo-releases","rsync_ssh","Josh Suereth","admin@...",,
-"org.scala-tools","mavensync@...:/home/scalatools/hudson/www/repo-releases","rsync_ssh","Josh Suereth","admin@...",,
-"org.seleniumhq","maven-central-repo@...:/opt/nexus/sonatype-work/nexus/storage/releases","rsync_ssh","Patrick Lightbody","patrick@...",,
-"org.semispace","maven@...:/home/maven/repo","rsync_ssh","Erlend Nossum","semispace@...",,
-"org.slf4j","rsync://pixie.qos.ch/mvnrepo","rsync","Ceki Gulcu","ceki@...",,
-"org.spockframework","rsync://m2repo.spockframework.org/releases","rsync","Peter Niederwieser","pniederw@...",,
-"org.springframework","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Ben Hale","bhale@...",,"https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo"
-"org.springmodules","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Ben Hale","bhale@...",,"https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo"
-"org.tmatesoft","rsync@...:/home/rsync/m2repo","rsync_ssh","Alexander Sinyushkin","Alexander.Sinyushkin@...",,
-"org.vafer","rsync@...:m2repo/releases","rsync_ssh","Torsten Curdt","tcurdt@...",,
-"org.wooddog.mavenplugins","rsync://www.wooddog.org/mavenplugins","rsync","Claus BrÃ¸ndby Reimer","claus437@...",,
-"org.xerial","xerialmaven@...:/home/groups/x/xe/xerial/htdocs/maven/release","rsync_ssh","Taro L. Saito","leo@...",,
-"org.zkoss","maven@...:/home/maven/repository","rsync_ssh","WebMaster","webmaster@...",,
-"ant-contrib","mavensync@...:/home/groups/a/an/ant-contrib/htdocs/m2-repo","rsync_ssh","Curt Arnold","carnold@...",,
-"be.roam.hue","mavensync@...:/home/groups/h/hu/hue/htdocs/m2-repo","rsync_ssh","Kevin Wetzels","kevin@...",,
-"br.com.caelum.seleniumdsl","mavensync@...:/home/groups/s/se/seleniumdsl/htdocs/maven","rsync_ssh","Caue Guerra","caue.guerra@...",,
-"br.com.caelum.stella","mavensync@...:/home/groups/c/ca/caelum-stella/htdocs/maven","rsync_ssh","Caue Guerra","caue.guerra@...",,
-"br.com.caelum.tubaina","mavensync@...:/home/groups/t/tu/tubaina/htdocs/maven","rsync_ssh","Luiz Real","luiz.real@...",,
-"com.adenki","mavensync@...:/home/groups/s/sm/smppapi/htdocs/maven-repo","rsync_ssh","Oran Kelly","orank@...",,
-"com.adobe.blazeds","mavensync@...:/home/groups/e/en/enunciate/persistent/m2","rsync_ssh","Ryan Heaton","ryan@...",,
-"com.agical.rmock","mavensync@...:/home/groups/r/rm/rmock/htdocs/repository","rsync_ssh","Daniel brolund","daniel.brolund@...",,
-"com.agilejava.blammo","mavensync@...:/home/groups/b/bl/blammo/htdocs/repository","rsync_ssh","Wilfred Springer","wilfred@...",,
-"com.agilejava.docbkx","mavensync@...:/home/groups/d/do/docbkx-tools/htdocs/repository","rsync_ssh","Wilfred Springer","wilfred@...",,
-"com.capgemini.platina","mavensync@...:/home/groups/p/pl/platina/htdocs/releases","rsync_ssh","Nicolas De Loof","nicolas.deloof@...",,
-"com.google.code.jbusycomponent","mavensync@...:/home/users/o/ou/ouaibsky/maven/m2repo","rsync_ssh","Ouaibsky","ouaibsky@...",,
-"com.google.code.protoj","mavensync@...:/home/groups/p/pr/protojrepo/htdocs/mavensync","rsync_ssh","Ashley Williams","ashpublic@...",,
-"com.h2database","mavensync@...:/home/groups/h/hs/hsql/htdocs/m2-repo","rsync_ssh","Thomas Mueller","thomas.tom.mueller@...",,
-"com.hazelcast","mavensync@...:/home/groups/h/ha/hazelcast/htdocs/m2repo","rsync_ssh","Talip Ozturk","talip@...",,
-"com.mobilvox.ossi","mavensync@...:/home/groups/m/ma/maven-js-plugin/htdocs/m2repo","rsync_ssh","Adam Altemus","aaltemus@...",,
-"com.nexirius","mavensync@...:/home/users/n/ne/nexirius/htdocs/m2repo","rsync_ssh","Marcel Baumann","marcel.baumann@...",,
-"com.octo.captcha","mavensync@...:/home/groups/j/jc/jcaptcha/maven-repo","rsync_ssh","Antoine Veret","averet@...",,
-"com.seitenbau.testing","mavensync@...:/home/groups/j/ju/junitrecorder/htdocs/m2","rsync_ssh","Rainer Weinhold","rainer.weinhold@...",,
-"com.sourcetohtml","mavensync@...:/home/users/j/ji/jirkacelak/userweb/htdocs/maven2","rsync_ssh","Jiri Celak","jiri@...",,
-"com.unboundid","mavensync@...:/home/groups/l/ld/ldap-sdk/htdocs/maven","rsync_ssh","Neil Wilson","neil.wilson@...",,
-"de.huxhorn.lilith","mavensync@...:/home/groups/l/li/lilith/htdocs/repository","rsync_ssh","Joern Huxhorn","huxhorn@...",,
-"de.huxhorn.sulky","mavensync@...:/home/groups/s/su/sulky/htdocs/repository","rsync_ssh","Joern Huxhorn","huxhorn@...",,
-"de.jflex","mavensync@...:/home/groups/j/jf/jflex/htdocs/m2repo","rsync_ssh","Regis Decamps","decamps@...",,
-"de.sven-jacobs.loremipsum","mavensync@...:/home/groups/l/lo/loremipsum/htdocs/repository","rsync_ssh","Sven Jacobs","sven.jacobs@...",,
-"displaytag","mavensync@...:/home/groups/d/di/displaytag/htdocs/m2repo","rsync_ssh","fabrizio giustina","fgiust@...",,
-"dk.eobjects","mavensync@...:/home/groups/d/da/datacleaner/htdocs/m2-repo","rsync_ssh","Kasper Sorensen","kasper@...",,
-"edu.gmu.cs","mavensync@...:/home/groups/a/ag/agsyslib/htdocs/m2repo","rsync_ssh","Serban Iordache","beryx@...",,
-"eu.medsea.mimeutil","mavensync@...:/home/groups/m/mi/mime-util/htdocs/maven2/repo","rsync_ssh","Steven McArdle","smcardle@...",,
-"foxtrot","mavensync@...:/home/groups/f/fo/foxtrot/htdocs/maven2","rsync_ssh","Simone Bordet","simone.bordet@...",,
-"gr.abiss.js.sarissa","mavensync@...:/home/groups/s/sa/sarissa/htdocs/repository/releases","rsync_ssh","Manos Batsis","mbatsis@...",,
-"gr.abiss.md4j","mavensync@...:/home/groups/m/md/md4j/htdocs/repository/releases","rsync_ssh","Manos Batsis","mbatsis@...",,
-"gr.abiss.mvn.plugins","mavensync@...:/home/groups/m/mv/mvn-jstools/htdocs/repository/releases","rsync_ssh","Manos Batsis","mbatsis@...",,
-"gr.spinellis","mavensync@...:/home/groups/c/ck/ckjm/htdocs/m2repo","rsync_ssh","Nicolas Dordet","dordet.n@...",,
-"me.springframework","mavensync@...:/home/groups/s/sp/springme/htdocs/repository","rsync_ssh","Wilfred Springer","wilfred@...",,
-"net.java.dev.jets3t","mavensync@...:/home/groups/j/je/jets3t/htdocs/maven2/","rsync_ssh","James Murty","jmurty@...",,
-"net.java.dev.jvyaml","mavensync@...:/home/users/o/ou/ouaibsky/maven/m2repo","rsync_ssh","Ouaibsky","ouaibsky@...",,
"net.objectlab.kit.datecalc","mavensync@...:/home/groups/o/ob/objectlabkit/htdocs/m2-repo","rsync_ssh","Marcin Jekot","marchy@...",,
+"net.rootdev","maven@...:/home/maven/site/repo","rsync_ssh","Damian Steer","pldms@...",,
"net.sf.aislib","mavensync@...:/home/groups/a/ai/aislib/htdocs/repos/sync","rsync_ssh","Tomasz Pik","pikus@...",,
"net.sf.alchim","mavensync@...:/home/groups/a/al/alchim/htdocs/download/releases","rsync_ssh","David BERNARD","dwayneb@...",,
"net.sf.apt-jelly","mavensync@...:/home/groups/a/ap/apt-jelly/m2","rsync_ssh","Ryan Heaton","ryan@...",,
+"net.sf.beanlib","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
"net.sf.beanrunner","mavensync@...:/home/groups/b/be/beanrunner/htdocs/maven2","rsync_ssh","Matthew Smith","m0smith@...",,
+"net.sf.bluecove","mavensync@...::maven2-release","rsync","Vlad Skarzhevskyy","skarzhevskyy@...",,
"net.sf.blunder","mavensync@...:/home/groups/b/bl/blunder/htdocs/m2repo","rsync_ssh","Ambrosi Lucas","lambrosi@...",,
"net.sf.btb","mavensync@...:/home/groups/b/bt/btb/htdocs/m2repo","rsync_ssh","Jean-Philippe Gravel","jpgravel77@...",,
"net.sf.buildbox","mavensync@...:/home/groups/b/bu/buildbox/htdocs/maven2","rsync_ssh","Petr Kozelka","pkozelka@...",,
@@ -178,23 +121,27 @@
"net.sf.derquinsej","mavensync@...:/home/groups/d/de/derquinsej/htdocs/maven2","rsync_ssh","Andres Rodriguez","andresrc@...",,
"net.sf.dnsjava-osgi","mavensync@...:/home/groups/d/dn/dnsjava-osgi/htdocs/m2","rsync_ssh","Robert Burrell Donkin","rdonkin@...",,
"net.sf.dobo","mavensync@...:/home/groups/d/do/dobo/htdocs/m2repo","rsync_ssh","Arif Rachim","a.arif.r@...",,
-"net.sf.dozer","mavensync@...:/home/groups/d/do/dozer/htdocs/m2repo","rsync_ssh","Dmitry Buzdin","buzdin@...",,
"net.sf.docbook","mavensync@...:/home/groups/d/do/docbook/htdocs/maven/repository","rsync_ssh","Cedric Pronzato","mimil@...",,
+"net.sf.dozer","mavensync@...:/home/groups/d/do/dozer/htdocs/m2repo","rsync_ssh","Dmitry Buzdin","buzdin@...",,
"net.sf.dtddoc","mavensync@...:/home/groups/d/dt/dtddoc/htdocs/m2repo/releases","rsync_ssh","Herve BOUTEMY","hboutemy@...",,
"net.sf.excha","mavensync@...:/home/groups/e/ex/excha/htdocs/repository","rsync_ssh","Vitaliy S","yilativs@...",,
"net.sf.fck-faces","mavensync@...:/home/groups/f/fc/fck-faces/htdocs/maven2","rsync_ssh","Ingo Dueppe","idueppe@...",,
"net.sf.flatpack","mavensync@...:/home/groups/o/ob/objectlabkit/htdocs/m2-repo","rsync_ssh","Marcin Jekot","marchy@...",,
"net.sf.formlayoutmaker","mavensync@...:/home/groups/f/fo/formlayoutmaker/htdocs/m2repo/releases","rsync_ssh","Herve BOUTEMY","hboutemy@...",,
"net.sf.gnu-hylafax","mavensync@...:/home/groups/g/gn/gnu-hylafax/m2repo","rsync_ssh","Steven Jardine","steve@...",,
+"net.sf.gwt-widget","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
"net.sf.hammockmocks","mavensync@...:/home/groups/h/ha/hammockmocks/htdocs/m2repo","rsync_ssh","Carl Meijer","cameijer@...",,
+"net.sf.hibernate4gwt","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
"net.sf.ipsedixit","mavensync@...:/home/groups/i/ip/ipsedixit/htdocs/m2repo/release","rsync_ssh","Jason Royals","m2ipsedixit@...",,
"net.sf.jack4j","mavensync@...:/home/groups/j/ja/jack4j/htdocs/repo","rsync_ssh","Ondrej Par","ondrejpar@...",,
+"net.sf.jacob-project","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
"net.sf.jaggregate","mavensync@...:/home/groups/j/ja/jaggregate/htdocs/maven","rsync_ssh","Paul Holser","pholser@...",,
"net.sf.jguard","mavensync@...:/home/groups/j/jg/jguard/htdocs/repository","rsync_ssh","Charles GAY","diabolo512@...",,
"net.sf.jlue","mavensync@...:/home/groups/j/jl/jlue/htdocs/m2repo","rsync_ssh","jlue","sunyat@...",,
"net.sf.jodconverter","mavensync@...:/home/groups/j/jo/jodconverter/maven2","rsync_ssh","Mirko Nasato","mnasato@...",,
"net.sf.joost","mavensync@...:/home/groups/j/jo/joost/htdocs/m2repo","rsync_ssh","Oliver Becker","obecker@...",,
"net.sf.jopt-simple","mavensync@...:/home/groups/j/jo/jopt-simple/htdocs/maven","rsync_ssh","Paul Holser","pholser@...",,
+"net.sf.jour","mavensync@...::maven2-release","rsync","Vlad Skarzhevskyy","skarzhevskyy@...",,
"net.sf.jsignature","mavensync@...:/home/groups/j/js/jsignature/htdocs/maven2","rsync_ssh","Simonetti Davide","dvd.smnt@...",,
"net.sf.json-lib","mavensync@...:/home/groups/j/js/json-lib/htdocs/m2/repo/release","rsync_ssh","Andres Almiray","aalmiray@...",,
"net.sf.jsptest","mavensync@...:/home/groups/j/js/jsptest/htdocs/maven2","rsync_ssh","Lasse Koskela","lasse.koskela@...",,
@@ -215,6 +162,8 @@
"net.sf.practicalxml","mavensync@...:/home/groups/p/pr/practicalxml/htdocs/releases","rsync_ssh","Keith D Gregory","kdgregory@...",,
"net.sf.qdwizard","mavensync@...:/home/groups/q/qd/qdwizard/htdocs/repository","rsync_ssh","Bertrand Florat","bertrand@...",,
"net.sf.retrotranslator","mavensync@...:/home/groups/r/re/retrotranslator/maven2","rsync_ssh","Taras Puchko","tarasp@...",,
+"net.sf.scannotation","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
+"net.sf.sfac","mavensync@...:/home/groups/s/sf/sfac/mavenRepo","rsync_ssh","Olivier Berlanger","olivier.berlanger@...",,
"net.sf.sidaof","mavensync@...:/home/frs/project/s/si/sidaof/releases","rsync_ssh","Jeff Jensen","jeffjensen@...",,
"net.sf.stat-scm","mavensync@...:/home/groups/s/st/stat-scm/htdocs/maven2","rsync_ssh","Doug Culnane","doug@...",,
"net.sf.sugar","mavensync@...:/home/groups/s/su/sugar/htdocs/m2repo","rsync_ssh","Keith Bishop","bishi@...",,
@@ -230,10 +179,10 @@
"net.smartlab.web","mavensync@...:/home/groups/s/sm/smartweb/htdocs/releases","rsync_ssh","Antonio Talarico","atalarico@...",,
"net.sourceforge.basher","mavensync@...:/home/groups/b/ba/basher/htdocs/repository","rsync_ssh","johan lindquist","johanlindquist@...",,
"net.sourceforge.ccxjc","mavensync@...:/home/groups/c/cc/ccxjc/htdocs/maven2/releases","rsync_ssh","The CC-XJC Project","ccxjc-notifications@...",,
-"net.sourceforge.chopchophttpclient","mavensync@...:/home/groups/c/ch/chop-chophttpcl/htdocs/maven2","rsync_ssh","Rodney Beede","sourceforge+mavencentral@..."
+"net.sourceforge.chopchophttpclient","mavensync@...:/home/groups/c/ch/chop-chophttpcl/htdocs/maven2","rsync_ssh","Rodney Beede","sourceforge+mavencentral@...",,
"net.sourceforge.ckjm","mavensync@...:/home/groups/c/ck/ckjm/htdocs/m2repo","rsync_ssh","Nicolas Dordet","dordet.n@...",,
-"net.sourceforge.cssparser","mavensync@...:/home/groups/c/cs/cssparser/htdocs/m2-repo","rsync_ssh","Daniel Gredler","sdanig@...",,
"net.sourceforge.cobertura","mavensync@...:/home/groups/c/co/cobertura/htdocs/m2repo","rsync_ssh","John Lewis","lewijw@...",,
+"net.sourceforge.cssparser","mavensync@...:/home/groups/c/cs/cssparser/htdocs/m2-repo","rsync_ssh","Daniel Gredler","sdanig@...",,
"net.sourceforge.expectj","mavensync@...:/home/groups/e/ex/expectj/htdocs/m2repo","rsync_ssh","Johan Walles","johan.walles@...",,
"net.sourceforge.fmpp","mavensync@...:/home/groups/f/fm/fmpp/htdocs/maven2","rsync_ssh","Daniel Dekany","ddekany@...",,
"net.sourceforge.htmlunit","mavensync@...:/home/groups/h/ht/htmlunit/htdocs/m2-repo","rsync_ssh","Marc Guillemot","mguillem@...",,
@@ -255,18 +204,45 @@
"net.sourceforge.retroweaver","mavensync@...:/home/groups/r/re/retroweaver/htdocs/maven2","rsync_ssh","Xavier Le Vourch","xavier@...",,
"net.sourceforge.tink","mavensync@...:/home/groups/t/ti/tink/repository/release","rsync_ssh","Ivan Szkiba","szkiba@...",,
"net.sourceforge.wicketwebbeans","mavensync@...:/home/groups/w/wi/wicketwebbeans/htdocs/repository","rsync_ssh","Dan Syrstad","dsyrstad@...",,
+"net.sourceforge.wurfl","mavensync@...:/home/nexus/sonatype-work/nexus/storage/public-releases","rsync_ssh","Filippo De Luca","filippo.deluca@...",,
+"net.vidageek","maven_sync@...:/home/maven_sync/maven.vidageek.net/","rsync_ssh","Jonas Abreu","jonas@...",,
+"no.tornado.brap","mavensync@...:/home/brap/webapps/maven/repository","rsync_ssh","Edvin Syse","edvin@...",,
+"ognl","maven2.opensymphony.com:/opt/repository/maven2","rsync_ssh","Patrick Lightbody","plightbo@...",,
+"opensymphony","maven2.opensymphony.com:/opt/repository/maven2","rsync_ssh","Patrick Lightbody","plightbo@...",,
"org.acegisecurity","mavensync@...:/home/groups/a/ac/acegisecurity/htdocs/repository/releases","rsync_ssh","Carlos Sanchez","carlos@...",,
+"org.amplecode","mavensync@...:/var/www/amplecode/maven2","rsync_ssh","Lars Helge Oeverland","larshelge@...",,
+"org.antlr","mavensync@...:/home/mavensync/antlr-repo","rsync_ssh","Jim Idle","jimi@...",,
+"org.apache","jvanzyl@...:/www/people.apache.org/repo/m2-ibiblio-rsync-repository","rsync_ssh",,,,
+"org.apache","central@...:/export/home/central/rsync-sources/releases","rsync_ssh","Brian Fox","brianf@...",,
+"org.appfuse","mavensync@...:/var/www/appfuse-releases","rsync_ssh",,"mraible@...",,
+"org.aspectj","rsync@...:/home/mavenrsync/repo","rsync_ssh","Simone Gianni","simoneg@...",,
+"org.asteriskjava","rsync://mavensync.reucon.com/opensource","rsync","Stefan Reuter","stefan.reuter@...",,
+"org.bluestemsoftware","archiva@...:/var/archiva/data/repositories/internal","rsync_ssh","Todd Wolff","twolff@...",,
+"org.bouncycastle","bcmavensync@...:/home/users/bcmavensync/maven/maven2","rsync_ssh","David Hook","dgh@...",,
+"org.bushe","rsync@...:/home/rsync/m2repo/releases","rsync_ssh","Michael Bushe","michael@...",,
+"org.chromattic","mavensync@...:/home/nexus/data/storage/hosted/chromattic-releases","rsync_ssh","Arnaud Heritier","aheritier@...",,
"org.codenarc","mavensync@...:/home/groups/c/co/codenarc/htdocs/m2repo","rsync_ssh","Chris Mair","chrismair@...",,
+"org.compass-project","maven@...:/var/www/domains/compass-project.org/repo/htdocs","rsync_ssh","Shay Banon","kimchy@...",,
+"org.concordion","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Jose M Beas","jose.m.beas@...",,"http://concordion.googlecode.com/svn/repos/releases/"
"org.coosproject","mavensync@...:/home/groups/c/co/coos/htdocs/m2repo","rsync_ssh","Morten Versvik","morten.versvik@...",,
+"org.criticalsection","rsync@...:/srv/maven/repositories/cs-releases","rsync_ssh","Tim Kettler","tik@...",,
"org.cyclopsgroup","mavensync@...:/home/groups/c/cy/cyclops-group/m2-export","rsync_ssh","Jiaqi Guo","jiaqi.guo@...",,
"org.databene","mavensync@...:/home/groups/b/be/benerator/htdocs/m2/repository","rsync_ssh","Volker Bergmann","volker@...",,
+"org.datanucleus","jpox@...:/home/jpox/htdocs/downloads/maven2","rsync_ssh","Andy Jefferson","info@...",,
"org.dbunit","mavensync@...:/home/groups/d/db/dbunit/htdocs/m2repo","rsync_ssh","Roberto Lo Giacco","rlogiacco@...",,
"org.domdrides","mavensync@...:/home/groups/d/do/domdrides/htdocs/m2repo/releases","rsync_ssh","James Carman","james@...",,
+"org.drizzle.jdbc","mavensync@...:mavenrepo/releases","rsync_ssh","Marcus Eriksson","krummas@...",,
+"org.dspace","mavensync@...:/var/maven/release","rsync_ssh","DSpace Developers","dspace-devel@...",,
"org.duineframework","mavensync@...:/home/groups/d/du/duine/htdocs/m2repo","rsync_ssh","Peter Fennema","Peter.Fennema@...",,
+"org.easyb","maven@...:/var/maven/repo/release","rsync_ssh","Rod Coffin","rod@...",,
"org.easymock","mavensync@...:/home/groups/e/ea/easymock/htdocs/maven/repository","rsync_ssh","Henri Tremblay","henri.tremblay@...",,
"org.extrema-sistemas.loom","mavensync@...:/home/groups/l/lo/loom/htdocs/repository","rsync_ssh","ignacio coloma","icoloma@...",,
"org.freemarker","mavensync@...:/home/groups/f/fr/freemarker/htdocs/maven2","rsync_ssh","Daniel Dekany","ddekany@...",,
+"org.glassfish","rsync@...:/export/home/rsync/master-pom-repo","rsync_ssh","Jane Young","jane.young@...",,
+"org.gmock","rsync@...:/home/rsync/gmock/releases","rsync_ssh","Julien Gagnet","julien.gagnet@...",,
"org.hdiv","mavensync@...:/home/groups/h/hd/hdiv/htdocs/repository","rsync_ssh","Roberto Velasco","roberto@...",,
+"org.hsqldb","dedmike@...:m2repo","rsync_ssh","Blaine Simpson","blaine.simpson@...",,
+"org.icefaces","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Ted Goddard","ted.goddard@...",,"http://anonsvn.icefaces.org/repo/maven2/releases/"
"org.infinitest","mavensync@...:/home/groups/j/jo/jopt-simple/htdocs/maven","rsync_ssh","Paul Holser","pholser@...",,
"org.ini4j","mavensync@...:/home/groups/i/in/ini4j/repository/release","rsync_ssh","Ivan Szkiba","szkiba@...",,
"org.jacex","mavensync@...:/home/groups/j/ja/jacex/htdocs/maven","rsync_ssh","Alexey Noskov","alexey.noskov@...",,
@@ -277,32 +253,56 @@
"org.jibx","mavensync@...:/home/groups/j/ji/jibx/htdocs/maven2","rsync_ssh","Jerome Bernard","jerome.bernard@...",,
"org.jitr","mavensync@...:/home/groups/j/ji/jitr/htdocs/repositories/release","rsync_ssh","Josh Devins","info@...",,
"org.jlibrary","mavensync@...:/home/groups/j/jl/jlibrary/htdocs/m2repo","rsync_ssh","Roman Puchkovskiy","roman.puchkovskiy@...",,
+"org.jminix","maven@...:m2repo/releases","rsync_ssh","Laurent Bovet","lbovet@...",,
"org.jmonit","mavensync@...:/home/groups/j/jm/jmonit/htdocs/releases","rsync_ssh","Nicolas De Loof","nicolas.deloof@...",,
"org.jomc","mavensync@...:/home/groups/j/jo/jomc/htdocs/maven2/releases","rsync_ssh","The JOMC Project","jomc-notifications@...",,
"org.jsdoctoolkit","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
"org.jsecurity","mavensync@...:/home/groups/j/js/jsecurity/htdocs/m2repo","rsync_ssh","Les Hazlewood","les@...",,
"org.jvnet.hudson","rsync://maven.hudson-ci.org/hudson.maven","rsync","Kohsuke Kawaguchi","kk@...",,
"org.jyaml","mavensync@...:/home/groups/j/jy/jyaml/htdocs/m2-repo","rsync_ssh","Toby Ho","airportyh@...",,
+"org.libvirt","rsync://libvirt.org/maven2","rsync","Daniel Veillard","daniel@...",,
"org.liquibase","mavensync@...:/home/groups/l/li/liquibase/htdocs/maven-repository","rsync_ssh","nathan voxland","nathan@...",,
"org.mattressframework","mavensync@...:/home/groups/m/ma/mattress/htdocs/repositories/release","rsync_ssh","Josh Devins","joshdevins@...",,
"org.microemu","mavensync@...::maven2-release","rsync","Vlad Skarzhevskyy","skarzhevskyy@...",,
"org.mockftpserver","mavensync@...:/home/groups/m/mo/mockftpserver/htdocs/m2repo","rsync_ssh","Chris Mair","chrismair@...",,
+"org.mockito","mockito@...:/","rsync_ssh","Erik Brakkee","erik@...",,
+"org.mongodb","rsync://buildbot.mongodb.org/maven/","rsync","Eliot Horowitz","eliot@...",,
"org.nakedobjects","mavensync@...:/home/groups/n/na/nakedobjects/htdocs/m2-repo/release","rsync_ssh","Robert Matthews","rmatthews@...",,
+"org.neodatis.odb","mavensync@...:/home/groups/n/ne/neodatis-odb/htdocs/m2-repo","rsync_ssh","Olivier Smadja","olivier@...",,
+"org.objectweb","maven@...:../../groups/maven/htdocs/maven2","rsync_ssh","xavier moghrabi","xavier.moghrabi@...",,
"org.objenesis","mavensync@...:/home/groups/e/ea/easymock/htdocs/maven/repository","rsync_ssh","Henri Tremblay","henri.tremblay@...",,
"org.openfast","mavensync@...:/home/groups/o/op/openfast/maven/release","rsync_ssh","Jacob Northey","jacob_northey@...",,
"org.openoffice","mavensync@...:/home/groups/j/jo/jodconverter/maven2","rsync_ssh","Mirko Nasato","mnasato@...",,
+"org.ops4j","maven-sync@...:/var/http/repository.ops4j.org/m2release","rsync_ssh","Niclas Hedhman","niclas@...",,
+"org.ow2","maven@...:../../groups/maven/htdocs/maven2","rsync_ssh","xavier moghrabi","xavier.moghrabi@...",,
+"org.parancoe","web3160@...:/home/web/maven2.parancoe.org/repository/repo","rsync_ssh","Lucio Benfante","lucio.benfante@...",,
"org.pojomatic","mavensync@...:/home/groups/p/po/pojomatic/releases","rsync_ssh","Ian Robertson","ian.b.robertson@...",,
+"org.puremvc","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Anthony Quinault","aquinault@...",,"http://svn.puremvc.org/PureMVC_Java_MultiCore/repo"
+"org.reflext","mavensync@...:/home/nexus/data/storage/hosted/reflext-releases","rsync_ssh","Arnaud Heritier","aheritier@...",,
+"org.scala-lang","mavensync@...:/home/scalatools/hudson/www/repo-releases","rsync_ssh","Josh Suereth","admin@...",,
+"org.scala-tools","mavensync@...:/home/scalatools/hudson/www/repo-releases","rsync_ssh","Josh Suereth","admin@...",,
+"org.seleniumhq","maven-central-repo@...:/opt/nexus/sonatype-work/nexus/storage/releases","rsync_ssh","Patrick Lightbody","patrick@...",,
+"org.semispace","maven@...:/home/maven/repo","rsync_ssh","Erlend Nossum","semispace@...",,
+"org.simpleframework","mavensync@...:/home/groups/s/si/simpleweb/htdocs/maven","rsync_ssh","Niall Gallagher","niallg@...",,
+"org.slf4j","rsync://pixie.qos.ch/mvnrepo","rsync","Ceki Gulcu","ceki@...",,
+"org.spockframework","rsync://m2repo.spockframework.org/releases","rsync","Peter Niederwieser","pniederw@...",,
+"org.springframework","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Ben Hale","bhale@...",,"https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo"
+"org.springmodules","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Ben Hale","bhale@...",,"https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo"
+"org.synchronoss","mavensync@...:/home/groups/c/cp/cpo/htdocs/sf-cpo-releases","rsync_ssh","Jay Colson","jcolson@...",,
+"org.templateit","mavensync@...:/home/groups/t/te/templateit/htdocs/m2repo","rsync_ssh","Dmitriy Kumshayev","dq@...",,
+"org.tmatesoft","rsync@...:/home/rsync/m2repo","rsync_ssh","Alexander Sinyushkin","Alexander.Sinyushkin@...",,
"org.ujoframework","mavensync@...:/home/groups/u/uj/ujoframework/htdocs/m2repo","rsync_ssh","Paul Ponec","pponec@...",,
"org.unitils","mavensync@...:/home/groups/u/un/unitils/htdocs/m2-repo","rsync_ssh","Tim Ducheyne","tim.ducheyne@...",,
+"org.vafer","rsync@...:m2repo/releases","rsync_ssh","Torsten Curdt","tcurdt@...",,
"org.vraptor","mavensync@...:/home/groups/v/vr/vraptor2/htdocs/maven","rsync_ssh","Fabio Kung","fabio.kung@...",,
"org.wickettools.extjs","mavensync@...:/home/groups/w/wi/wicket-extjs/htdocs/maven2","rsync_ssh","Jeremy Fergason","jdfergason@...",,
+"org.wooddog.mavenplugins","rsync://www.wooddog.org/mavenplugins","rsync","Claus BrÃ¸ndby Reimer","claus437@...",,
+"org.xerial","xerialmaven@...:/home/groups/x/xe/xerial/htdocs/maven/release","rsync_ssh","Taro L. Saito","leo@...",,
"org.xj4","mavensync@...:/home/groups/x/xj/xj4/htdocs/m2repo/releases","rsync_ssh","Jared Bunting","jared.bunting@...",,
"org.xlightweb","mavensync@...:/home/groups/x/xl/xlightweb/htdocs/m2repo","rsync_ssh","Gregor Roth","grro@...",,
"org.xsocket","mavensync@...:/home/groups/x/xs/xsocket/htdocs/m2repo","rsync_ssh","Gregor Roth","grro@...",,
-"uk.co.flamingpenguin.jewelcli","mavensync@...:/home/groups/j/je/jewelcli/htdocs/m2repo","rsync_ssh","Tim Wood","tim@...",,
-"org.simpleframework","mavensync@...:/home/groups/s/si/simpleweb/htdocs/maven","rsync_ssh","Niall Gallagher","niallg@...",,
-"org.synchronoss","mavensync@...:/home/groups/c/cp/cpo/htdocs/sf-cpo-releases","rsync_ssh","Jay Colson","jcolson@...",,
-"org.templateit","mavensync@...:/home/groups/t/te/templateit/htdocs/m2repo","rsync_ssh","Dmitriy Kumshayev","dq@...",,
+"org.zkoss","maven@...:/home/maven/repository","rsync_ssh","WebMaster","webmaster@...",,
"pmd","mavensync@...:/home/groups/p/pm/pmd/htdocs/maven2","rsync_ssh","Xavier Le Vourch","xavier@...",,
+"uk.co.flamingpenguin.jewelcli","mavensync@...:/home/groups/j/je/jewelcli/htdocs/m2repo","rsync_ssh","Tim Wood","tim@...",,
"wicket","mavensync@...:/home/groups/w/wi/wicket/htdocs/maven2","rsync_ssh","Martijn Dashorst","martijn.dashorst@...",,
"xmlunit","mavensync@...:/home/groups/x/xm/xmlunit/htdocs/repo","rsync_ssh","Stefan Bodewig","stefan.bodewig@...",,

svn commit: r883541 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

2009-11-23T15:19:14Z

Author: carlos
Date: Mon Nov 23 23:19:14 2009
New Revision: 883541

URL: http://svn.apache.org/viewvc?rev=883541&view=rev
Log:
[MAVENUPLOAD-2653]

Modified:
maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
URL: http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv?rev=883541&r1=883540&r2=883541&view=diff
==============================================================================
--- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original)
+++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Mon Nov 23 23:19:14 2009
@@ -215,6 +215,7 @@
"net.sf.practicalxml","mavensync@...:/home/groups/p/pr/practicalxml/htdocs/releases","rsync_ssh","Keith D Gregory","kdgregory@...",,
"net.sf.qdwizard","mavensync@...:/home/groups/q/qd/qdwizard/htdocs/repository","rsync_ssh","Bertrand Florat","bertrand@...",,
"net.sf.retrotranslator","mavensync@...:/home/groups/r/re/retrotranslator/maven2","rsync_ssh","Taras Puchko","tarasp@...",,
+"net.sf.sidaof","mavensync@...:/home/frs/project/s/si/sidaof/releases","rsync_ssh","Jeff Jensen","jeffjensen@...",,
"net.sf.stat-scm","mavensync@...:/home/groups/s/st/stat-scm/htdocs/maven2","rsync_ssh","Doug Culnane","doug@...",,
"net.sf.sugar","mavensync@...:/home/groups/s/su/sugar/htdocs/m2repo","rsync_ssh","Keith Bishop","bishi@...",,
"net.sf.tacos","mavensync@...:/home/groups/t/ta/tacos/htdocs/repository","rsync_ssh","Igor Drobiazko","igor.drobiazko@...",,

svn commit: r883539 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

2009-11-23T15:14:03Z

Author: carlos
Date: Mon Nov 23 23:14:02 2009
New Revision: 883539

URL: http://svn.apache.org/viewvc?rev=883539&view=rev
Log:
Remove extra spaces

Modified:
maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
URL: http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv?rev=883539&r1=883538&r2=883539&view=diff
==============================================================================
--- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original)
+++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Mon Nov 23 23:14:02 2009
@@ -17,14 +17,14 @@
"com.googlecode.lambdaj","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Mario Fusco","mario.fusco@...",,"http://lambdaj.googlecode.com/svn/repo/releases/"
"com.googlecode.maven-overview-plugin","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Hubert Iwaniuk","neotyk@...",,"http://kungfoo-m2.googlecode.com/svn/release-repo/"
"com.healthmarketscience","maven@...:/home/repo/html/maven2","rsync_ssh",,"openhms-bugs@...",,
-"com.hp.hpl.jena","mavensync@...:/var/repo","rsync_ssh","Andy Seaborne","andy.seaborne@...",,
+"com.hp.hpl.jena","mavensync@...:/var/repo","rsync_ssh","Andy Seaborne","andy.seaborne@...",,
"com.ingres.jdbc","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Alan Raison","Alan.Raison@...",,http://code.ingres.com/apps/maven
"com.kenai.swingjavabuilderext","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Alexandre Navarro","schumnana@...",,"https://kenai.com/svn/swingjavabuilderext~others/maven/release-repository"
"com.kenai.jbosh","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Mike Cumings","maven.mc@...",,"https://kenai.com/svn/jbosh~maven/release"
"com.miglayout","rsync://maven@.../maven/releases","rsync","Mikael Grev","miglayout@...",,
"com.mycila","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Mathieu Carbou","mathieu.carbou@...",,"http://mc-repo.googlecode.com/svn/maven2/releases/"
"com.mysema","rsync://source.mysema.com/releases","rsync","Timo WestkÃ¤mper","info@...",,
-"com.ocpsoft","dlink@...:/home/dlink/ocpsoft.com/repository","rsync_ssh","Lincoln Baxter III","lincoln@...",,
+"com.ocpsoft","dlink@...:/home/dlink/ocpsoft.com/repository","rsync_ssh","Lincoln Baxter III","lincoln@...",,
"com.opensymphony","maven2.opensymphony.com:/opt/repository/maven2","rsync_ssh","Patrick Lightbody","plightbo@...",,
"com.pyx4j","mavensync@...::maven2-release","rsync","Vlad Skarzhevskyy","skarzhevskyy@...",,
"com.pyx4me","mavensync@...::maven2-release","rsync","Vlad Skarzhevskyy","skarzhevskyy@...",,
@@ -77,7 +77,7 @@
"net.sf.scannotation","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
"net.sf.sfac","mavensync@...:/home/groups/s/sf/sfac/mavenRepo","rsync_ssh","Olivier Berlanger","olivier.berlanger@...",,
"net.sourceforge.wurfl","mavensync@...:/home/nexus/sonatype-work/nexus/storage/public-releases","rsync_ssh","Filippo De Luca","filippo.deluca@...",,
-"net.vidageek","maven_sync@...:/home/maven_sync/maven.vidageek.net/","rsync_ssh","Jonas Abreu","jonas@...",,
+"net.vidageek","maven_sync@...:/home/maven_sync/maven.vidageek.net/","rsync_ssh","Jonas Abreu","jonas@...",,
"no.tornado.brap","mavensync@...:/home/brap/webapps/maven/repository","rsync_ssh","Edvin Syse","edvin@...",,
"ognl","maven2.opensymphony.com:/opt/repository/maven2","rsync_ssh","Patrick Lightbody","plightbo@...",,
"opensymphony","maven2.opensymphony.com:/opt/repository/maven2","rsync_ssh","Patrick Lightbody","plightbo@...",,
@@ -132,21 +132,21 @@
"br.com.caelum.seleniumdsl","mavensync@...:/home/groups/s/se/seleniumdsl/htdocs/maven","rsync_ssh","Caue Guerra","caue.guerra@...",,
"br.com.caelum.stella","mavensync@...:/home/groups/c/ca/caelum-stella/htdocs/maven","rsync_ssh","Caue Guerra","caue.guerra@...",,
"br.com.caelum.tubaina","mavensync@...:/home/groups/t/tu/tubaina/htdocs/maven","rsync_ssh","Luiz Real","luiz.real@...",,
-"com.adenki","mavensync@...:/home/groups/s/sm/smppapi/htdocs/maven-repo","rsync_ssh","Oran Kelly","orank@...",,
+"com.adenki","mavensync@...:/home/groups/s/sm/smppapi/htdocs/maven-repo","rsync_ssh","Oran Kelly","orank@...",,
"com.adobe.blazeds","mavensync@...:/home/groups/e/en/enunciate/persistent/m2","rsync_ssh","Ryan Heaton","ryan@...",,
"com.agical.rmock","mavensync@...:/home/groups/r/rm/rmock/htdocs/repository","rsync_ssh","Daniel brolund","daniel.brolund@...",,
"com.agilejava.blammo","mavensync@...:/home/groups/b/bl/blammo/htdocs/repository","rsync_ssh","Wilfred Springer","wilfred@...",,
"com.agilejava.docbkx","mavensync@...:/home/groups/d/do/docbkx-tools/htdocs/repository","rsync_ssh","Wilfred Springer","wilfred@...",,
"com.capgemini.platina","mavensync@...:/home/groups/p/pl/platina/htdocs/releases","rsync_ssh","Nicolas De Loof","nicolas.deloof@...",,
"com.google.code.jbusycomponent","mavensync@...:/home/users/o/ou/ouaibsky/maven/m2repo","rsync_ssh","Ouaibsky","ouaibsky@...",,
-"com.google.code.protoj","mavensync@...:/home/groups/p/pr/protojrepo/htdocs/mavensync","rsync_ssh","Ashley Williams","ashpublic@...",,
+"com.google.code.protoj","mavensync@...:/home/groups/p/pr/protojrepo/htdocs/mavensync","rsync_ssh","Ashley Williams","ashpublic@...",,
"com.h2database","mavensync@...:/home/groups/h/hs/hsql/htdocs/m2-repo","rsync_ssh","Thomas Mueller","thomas.tom.mueller@...",,
"com.hazelcast","mavensync@...:/home/groups/h/ha/hazelcast/htdocs/m2repo","rsync_ssh","Talip Ozturk","talip@...",,
"com.mobilvox.ossi","mavensync@...:/home/groups/m/ma/maven-js-plugin/htdocs/m2repo","rsync_ssh","Adam Altemus","aaltemus@...",,
"com.nexirius","mavensync@...:/home/users/n/ne/nexirius/htdocs/m2repo","rsync_ssh","Marcel Baumann","marcel.baumann@...",,
"com.octo.captcha","mavensync@...:/home/groups/j/jc/jcaptcha/maven-repo","rsync_ssh","Antoine Veret","averet@...",,
"com.seitenbau.testing","mavensync@...:/home/groups/j/ju/junitrecorder/htdocs/m2","rsync_ssh","Rainer Weinhold","rainer.weinhold@...",,
-"com.sourcetohtml","mavensync@...:/home/users/j/ji/jirkacelak/userweb/htdocs/maven2","rsync_ssh","Jiri Celak","jiri@...",,
+"com.sourcetohtml","mavensync@...:/home/users/j/ji/jirkacelak/userweb/htdocs/maven2","rsync_ssh","Jiri Celak","jiri@...",,
"com.unboundid","mavensync@...:/home/groups/l/ld/ldap-sdk/htdocs/maven","rsync_ssh","Neil Wilson","neil.wilson@...",,
"de.huxhorn.lilith","mavensync@...:/home/groups/l/li/lilith/htdocs/repository","rsync_ssh","Joern Huxhorn","huxhorn@...",,
"de.huxhorn.sulky","mavensync@...:/home/groups/s/su/sulky/htdocs/repository","rsync_ssh","Joern Huxhorn","huxhorn@...",,

svn commit: r883537 - in /maven/maven-3/trunk/maven-model-builder/src: main/java/org/apache/maven/model/validation/ test/java/org/apache/maven/model/validation/ test/resources/poms/validation/

2009-11-23T15:09:20Z

Author: bentmann
Date: Mon Nov 23 23:09:20 2009
New Revision: 883537

URL: http://svn.apache.org/viewvc?rev=883537&view=rev
Log:
[MNG-4466] Plugin Metaversion Compatibility

Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/validation/bad-plugin-version.xml

Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java?rev=883537&r1=883536&r2=883537&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java Mon Nov 23 23:09:20 2009
@@ -264,7 +264,7 @@
validateStringNotEmpty( "build.plugins.plugin.version", problems, errOn31, p.getVersion(),
p.getKey() );

- validateVersion( "build.plugins.plugin.version", problems, errOn30, p.getVersion(), p.getKey() );
+ validatePluginVersion( "build.plugins.plugin.version", problems, errOn30, p.getVersion(), p.getKey() );

validateBoolean( "build.plugins.plugin.inherited", problems, errOn30, p.getInherited(),
p.getKey() );
@@ -655,6 +655,32 @@
return false;
}

+ private boolean validatePluginVersion( String fieldName, ModelProblemCollector problems, Severity severity, String string,
+ String sourceHint )
+ {
+ if ( string == null || string.length() <= 0 )
+ {
+ return true;
+ }
+
+ if ( !hasExpression( string ) && !"RELEASE".equals( string ) && !"LATEST".equals( string ) )
+ {
+ return true;
+ }
+
+ if ( sourceHint != null )
+ {
+ addViolation( problems, severity, "'" + fieldName + "' must be a valid version for " + sourceHint
+ + " but is '" + string + "'." );
+ }
+ else
+ {
+ addViolation( problems, severity, "'" + fieldName + "' must be a valid version but is '" + string + "'." );
+ }
+
+ return false;
+ }
+
private static void addViolation( ModelProblemCollector problems, Severity severity, String message )
{
problems.add( severity, message, null );

Modified: maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java?rev=883537&r1=883536&r2=883537&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java Mon Nov 23 23:09:20 2009
@@ -376,9 +376,11 @@
{
SimpleProblemCollector result = validate( "bad-plugin-version.xml" );

- assertViolations( result, 0, 1, 0 );
+ assertViolations( result, 0, 3, 0 );

assertTrue( result.getErrors().get( 0 ).contains( "test:mip" ) );
+ assertTrue( result.getErrors().get( 1 ).contains( "test:rmv" ) );
+ assertTrue( result.getErrors().get( 2 ).contains( "test:lmv" ) );
}

public void testDistributionManagementStatus()

Modified: maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/validation/bad-plugin-version.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/validation/bad-plugin-version.xml?rev=883537&r1=883536&r2=883537&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/validation/bad-plugin-version.xml (original)
+++ maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/validation/bad-plugin-version.xml Mon Nov 23 23:09:20 2009
@@ -27,9 +27,24 @@
<plugins>
<plugin>
<groupId>test</groupId>
+ <artifactId>good</artifactId>
+ <version>1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>test</groupId>
<artifactId>mip</artifactId>
<version>${missing.property}</version>
</plugin>
+ <plugin>
+ <groupId>test</groupId>
+ <artifactId>rmv</artifactId>
+ <version>RELEASE</version>
+ </plugin>
+ <plugin>
+ <groupId>test</groupId>
+ <artifactId>lmv</artifactId>
+ <version>LATEST</version>
+ </plugin>
</plugins>
</build>
</project>

svn commit: r883536 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

2009-11-23T15:08:51Z

Author: carlos
Date: Mon Nov 23 23:08:50 2009
New Revision: 883536

URL: http://svn.apache.org/viewvc?rev=883536&view=rev
Log:
[MAVENUPLOAD-2643][MAVENUPLOAD-2644][MAVENUPLOAD-2645]

Modified:
maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
URL: http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv?rev=883536&r1=883535&r2=883536&view=diff
==============================================================================
--- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original)
+++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Mon Nov 23 23:08:50 2009
@@ -75,6 +75,7 @@
"net.sf.jacob-project","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
"net.sf.jour","mavensync@...::maven2-release","rsync","Vlad Skarzhevskyy","skarzhevskyy@...",,
"net.sf.scannotation","jvanzyl@...:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
+"net.sf.sfac","mavensync@...:/home/groups/s/sf/sfac/mavenRepo","rsync_ssh","Olivier Berlanger","olivier.berlanger@...",,
"net.sourceforge.wurfl","mavensync@...:/home/nexus/sonatype-work/nexus/storage/public-releases","rsync_ssh","Filippo De Luca","filippo.deluca@...",,
"net.vidageek","maven_sync@...:/home/maven_sync/maven.vidageek.net/","rsync_ssh","Jonas Abreu","jonas@...",,
"no.tornado.brap","mavensync@...:/home/brap/webapps/maven/repository","rsync_ssh","Edvin Syse","edvin@...",,
@@ -102,8 +103,10 @@
"org.gmock","rsync@...:/home/rsync/gmock/releases","rsync_ssh","Julien Gagnet","julien.gagnet@...",,
"org.hsqldb","dedmike@...:m2repo","rsync_ssh","Blaine Simpson","blaine.simpson@...",,
"org.icefaces","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Ted Goddard","ted.goddard@...",,"http://anonsvn.icefaces.org/repo/maven2/releases/"
+"org.jminix","maven@...:m2repo/releases","rsync_ssh","Laurent Bovet","lbovet@...",,
"org.libvirt","rsync://libvirt.org/maven2","rsync","Daniel Veillard","daniel@...",,
"org.mockito","mockito@...:/","rsync_ssh","Erik Brakkee","erik@...",,
+"org.mongodb","rsync://buildbot.mongodb.org/maven/","rsync","Eliot Horowitz","eliot@...",,
"org.neodatis.odb","mavensync@...:/home/groups/n/ne/neodatis-odb/htdocs/m2-repo","rsync_ssh","Olivier Smadja","olivier@...",,
"org.objectweb","maven@...:../../groups/maven/htdocs/maven2","rsync_ssh","xavier moghrabi","xavier.moghrabi@...",,
"org.ops4j","maven-sync@...:/var/http/repository.ops4j.org/m2release","rsync_ssh","Niclas Hedhman","niclas@...",,

svn commit: r883526 - /maven/site/trunk/src/site/apt/plugins/index.apt

2009-11-23T14:35:12Z

Author: dennisl
Date: Mon Nov 23 22:35:12 2009
New Revision: 883526

URL: http://svn.apache.org/viewvc?rev=883526&view=rev
Log:
o Release maven-changes-plugin 2.2.

Modified:
maven/site/trunk/src/site/apt/plugins/index.apt

Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=883526&r1=883525&r2=883526&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Mon Nov 23 22:35:12 2009
@@ -4,7 +4,7 @@
Brett Porter
Jason van Zyl
-----
- 2009-10-26
+ 2009-11-23
-----

~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -95,7 +95,7 @@
*-----------------------------------------------------------+------------+--------------+------------+------------------+------------------------+--------------------+
| {{{/plugins/maven-changelog-plugin/} <<<changelog>>>}} | R | 2.1 | 2007-07-25 | Generate a list of recent changes from your SCM. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changelog-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MCHANGELOG}JIRA}}
*-----------------------------------------------------------+------------+--------------+------------+------------------+------------------------+--------------------+
-| {{{/plugins/maven-changes-plugin/} <<<changes>>>}} | B+R | 2.1 | 2008-11-24 | Generate a report from issue tracking or a change document. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changes-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MCHANGES}JIRA}}
+| {{{/plugins/maven-changes-plugin/} <<<changes>>>}} | B+R | 2.2 | 2009-11-23 | Generate a report from issue tracking or a change document. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changes-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MCHANGES}JIRA}}
*-----------------------------------------------------------+------------+--------------+------------+------------------+------------------------+--------------------+
| {{{/plugins/maven-checkstyle-plugin/} <<<checkstyle>>>}} | B+R | 2.4 | 2009-11-18 | Generate a checkstyle report. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MCHECKSTYLE}JIRA}}
*-----------------------------------------------------------+------------+--------------+------------+------------------+------------------------+--------------------+

svn commit: r883523 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

2009-11-23T14:19:12Z

Author: carlos
Date: Mon Nov 23 22:19:11 2009
New Revision: 883523

URL: http://svn.apache.org/viewvc?rev=883523&view=rev
Log:
[MAVENUPLOAD-2654][MAVENUPLOAD-2627]

Modified:
maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
URL: http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv?rev=883523&r1=883522&r2=883523&view=diff
==============================================================================
--- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original)
+++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Mon Nov 23 22:19:11 2009
@@ -17,7 +17,7 @@
"com.googlecode.lambdaj","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Mario Fusco","mario.fusco@...",,"http://lambdaj.googlecode.com/svn/repo/releases/"
"com.googlecode.maven-overview-plugin","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Hubert Iwaniuk","neotyk@...",,"http://kungfoo-m2.googlecode.com/svn/release-repo/"
"com.healthmarketscience","maven@...:/home/repo/html/maven2","rsync_ssh",,"openhms-bugs@...",,
-"com.hp.hpl.jena","mavensync@...:/var/repo","rsync_ssh","Andy Seaborne","andy.seaborne@...",,
+"com.hp.hpl.jena","mavensync@...:/var/repo","rsync_ssh","Andy Seaborne","andy.seaborne@...",,
"com.ingres.jdbc","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Alan Raison","Alan.Raison@...",,http://code.ingres.com/apps/maven
"com.kenai.swingjavabuilderext","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Alexandre Navarro","schumnana@...",,"https://kenai.com/svn/swingjavabuilderext~others/maven/release-repository"
"com.kenai.jbosh","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Mike Cumings","maven.mc@...",,"https://kenai.com/svn/jbosh~maven/release"
@@ -28,6 +28,7 @@
"com.opensymphony","maven2.opensymphony.com:/opt/repository/maven2","rsync_ssh","Patrick Lightbody","plightbo@...",,
"com.pyx4j","mavensync@...::maven2-release","rsync","Vlad Skarzhevskyy","skarzhevskyy@...",,
"com.pyx4me","mavensync@...::maven2-release","rsync","Vlad Skarzhevskyy","skarzhevskyy@...",,
+"com.surelogic","rsync@...:/home/rsync/m2repo","rsync_ssh","Nathan Boy","nathan.boy@..."
"com.yahoo.platform.yui","jvanzyl@...:/x1/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","nicolas@...",,
"commons-beanutils","jvanzyl@...:/www/people.apache.org/repo/m2-ibiblio-rsync-repository","rsync_ssh","Niall Pemberton","niallp@...",,
"commons-chain","jvanzyl@...:/www/people.apache.org/repo/m2-ibiblio-rsync-repository","rsync_ssh","Niall Pemberton","niallp@...",,
@@ -103,6 +104,7 @@
"org.icefaces","/home/maven/repository-staging/to-ibiblio/maven-svn","svn","Ted Goddard","ted.goddard@...",,"http://anonsvn.icefaces.org/repo/maven2/releases/"
"org.libvirt","rsync://libvirt.org/maven2","rsync","Daniel Veillard","daniel@...",,
"org.mockito","mockito@...:/","rsync_ssh","Erik Brakkee","erik@...",,
+"org.neodatis.odb","mavensync@...:/home/groups/n/ne/neodatis-odb/htdocs/m2-repo","rsync_ssh","Olivier Smadja","olivier@...",,
"org.objectweb","maven@...:../../groups/maven/htdocs/maven2","rsync_ssh","xavier moghrabi","xavier.moghrabi@...",,
"org.ops4j","maven-sync@...:/var/http/repository.ops4j.org/m2release","rsync_ssh","Niclas Hedhman","niclas@...",,
"org.ow2","maven@...:../../groups/maven/htdocs/maven2","rsync_ssh","xavier moghrabi","xavier.moghrabi@...",,

svn commit: r883521 - /maven/plugins/trunk/maven-site-plugin/pom.xml

2009-11-23T14:16:33Z

Author: brett
Date: Mon Nov 23 22:16:32 2009
New Revision: 883521

URL: http://svn.apache.org/viewvc?rev=883521&view=rev
Log:
update to 1.1.8 for the Maven site

Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml

Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=883521&r1=883520&r2=883521&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Mon Nov 23 22:16:32 2009
@@ -304,7 +304,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-velocity</artifactId>
- <version>1.1.7</version>
+ <version>1.1.8</version>
<exclusions>
<exclusion>
<groupId>commons-collections</groupId>

svn commit: r883520 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java

2009-11-23T14:14:10Z

Author: bentmann
Date: Mon Nov 23 22:14:10 2009
New Revision: 883520

URL: http://svn.apache.org/viewvc?rev=883520&view=rev
Log:
o Fixed exception message

Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java?rev=883520&r1=883519&r2=883520&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java Mon Nov 23 22:14:10 2009
@@ -54,10 +54,10 @@

if ( remoteRepositories != null && !remoteRepositories.isEmpty() )
{
- repos += ", ";
-
for ( ArtifactRepository repository : remoteRepositories )
{
+ repos += ", ";
+
if ( repository != null )
{
repos += repository.getId() + " (" + repository.getUrl() + ")";

svn commit: r883519 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-4465/ resources/mng-4465/repo/ resources/mng-4465/repo/org/ resources/mng-4465/repo/org/apache/ resources/mng-4465/repo/org/a...

2009-11-23T14:12:54Z

Author: bentmann
Date: Mon Nov 23 22:12:53 2009
New Revision: 883519

URL: http://svn.apache.org/viewvc?rev=883519&view=rev
Log:
[MNG-4465] [regression] can't run mvn help:effective-settings when offline

o Added IT

Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-mng4465-plugin/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-mng4465-plugin/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-mng4465-plugin/0.1/maven-mng4465-plugin-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-mng4465-plugin/0.1/maven-mng4465-plugin-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-mng4465-plugin/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/settings-template.xml (with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=883519&r1=883518&r2=883519&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Mon Nov 23 22:12:53 2009
@@ -85,6 +85,7 @@
// suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137

+ suite.addTestSuite( MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.class );
suite.addTestSuite( MavenITmng4461ArtifactUploadMonitorTest.class );
suite.addTestSuite( MavenITmng4459InMemorySettingsKeptEncryptedTest.class );
suite.addTestSuite( MavenITmng4453PluginVersionFromLifecycleMappingTest.class );

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java?rev=883519&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java Mon Nov 23 22:12:53 2009
@@ -0,0 +1,86 @@
+package org.apache.maven.it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.FileUtils;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.Properties;
+
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4465">MNG-4465</a>.
+ *
+ * @author Benjamin Bentmann
+ */
+public class MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest
+ extends AbstractMavenIntegrationTestCase
+{
+
+ public MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest()
+ {
+ super( "[2.1.0,3.0-alpha-1),[3.0-alpha-6,)" );
+ }
+
+ /**
+ * Verify that locally cached metadata of non-accessible remote repos is still considered when resolving
+ * plugin prefixes.
+ */
+ public void testit()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4465" );
+
+ // phase 1: get the metadata into the local repo
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng4465" );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.setLogFileName( "log1.txt" );
+ verifier.getCliOptions().add( "-s" );
+ verifier.getCliOptions().add( "settings.xml" );
+ verifier.executeGoal( "mng4465:touch" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ verifier.assertFilePresent( "target/touch.properties" );
+
+ // phase 2: re-try with the remote repo being inaccessible (due to bad URL)
+
+ verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8",
+ Collections.singletonMap( "@baseurl@", "bad://localhost:63412" ) );
+ verifier.setLogFileName( "log2.txt" );
+ verifier.getCliOptions().add( "-s" );
+ verifier.getCliOptions().add( "settings.xml" );
+ verifier.executeGoal( "mng4465:touch" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ verifier.assertFilePresent( "target/touch.properties" );
+ }
+
+}

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/pom.xml?rev=883519&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/pom.xml Mon Nov 23 22:12:53 2009
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng4465</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+
+ <name>Maven Integration Test :: MNG-4465</name>
+ <description>
+ Verify that locally cached metadata of non-accessible remote repos is still considered when resolving
+ plugin prefixes.
+ </description>
+</project>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-metadata.xml?rev=883519&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-metadata.xml Mon Nov 23 22:12:53 2009
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <plugins>
+ <plugin>
+ <name>Maven Integration Test :: MNG-4465 :: Plugin</name>
+ <prefix>mng4465</prefix>
+ <artifactId>maven-mng4465-plugin</artifactId>
+ </plugin>
+ </plugins>
+</metadata>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-mng4465-plugin/0.1/maven-mng4465-plugin-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-mng4465-plugin/0.1/maven-mng4465-plugin-0.1.jar?rev=883519&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-mng4465-plugin/0.1/maven-mng4465-plugin-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-mng4465-plugin/0.1/maven-mng4465-plugin-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-mng4465-plugin/0.1/maven-mng4465-plugin-0.1.pom?rev=883519&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-mng4465-plugin/0.1/maven-mng4465-plugin-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-mng4465-plugin/0.1/maven-mng4465-plugin-0.1.pom Mon Nov 23 22:12:53 2009
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng4465</groupId>
+ <artifactId>maven-mng4465-plugin</artifactId>
+ <version>0.1</version>
+ <packaging>maven-plugin</packaging>
+
+ <name>Maven Integration Test :: MNG-4465 :: Plugin</name>
+ <inceptionYear>2009</inceptionYear>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/**</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </build>
+</project>

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-mng4465-plugin/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-mng4465-plugin/maven-metadata.xml?rev=883519&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-mng4465-plugin/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-mng4465-plugin/maven-metadata.xml Mon Nov 23 22:12:53 2009
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.mng4465</groupId>
+ <artifactId>maven-mng4465-plugin</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <latest>0.1</latest>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20091123190109</lastUpdated>
+ </versioning>
+</metadata>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-mng4465-plugin/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/repo/org/apache/maven/its/mng4465/maven-mng4465-plugin/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/settings-template.xml?rev=883519&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/settings-template.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/settings-template.xml Mon Nov 23 22:12:53 2009
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<settings>
+ <pluginGroups>
+ <pluginGroup>org.apache.maven.its.mng4465</pluginGroup>
+ </pluginGroups>
+ <profiles>
+ <profile>
+ <id>maven-core-it-repo</id>
+ <repositories>
+ <repository>
+ <id>mng4465</id>
+ <url>@baseurl@/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ <updatePolicy>always</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>central</id>
+ <url>@baseurl@/repo</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>mng4465</id>
+ <url>@baseurl@/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ <updatePolicy>always</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ <pluginRepository>
+ <id>central</id>
+ <url>@baseurl@/repo</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+ <activeProfiles>
+ <activeProfile>maven-core-it-repo</activeProfile>
+ </activeProfiles>
+</settings>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/settings-template.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4465/settings-template.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

svn commit: r883510 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java

2009-11-23T13:50:41Z

Author: bentmann
Date: Mon Nov 23 21:50:41 2009
New Revision: 883510

URL: http://svn.apache.org/viewvc?rev=883510&view=rev
Log:
[MNG-4465] [regression] can't run mvn help:effective-settings when offline

Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java?rev=883510&r1=883509&r2=883510&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java Mon Nov 23 21:50:41 2009
@@ -184,8 +184,6 @@
{
logger.warn( "Failed to retrieve " + remotePath + ": " + e.getMessage() );
}
-
- continue;
}
catch ( ArtifactDoesNotExistException e )
{

svn commit: r883430 - in /maven/maven-3/trunk: maven-compat/src/main/java/org/apache/maven/project/ maven-core/src/main/java/org/apache/maven/ maven-core/src/main/java/org/apache/maven/project/

2009-11-23T09:40:04Z

Author: bentmann
Date: Mon Nov 23 17:40:04 2009
New Revision: 883430

URL: http://svn.apache.org/viewvc?rev=883430&view=rev
Log:
[MNG-3902] Remove visibility MavenProjectBuilder#buildStandaloneSuperProject

Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=883430&r1=883429&r2=883430&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Mon Nov 23 17:40:04 2009
@@ -27,6 +27,8 @@
import org.apache.maven.model.Repository;
import org.apache.maven.model.building.ModelBuildingException;
import org.apache.maven.model.building.ModelBuildingRequest;
+import org.apache.maven.model.building.ModelSource;
+import org.apache.maven.model.building.UrlModelSource;
import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.repository.RepositorySystem;
@@ -178,7 +180,10 @@
public MavenProject buildStandaloneSuperProject( ProjectBuilderConfiguration config )
throws ProjectBuildingException
{
- return projectBuilder.buildStandaloneSuperProject( config ).getProject();
+ ModelSource modelSource = new UrlModelSource( getClass().getResource( "standalone.xml" ) );
+ MavenProject project = projectBuilder.build( modelSource, config ).getProject();
+ project.setExecutionRoot( true );
+ return project;
}

public MavenProject buildStandaloneSuperProject( ArtifactRepository localRepository )

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=883430&r1=883429&r2=883430&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Mon Nov 23 17:40:04 2009
@@ -41,6 +41,8 @@
import org.apache.maven.execution.ProjectDependencyGraph;
import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.model.building.ModelProblem;
+import org.apache.maven.model.building.ModelSource;
+import org.apache.maven.model.building.UrlModelSource;
import org.apache.maven.project.DuplicateProjectException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
@@ -80,7 +82,7 @@

@Requirement
MavenExecutionRequestPopulator populator;
-
+
private void fireEvent( MavenSession session, ExecutionEventCatapult catapult )
{
ExecutionListener listener = session.getRequest().getExecutionListener();
@@ -336,7 +338,10 @@
//
if ( request.getPom() == null || !request.getPom().exists() )
{
- MavenProject project = projectBuilder.buildStandaloneSuperProject( request.getProjectBuildingRequest() ).getProject();
+ ModelSource modelSource = new UrlModelSource( getClass().getResource( "project/standalone.xml" ) );
+ MavenProject project =
+ projectBuilder.build( modelSource, request.getProjectBuildingRequest() ).getProject();
+ project.setExecutionRoot( true );
projects.add( project );
request.setProjectPresent( false );
return projects;

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=883430&r1=883429&r2=883430&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java Mon Nov 23 17:40:04 2009
@@ -40,7 +40,6 @@
import org.apache.maven.model.building.ModelProcessor;
import org.apache.maven.model.building.ModelSource;
import org.apache.maven.model.building.StringModelSource;
-import org.apache.maven.model.building.UrlModelSource;
import org.apache.maven.model.resolution.ModelResolver;
import org.apache.maven.project.artifact.ProjectArtifact;
import org.apache.maven.repository.RepositorySystem;
@@ -82,6 +81,12 @@
return build( pomFile, new FileModelSource( pomFile ), configuration );
}

+ public ProjectBuildingResult build( ModelSource modelSource, ProjectBuildingRequest configuration )
+ throws ProjectBuildingException
+ {
+ return build( null, modelSource, configuration );
+ }
+
private ProjectBuildingResult build( File pomFile, ModelSource modelSource, ProjectBuildingRequest configuration )
throws ProjectBuildingException
{
@@ -248,21 +253,6 @@
return new StringModelSource( buffer, artifact.getId() );
}

- /**
- * This is used for pom-less execution like running archetype:generate.
- *
- * I am taking out the profile handling and the interpolation of the base directory until we
- * spec this out properly.
- */
- public ProjectBuildingResult buildStandaloneSuperProject( ProjectBuildingRequest config )
- throws ProjectBuildingException
- {
- ProjectBuildingResult result =
- build( null, new UrlModelSource( getClass().getResource( "standalone.xml" ) ), config );
- result.getProject().setExecutionRoot( true );
- return result;
- }
-
public List<ProjectBuildingResult> build( List<File> pomFiles, boolean recursive, ProjectBuildingRequest config )
throws ProjectBuildingException
{

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java?rev=883430&r1=883429&r2=883430&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java Mon Nov 23 17:40:04 2009
@@ -19,23 +19,59 @@
import java.util.List;

import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.building.ModelSource;

+/**
+ * Builds in-memory descriptions of projects.
+ */
public interface ProjectBuilder
{

+ /**
+ * Builds a project descriptor from the specified POM file.
+ *
+ * @param projectFile The POM file to build the project from, must not be {@code null}.
+ * @param request The project building request that holds further parameters, must not be {@code null}.
+ * @return The result of the project building, never {@code null}.
+ * @throws ProjectBuildingException If the project descriptor could not be successfully built.
+ */
ProjectBuildingResult build( File projectFile, ProjectBuildingRequest request )
throws ProjectBuildingException;

+ /**
+ * Builds a project descriptor for the specified artifact.
+ *
+ * @param projectArtifact The POM artifact to build the project from, must not be {@code null}.
+ * @param request The project building request that holds further parameters, must not be {@code null}.
+ * @return The result of the project building, never {@code null}.
+ * @throws ProjectBuildingException If the project descriptor could not be successfully built.
+ */
ProjectBuildingResult build( Artifact projectArtifact, ProjectBuildingRequest request )
throws ProjectBuildingException;

+ /**
+ * Builds a project descriptor for the specified artifact.
+ *
+ * @param projectArtifact The POM artifact to build the project from, must not be {@code null}.
+ * @param allowStubModel A flag controlling the case of a missing POM artifact. If {@code true} and the specified
+ * POM artifact does not exist, a simple stub model will be returned. If {@code false}, an exception will
+ * be thrown.
+ * @param request The project building request that holds further parameters, must not be {@code null}.
+ * @return The result of the project building, never {@code null}.
+ * @throws ProjectBuildingException If the project descriptor could not be successfully built.
+ */
ProjectBuildingResult build( Artifact projectArtifact, boolean allowStubModel, ProjectBuildingRequest request )
throws ProjectBuildingException;

- // TODO: this is only to provide a project for plugins that don't need a project to execute but need some
- // of the values from a MavenProject. Ideally this should be something internal and nothing outside Maven
- // would ever need this so it should not be exposed in a public API
- ProjectBuildingResult buildStandaloneSuperProject( ProjectBuildingRequest request )
+ /**
+ * Builds a project descriptor for the specified model source.
+ *
+ * @param modelSource The source of the model to built the project descriptor from, must not be {@code null}.
+ * @param request The project building request that holds further parameters, must not be {@code null}.
+ * @return The result of the project building, never {@code null}.
+ * @throws ProjectBuildingException If the project descriptor could not be successfully built.
+ */
+ ProjectBuildingResult build( ModelSource modelSource, ProjectBuildingRequest request )
throws ProjectBuildingException;

/**

svn commit: r883378 - in /maven/maven-3/trunk: ./ apache-maven/ maven-artifact/ maven-compat/ maven-core/ maven-embedder/ maven-model-builder/ maven-model/ maven-plugin-api/ maven-settings/

2009-11-23T07:46:45Z

Author: bentmann
Date: Mon Nov 23 15:46:44 2009
New Revision: 883378

URL: http://svn.apache.org/viewvc?rev=883378&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/maven-3/trunk/apache-maven/pom.xml
maven/maven-3/trunk/maven-artifact/pom.xml
maven/maven-3/trunk/maven-compat/pom.xml
maven/maven-3/trunk/maven-core/pom.xml
maven/maven-3/trunk/maven-embedder/pom.xml
maven/maven-3/trunk/maven-model-builder/pom.xml
maven/maven-3/trunk/maven-model/pom.xml
maven/maven-3/trunk/maven-plugin-api/pom.xml
maven/maven-3/trunk/maven-settings/pom.xml
maven/maven-3/trunk/pom.xml

Modified: maven/maven-3/trunk/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/pom.xml?rev=883378&r1=883377&r2=883378&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/pom.xml (original)
+++ maven/maven-3/trunk/apache-maven/pom.xml Mon Nov 23 15:46:44 2009
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.0-alpha-5</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>apache-maven</artifactId>
<packaging>pom</packaging>

Modified: maven/maven-3/trunk/maven-artifact/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-artifact/pom.xml?rev=883378&r1=883377&r2=883378&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-artifact/pom.xml (original)
+++ maven/maven-3/trunk/maven-artifact/pom.xml Mon Nov 23 15:46:44 2009
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.0-alpha-5</version>
+ <version>3.0-SNAPSHOT</version>
</parent>

<artifactId>maven-artifact</artifactId>

Modified: maven/maven-3/trunk/maven-compat/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/pom.xml?rev=883378&r1=883377&r2=883378&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/pom.xml (original)
+++ maven/maven-3/trunk/maven-compat/pom.xml Mon Nov 23 15:46:44 2009
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.0-alpha-5</version>
+ <version>3.0-SNAPSHOT</version>
</parent>

<artifactId>maven-compat</artifactId>

Modified: maven/maven-3/trunk/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/pom.xml?rev=883378&r1=883377&r2=883378&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/pom.xml (original)
+++ maven/maven-3/trunk/maven-core/pom.xml Mon Nov 23 15:46:44 2009
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.0-alpha-5</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>maven-core</artifactId>
<name>Maven Core</name>

Modified: maven/maven-3/trunk/maven-embedder/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/pom.xml?rev=883378&r1=883377&r2=883378&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-embedder/pom.xml (original)
+++ maven/maven-3/trunk/maven-embedder/pom.xml Mon Nov 23 15:46:44 2009
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.0-alpha-5</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>maven-embedder</artifactId>
<name>Maven Embedder</name>

Modified: maven/maven-3/trunk/maven-model-builder/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/pom.xml?rev=883378&r1=883377&r2=883378&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/pom.xml (original)
+++ maven/maven-3/trunk/maven-model-builder/pom.xml Mon Nov 23 15:46:44 2009
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.0-alpha-5</version>
+ <version>3.0-SNAPSHOT</version>
</parent>

<artifactId>maven-model-builder</artifactId>

Modified: maven/maven-3/trunk/maven-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model/pom.xml?rev=883378&r1=883377&r2=883378&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model/pom.xml (original)
+++ maven/maven-3/trunk/maven-model/pom.xml Mon Nov 23 15:46:44 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.0-alpha-5</version>
+ <version>3.0-SNAPSHOT</version>
</parent>

<artifactId>maven-model</artifactId>

Modified: maven/maven-3/trunk/maven-plugin-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-plugin-api/pom.xml?rev=883378&r1=883377&r2=883378&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-plugin-api/pom.xml (original)
+++ maven/maven-3/trunk/maven-plugin-api/pom.xml Mon Nov 23 15:46:44 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.0-alpha-5</version>
+ <version>3.0-SNAPSHOT</version>
</parent>

<artifactId>maven-plugin-api</artifactId>

Modified: maven/maven-3/trunk/maven-settings/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-settings/pom.xml?rev=883378&r1=883377&r2=883378&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-settings/pom.xml (original)
+++ maven/maven-3/trunk/maven-settings/pom.xml Mon Nov 23 15:46:44 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.0-alpha-5</version>
+ <version>3.0-SNAPSHOT</version>
</parent>

<artifactId>maven-settings</artifactId>

Modified: maven/maven-3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=883378&r1=883377&r2=883378&view=diff
==============================================================================
--- maven/maven-3/trunk/pom.xml (original)
+++ maven/maven-3/trunk/pom.xml Mon Nov 23 15:46:44 2009
@@ -21,7 +21,7 @@
</parent>

<artifactId>maven</artifactId>
- <version>3.0-alpha-5</version>
+ <version>3.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Apache Maven 3.x</name>
@@ -145,9 +145,9 @@
</modules>

<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-3/tags/maven-3.0-alpha-5</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/maven-3/tags/maven-3.0-alpha-5</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/maven-3/tags/maven-3.0-alpha-5</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-3/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/maven-3/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/maven-3/trunk</url>
</scm>
<issueManagement>
<system>jira</system>

svn commit: r883377 - /maven/maven-3/tags/maven-3.0-alpha-5/

2009-11-23T07:45:59Z

Author: bentmann
Date: Mon Nov 23 15:45:59 2009
New Revision: 883377

URL: http://svn.apache.org/viewvc?rev=883377&view=rev
Log:
[maven-scm] copy for tag maven-3.0-alpha-5

Added:
maven/maven-3/tags/maven-3.0-alpha-5/ (props changed)
- copied from r883376, maven/maven-3/trunk/

Propchange: maven/maven-3/tags/maven-3.0-alpha-5/
------------------------------------------------------------------------------
bugtraq:append = true

Propchange: maven/maven-3/tags/maven-3.0-alpha-5/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/tags/maven-3.0-alpha-5/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/tags/maven-3.0-alpha-5/
------------------------------------------------------------------------------
bugtraq:number = false

Propchange: maven/maven-3/tags/maven-3.0-alpha-5/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/tags/maven-3.0-alpha-5/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Nov 23 15:45:59 2009
@@ -0,0 +1,14 @@
+release.properties
+deleteme.version.properties
+bootstrap
+target
+.classpath
+.project
+.settings
+*.iml
+*.iws
+*.ipr
+log.txt
+dependencies.xml
+.git
+.gitignore

Propchange: maven/maven-3/tags/maven-3.0-alpha-5/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 23 15:45:59 2009
@@ -0,0 +1,8 @@
+/maven/components/branches/MNG-3932-1:746145-746157
+/maven/components/branches/maven-2.0.10-RC:680477
+/maven/components/branches/maven-2.0.x:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager:738973-739966
+/maven/components/sisbell-plugin-manager:738757-738972
+/maven/components/trunk:751453-767358,767708-768832
+/maven/maven-2/branches/maven-2.2.x:795521

Propchange: maven/maven-3/tags/maven-3.0-alpha-5/
------------------------------------------------------------------------------
svnmerge-integrated = /maven/components/branches/maven-2.0.x:1-496200

svn commit: r883375 - in /maven/maven-3/trunk: ./ apache-maven/ maven-artifact/ maven-compat/ maven-core/ maven-embedder/ maven-model-builder/ maven-model/ maven-plugin-api/ maven-settings/

2009-11-23T07:45:11Z

Author: bentmann
Date: Mon Nov 23 15:45:11 2009
New Revision: 883375

URL: http://svn.apache.org/viewvc?rev=883375&view=rev
Log:
[maven-release-plugin] prepare release maven-3.0-alpha-5

Modified:
maven/maven-3/trunk/apache-maven/pom.xml
maven/maven-3/trunk/maven-artifact/pom.xml
maven/maven-3/trunk/maven-compat/pom.xml
maven/maven-3/trunk/maven-core/pom.xml
maven/maven-3/trunk/maven-embedder/pom.xml
maven/maven-3/trunk/maven-model-builder/pom.xml
maven/maven-3/trunk/maven-model/pom.xml
maven/maven-3/trunk/maven-plugin-api/pom.xml
maven/maven-3/trunk/maven-settings/pom.xml
maven/maven-3/trunk/pom.xml

Modified: maven/maven-3/trunk/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/pom.xml?rev=883375&r1=883374&r2=883375&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/pom.xml (original)
+++ maven/maven-3/trunk/apache-maven/pom.xml Mon Nov 23 15:45:11 2009
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-alpha-5</version>
</parent>
<artifactId>apache-maven</artifactId>
<packaging>pom</packaging>

Modified: maven/maven-3/trunk/maven-artifact/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-artifact/pom.xml?rev=883375&r1=883374&r2=883375&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-artifact/pom.xml (original)
+++ maven/maven-3/trunk/maven-artifact/pom.xml Mon Nov 23 15:45:11 2009
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-alpha-5</version>
</parent>

<artifactId>maven-artifact</artifactId>

Modified: maven/maven-3/trunk/maven-compat/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/pom.xml?rev=883375&r1=883374&r2=883375&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/pom.xml (original)
+++ maven/maven-3/trunk/maven-compat/pom.xml Mon Nov 23 15:45:11 2009
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-alpha-5</version>
</parent>

<artifactId>maven-compat</artifactId>

Modified: maven/maven-3/trunk/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/pom.xml?rev=883375&r1=883374&r2=883375&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/pom.xml (original)
+++ maven/maven-3/trunk/maven-core/pom.xml Mon Nov 23 15:45:11 2009
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-alpha-5</version>
</parent>
<artifactId>maven-core</artifactId>
<name>Maven Core</name>

Modified: maven/maven-3/trunk/maven-embedder/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/pom.xml?rev=883375&r1=883374&r2=883375&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-embedder/pom.xml (original)
+++ maven/maven-3/trunk/maven-embedder/pom.xml Mon Nov 23 15:45:11 2009
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-alpha-5</version>
</parent>
<artifactId>maven-embedder</artifactId>
<name>Maven Embedder</name>

Modified: maven/maven-3/trunk/maven-model-builder/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/pom.xml?rev=883375&r1=883374&r2=883375&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/pom.xml (original)
+++ maven/maven-3/trunk/maven-model-builder/pom.xml Mon Nov 23 15:45:11 2009
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-alpha-5</version>
</parent>

<artifactId>maven-model-builder</artifactId>

Modified: maven/maven-3/trunk/maven-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model/pom.xml?rev=883375&r1=883374&r2=883375&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model/pom.xml (original)
+++ maven/maven-3/trunk/maven-model/pom.xml Mon Nov 23 15:45:11 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-alpha-5</version>
</parent>

<artifactId>maven-model</artifactId>

Modified: maven/maven-3/trunk/maven-plugin-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-plugin-api/pom.xml?rev=883375&r1=883374&r2=883375&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-plugin-api/pom.xml (original)
+++ maven/maven-3/trunk/maven-plugin-api/pom.xml Mon Nov 23 15:45:11 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-alpha-5</version>
</parent>

<artifactId>maven-plugin-api</artifactId>

Modified: maven/maven-3/trunk/maven-settings/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-settings/pom.xml?rev=883375&r1=883374&r2=883375&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-settings/pom.xml (original)
+++ maven/maven-3/trunk/maven-settings/pom.xml Mon Nov 23 15:45:11 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-alpha-5</version>
</parent>

<artifactId>maven-settings</artifactId>

Modified: maven/maven-3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=883375&r1=883374&r2=883375&view=diff
==============================================================================
--- maven/maven-3/trunk/pom.xml (original)
+++ maven/maven-3/trunk/pom.xml Mon Nov 23 15:45:11 2009
@@ -21,7 +21,7 @@
</parent>

<artifactId>maven</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-alpha-5</version>
<packaging>pom</packaging>

<name>Apache Maven 3.x</name>
@@ -145,9 +145,9 @@
</modules>

<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-3/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/maven-3/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/maven-3/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-3/tags/maven-3.0-alpha-5</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/maven-3/tags/maven-3.0-alpha-5</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/maven-3/tags/maven-3.0-alpha-5</url>
</scm>
<issueManagement>
<system>jira</system>

svn commit: r883374 - in /maven/site/trunk/src/site: resources/images/books/pearson_apache_maven_fr.jpg xdoc/articles.xml

2009-11-23T07:44:36Z

Author: aheritier
Date: Mon Nov 23 15:44:35 2009
New Revision: 883374

URL: http://svn.apache.org/viewvc?rev=883374&view=rev
Log:
Add Pearson Apache Maven (FR) book

Added:
maven/site/trunk/src/site/resources/images/books/pearson_apache_maven_fr.jpg (with props)
Modified:
maven/site/trunk/src/site/xdoc/articles.xml

Added: maven/site/trunk/src/site/resources/images/books/pearson_apache_maven_fr.jpg
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/resources/images/books/pearson_apache_maven_fr.jpg?rev=883374&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/site/trunk/src/site/resources/images/books/pearson_apache_maven_fr.jpg
------------------------------------------------------------------------------
svn:mime-type = image/jpeg

Modified: maven/site/trunk/src/site/xdoc/articles.xml
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/xdoc/articles.xml?rev=883374&r1=883373&r2=883374&view=diff
==============================================================================
--- maven/site/trunk/src/site/xdoc/articles.xml (original)
+++ maven/site/trunk/src/site/xdoc/articles.xml Mon Nov 23 15:44:35 2009
@@ -27,6 +27,24 @@
</properties>
<body>
<section name="Books on Maven">
+
+<div style="float: left; margin-right: 5em;">
+<a href="http://www.pearson.fr/livre/?GCOI=27440100730370"><img src="images/books/pearson_apache_maven_fr.jpg" title="Apache Maven - en Français" /></a>
+</div>
+
+ <div style="min-height: 220px">
+ <p><a href="http://www.pearson.fr/livre/?GCOI=27440100730370"><strong>Apache Maven (en Français)</strong></a></p>
+ <ul>
+ <li><strong>Covers: </strong>Maven 2 and above</li>
+ <li><strong>Published: </strong> Pearson (November 20, 2009)</li>
+ <li><strong>Authors: </strong>
+<a href="http://blog.loof.fr/">Nicolas De loof</a>,
+<a href="http://blog.aheritier.net/">Arnaud Héritier</a>
+ </li>
+ <li><strong>Buy the Book:</strong> <a href="http://www.pearson.fr/livre/index.cfm?gcoi=27440100730370">Pearson</a>, <a href="http://www.amazon.fr/Apache-Maven-Nicolas-loof/dp/274402337X/wwwdeveloppec-21?tag=citofgamonlco-20">Amazon</a>, <a href="http://livre.fnac.com/a2748495/Nicolas-de-Loof-Apache-Maven?PID=1&Mn=-1&Mu=-13&Ra=-1&To=0&Nu=1&Fr=0">FNAC</a></li>
+ </ul>
+ </div>
+
<div style="float: left; margin-right: 5em;">
<a href="http://www.packtpub.com/apache-maven-2-effective-implementations/book"><img src="images/books/apache_maven_2_effective_implementation.jpg" title="Apache Maven 2: Effective Implementation" /></a>
</div>

svn commit: r883070 - /maven/plugins/trunk/maven-shade-plugin/pom.xml

2009-11-22T04:33:53Z

Author: bentmann
Date: Sun Nov 22 12:33:52 2009
New Revision: 883070

URL: http://svn.apache.org/viewvc?rev=883070&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/plugins/trunk/maven-shade-plugin/pom.xml

Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=883070&r1=883069&r2=883070&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/pom.xml Sun Nov 22 12:33:52 2009
@@ -29,7 +29,7 @@
</parent>

<artifactId>maven-shade-plugin</artifactId>
- <version>1.2.2</version>
+ <version>1.2.3-SNAPSHOT</version>
<packaging>maven-plugin</packaging>

<name>Maven Shade Plugin</name>
@@ -40,9 +40,9 @@
</prerequisites>

<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-shade-plugin-1.2.2</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-shade-plugin-1.2.2</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-shade-plugin-1.2.2</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin</url>
</scm>
<issueManagement>
<system>jira</system>

svn commit: r883069 - /maven/plugins/tags/maven-shade-plugin-1.2.2/

2009-11-22T04:33:38Z

Author: bentmann
Date: Sun Nov 22 12:33:38 2009
New Revision: 883069

URL: http://svn.apache.org/viewvc?rev=883069&view=rev
Log:
[maven-scm] copy for tag maven-shade-plugin-1.2.2

Added:
maven/plugins/tags/maven-shade-plugin-1.2.2/
- copied from r883068, maven/plugins/trunk/maven-shade-plugin/

svn commit: r883068 - /maven/plugins/trunk/maven-shade-plugin/pom.xml

2009-11-22T04:32:56Z

Author: bentmann
Date: Sun Nov 22 12:32:55 2009
New Revision: 883068

URL: http://svn.apache.org/viewvc?rev=883068&view=rev
Log:
[maven-release-plugin] prepare release maven-shade-plugin-1.2.2

Modified:
maven/plugins/trunk/maven-shade-plugin/pom.xml

Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=883068&r1=883067&r2=883068&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/pom.xml Sun Nov 22 12:32:55 2009
@@ -19,7 +19,7 @@
under the License.
-->

-<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
@@ -29,7 +29,7 @@
</parent>

<artifactId>maven-shade-plugin</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.2.2</version>
<packaging>maven-plugin</packaging>

<name>Maven Shade Plugin</name>
@@ -40,9 +40,9 @@
</prerequisites>

<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-shade-plugin-1.2.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-shade-plugin-1.2.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-shade-plugin-1.2.2</url>
</scm>
<issueManagement>
<system>jira</system>

svn commit: r883010 - /maven/plugins/branches/maven-site-plugin-3.x/pom.xml

2009-11-21T14:09:30Z

Author: olamy
Date: Sat Nov 21 22:09:29 2009
New Revision: 883010

URL: http://svn.apache.org/viewvc?rev=883010&view=rev
Log:
upgrade parent version

Modified:
maven/plugins/branches/maven-site-plugin-3.x/pom.xml

Modified: maven/plugins/branches/maven-site-plugin-3.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/pom.xml?rev=883010&r1=883009&r2=883010&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/pom.xml Sat Nov 21 22:09:29 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>14</version>
+ <version>16</version>
</parent>

<artifactId>maven-site-plugin</artifactId>

svn commit: r883009 - /maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java

2009-11-21T14:04:34Z

Author: bentmann
Date: Sat Nov 21 22:04:33 2009
New Revision: 883009

URL: http://svn.apache.org/viewvc?rev=883009&view=rev
Log:
o Escaped markup

Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java

Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java?rev=883009&r1=883008&r2=883009&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java Sat Nov 21 22:04:33 2009
@@ -213,8 +213,8 @@
/**
* The name of the shaded artifactId.
*
- * If you like to change the name of the native artifact, you may use the <build><finalName> setting.
- * If this is set to something different than <build><finalName>, no file replacement
+ * If you like to change the name of the native artifact, you may use the <build><finalName> setting.
+ * If this is set to something different than <build><finalName>, no file replacement
* will be performed, even if shadedArtifactAttached is being used.
*
* @parameter expression="${finalName}"

svn commit: r883007 - in /maven/plugins/trunk/maven-shade-plugin/src: it/dep-reduced-pom/ it/dep-reduced-pom/repo/ it/dep-reduced-pom/repo/org/ it/dep-reduced-pom/repo/org/apache/ it/dep-reduced-pom/repo/org/apache/maven/ it/dep-reduced-pom/repo/org/ap...

2009-11-21T13:51:46Z

Author: bentmann
Date: Sat Nov 21 21:51:43 2009
New Revision: 883007

URL: http://svn.apache.org/viewvc?rev=883007&view=rev
Log:
[MSHADE-53] Shade createDependencyReducedPom ignores artifacts with classifier

Added:
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/pom.xml (with props)
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/a/
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/a/0.1/
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/a/0.1/a-0.1.jar (with props)
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/a/0.1/a-0.1.pom
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/b/
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/b/0.2/
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/b/0.2/b-0.2-client.jar (with props)
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/b/0.2/b-0.2.pom
maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/verify.groovy (with props)
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java

Added: maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/pom.xml?rev=883007&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/pom.xml (added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/pom.xml Sat Nov 21 21:51:43 2009
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.shade.drp</groupId>
+ <artifactId>test</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <name>MSHADE-53</name>
+ <description>
+ Test that creation of the dependency reduced POM properly handles dependencies with classifiers.
+ </description>
+
+ <repositories>
+ <repository>
+ <id>shade-it</id>
+ <url>file:///${basedir}/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.shade.drp</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.shade.drp</groupId>
+ <artifactId>b</artifactId>
+ <version>0.2</version>
+ <classifier>client</classifier>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <id>attach-shade</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <shadedArtifactAttached>false</shadedArtifactAttached>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>

Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/a/0.1/a-0.1.jar
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/a/0.1/a-0.1.jar?rev=883007&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/a/0.1/a-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream

Added: maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/a/0.1/a-0.1.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/a/0.1/a-0.1.pom?rev=883007&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/a/0.1/a-0.1.pom (added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/a/0.1/a-0.1.pom Sat Nov 21 21:51:43 2009
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.shade.drp</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+</project>

Added: maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/b/0.2/b-0.2-client.jar
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/b/0.2/b-0.2-client.jar?rev=883007&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/b/0.2/b-0.2-client.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream

Added: maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/b/0.2/b-0.2.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/b/0.2/b-0.2.pom?rev=883007&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/b/0.2/b-0.2.pom (added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/repo/org/apache/maven/its/shade/drp/b/0.2/b-0.2.pom Sat Nov 21 21:51:43 2009
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.shade.drp</groupId>
+ <artifactId>b</artifactId>
+ <version>0.2</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+</project>

Added: maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/verify.groovy?rev=883007&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/verify.groovy (added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/verify.groovy Sat Nov 21 21:51:43 2009
@@ -0,0 +1,8 @@
+File pomFile = new File( basedir, "target/dependency-reduced-pom.xml" );
+assert pomFile.isFile()
+
+def ns = new groovy.xml.Namespace("http://maven.apache.org/POM/4.0.0")
+def pom = new XmlParser().parse( pomFile )
+
+assert pom[ns.modelVersion].size() == 1
+assert pom[ns.dependencies][ns.dependency].size() == 0

Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/dep-reduced-pom/verify.groovy
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java?rev=883007&r1=883006&r2=883007&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java Sat Nov 21 21:51:43 2009
@@ -403,7 +403,7 @@
else if ( !renamed )
{
getLog().info( "Replacing original artifact with shaded artifact." );
- File originalArtifact = project.getArtifact().getFile();;
+ File originalArtifact = project.getArtifact().getFile();
replaceFile( originalArtifact, outputJar );

if ( createSourcesJar )
@@ -721,7 +721,7 @@

dependencies.add( d );

- String id = d.getGroupId() + ":" + d.getArtifactId();
+ String id = getId( d );

if ( artifactsToRemove.contains( id ) )
{
@@ -788,17 +788,26 @@

private String getId( Artifact artifact )
{
- if ( artifact.getClassifier() == null || "jar".equals( artifact.getClassifier() ) )
+ return getId( artifact.getGroupId(), artifact.getArtifactId(), artifact.getClassifier() );
+ }
+
+ private String getId( Dependency dependency )
+ {
+ return getId( dependency.getGroupId(), dependency.getArtifactId(), dependency.getClassifier() );
+ }
+
+ private String getId( String groupId, String artifactId, String classifier )
+ {
+ if ( classifier == null || "jar".equals( classifier ) )
{
- return artifact.getGroupId() + ":" + artifact.getArtifactId();
+ return groupId + ":" + artifactId;
}
else
{
- return artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + artifact.getClassifier();
+ return groupId + ":" + artifactId + ":" + classifier;
}
}

-
public boolean updateExcludesInDeps( MavenProject project,
List dependencies,
List transitiveDeps )

svn commit: r883006 - /maven/plugins/trunk/maven-shade-plugin/pom.xml

2009-11-21T13:49:14Z

Author: bentmann
Date: Sat Nov 21 21:49:13 2009
New Revision: 883006

URL: http://svn.apache.org/viewvc?rev=883006&view=rev
Log:
o Inherited from maven-plugins:16

Modified:
maven/plugins/trunk/maven-shade-plugin/pom.xml

Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=883006&r1=883005&r2=883006&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/pom.xml Sat Nov 21 21:49:13 2009
@@ -25,7 +25,7 @@
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>14</version>
+ <version>16</version>
</parent>

<artifactId>maven-shade-plugin</artifactId>

svn commit: r882990 - /maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java

2009-11-21T12:49:07Z

Author: bentmann
Date: Sat Nov 21 20:49:06 2009
New Revision: 882990

URL: http://svn.apache.org/viewvc?rev=882990&view=rev
Log:
o Optimized code

Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java

Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java?rev=882990&r1=882989&r2=882990&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java Sat Nov 21 20:49:06 2009
@@ -303,21 +303,22 @@
{
String name = (String) object;
String value = name;
+
+ String prefix = "";
+ String suffix = "";
+
+ Matcher m = classPattern.matcher( name );
+ if ( m.matches() )
+ {
+ prefix = m.group( 1 ) + "L";
+ suffix = ";";
+ name = m.group( 2 );
+ }
+
for ( Iterator i = relocators.iterator(); i.hasNext(); )
{
Relocator r = (Relocator) i.next();

- String prefix = "";
- String suffix = "";
-
- Matcher m = classPattern.matcher( name );
- if ( m.matches() )
- {
- prefix = m.group( 1 ) + "L";
- suffix = ";";
- name = m.group( 2 );
- }
-
if ( r.canRelocateClass( name ) )
{
value = prefix + r.relocateClass( name ) + suffix;
@@ -329,8 +330,10 @@
break;
}
}
+
return value;
}
+
return super.mapValue( object );
}

svn commit: r882989 - in /maven/plugins/trunk/maven-shade-plugin: ./ src/it/reloc-enum-ref-from-anno/ src/it/reloc-enum-ref-from-anno/src/ src/it/reloc-enum-ref-from-anno/src/main/ src/it/reloc-enum-ref-from-anno/src/main/java/ src/it/reloc-enum-ref-fr...

2009-11-21T12:45:34Z

Author: bentmann
Date: Sat Nov 21 20:45:33 2009
New Revision: 882989

URL: http://svn.apache.org/viewvc?rev=882989&view=rev
Log:
[MSHADE-64] Relocating does not work, when an annotation references an enum

Added:
maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/
maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/invoker.properties (with props)
maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/pom.xml (with props)
maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/
maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/
maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/
maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/Main.java (with props)
maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/MyAnno.java (with props)
maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/relocated/
maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/relocated/MyEnum.java (with props)
Modified:
maven/plugins/trunk/maven-shade-plugin/pom.xml
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java

Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=882989&r1=882988&r2=882989&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/pom.xml Sat Nov 21 20:45:33 2009
@@ -93,12 +93,12 @@
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm-commons</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
</dependency>
<dependency>
<groupId>jdom</groupId>
@@ -143,7 +143,7 @@
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
<configuration>
<debug>true</debug>
<projectsDirectory>src/it</projectsDirectory>

Added: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/invoker.properties?rev=882989&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/invoker.properties (added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/invoker.properties Sat Nov 21 20:45:33 2009
@@ -0,0 +1 @@
+invoker.java.version = 1.5+

Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/pom.xml?rev=882989&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/pom.xml (added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/pom.xml Sat Nov 21 20:45:33 2009
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.shade.rerfa</groupId>
+ <artifactId>test</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <name>MSHADE-64</name>
+ <description>
+ Test that enum references in annotations are properly relocated.
+ </description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <id>shade</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+ <relocations>
+ <relocation>
+ <pattern>relocated</pattern>
+ <shadedPattern>hidden</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.1.1</version>
+ <executions>
+ <execution>
+ <id>run</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>java</executable>
+ <arguments>
+ <argument>-classpath</argument>
+ <argument>${project.build.directory}/test-1.0.jar</argument>
+ <argument>Main</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>

Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/Main.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/Main.java?rev=882989&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/Main.java (added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/Main.java Sat Nov 21 20:45:33 2009
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+@MyAnno( relocated.MyEnum.YES )
+public class Main
+{
+
+ public static void main( String[] args )
+ throws Exception
+ {
+ MyAnno anno = Main.class.getAnnotation( MyAnno.class );
+ System.out.println( "ANNO: " + anno.value() );
+ if ( !relocated.MyEnum.YES.equals( anno.value() ) )
+ {
+ throw new IllegalStateException( "unexpected value: " + anno.value() );
+ }
+ }
+
+}

Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/Main.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/Main.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/MyAnno.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/MyAnno.java?rev=882989&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/MyAnno.java (added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/MyAnno.java Sat Nov 21 20:45:33 2009
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+@java.lang.annotation.Retention( java.lang.annotation.RetentionPolicy.RUNTIME )
+public @interface MyAnno
+{
+
+ relocated.MyEnum value();
+
+}

Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/MyAnno.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/MyAnno.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/relocated/MyEnum.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/relocated/MyEnum.java?rev=882989&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/relocated/MyEnum.java (added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/relocated/MyEnum.java Sat Nov 21 20:45:33 2009
@@ -0,0 +1,27 @@
+package relocated;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public enum MyEnum
+{
+
+ YES, NO
+
+}

Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/relocated/MyEnum.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/src/main/java/relocated/MyEnum.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision

Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java?rev=882989&r1=882988&r2=882989&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java Sat Nov 21 20:45:33 2009
@@ -337,17 +337,32 @@
public String map( String name )
{
String value = name;
+
+ String prefix = "";
+ String suffix = "";
+
+ Matcher m = classPattern.matcher( name );
+ if ( m.matches() )
+ {
+ prefix = m.group( 1 ) + "L";
+ suffix = ";";
+ name = m.group( 2 );
+ }
+
for ( Iterator i = relocators.iterator(); i.hasNext(); )
{
Relocator r = (Relocator) i.next();

if ( r.canRelocatePath( name ) )
{
- value = r.relocatePath( name );
+ value = prefix + r.relocatePath( name ) + suffix;
break;
}
}
+
return value;
}
+
}
+
}

svn commit: r882889 - in /maven/enforcer/trunk/enforcer-rules/src: main/java/org/apache/maven/plugins/enforcer/ test/java/org/apache/maven/plugins/enforcer/ test/resources/requireNoRepositories/snapshot-plugin-repositories/ test/resources/requireNoRepo...

2009-11-21T04:40:37Z

Author: stephenc
Date: Sat Nov 21 12:40:35 2009
New Revision: 882889

URL: http://svn.apache.org/viewvc?rev=882889&view=rev
Log:
[MENFORCER-87] Adding two new parameters to requireNoRepositories which can allow the permission of repositories which are only enabled for snapshots

These two parameters default to false.

In actuality, when true they just ban repositories which are enabled for releases. So you could have a repository which was enabled for nothing, and that would be OK. I see that as being no harm

Added:
maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-plugin-repositories/
- copied from r882884, maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/with-plugin-repositories/
maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-repositories/
- copied from r882884, maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/with-repositories/
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireNoRepositories.java
maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-plugin-repositories/child/pom.xml
maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-plugin-repositories/pom.xml
maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-repositories/child/pom.xml
maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-repositories/pom.xml

Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java?rev=882889&r1=882888&r2=882889&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java Sat Nov 21 12:40:35 2009
@@ -19,13 +19,6 @@
* under the License.
*/

-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
@@ -38,9 +31,16 @@
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;

+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
/**
* This rule checks that this pom or its parents don't define a repository.
- *
+ *
* @author <a href="mailto:brianf@...">Brian Fox</a>
*/
public class RequireNoRepositories
@@ -66,6 +66,16 @@
*/
public List allowedPluginRepositories = Collections.EMPTY_LIST;

+ /**
+ * Whether to allow repositories which only resolve snapshots. By default they are banned.
+ */
+ public boolean allowSnapshotRepositories = false;
+
+ /**
+ * Whether to allow plugin repositories which only resolve snapshots. By default they are banned.
+ */
+ public boolean allowSnapshotPluginRepositories = false;
+
/*
* (non-Javadoc)
* @see
@@ -97,12 +107,14 @@
List repos = model.getRepositories();
if ( repos != null && !repos.isEmpty() )
{
- List bannedRepos = findBannedRepositories( repos, allowedRepositories );
+ List bannedRepos =
+ findBannedRepositories( repos, allowedRepositories, allowSnapshotRepositories );
if ( !bannedRepos.isEmpty() )
{
badModels.add( model );
- newMsg.append( model.getGroupId() + ":" + model.getArtifactId() + " version:"
- + model.getVersion() + " has repositories " + bannedRepos );
+ newMsg.append(
+ model.getGroupId() + ":" + model.getArtifactId() + " version:" + model.getVersion()
+ + " has repositories " + bannedRepos );
}
}
}
@@ -111,12 +123,14 @@
List repos = model.getPluginRepositories();
if ( repos != null && !repos.isEmpty() )
{
- List bannedRepos = findBannedRepositories( repos, allowedPluginRepositories );
+ List bannedRepos =
+ findBannedRepositories( repos, allowedPluginRepositories, allowSnapshotPluginRepositories );
if ( !bannedRepos.isEmpty() )
{
badModels.add( model );
- newMsg.append( model.getGroupId() + ":" + model.getArtifactId() + " version:"
- + model.getVersion() + " has plugin repositories " + bannedRepos );
+ newMsg.append(
+ model.getGroupId() + ":" + model.getArtifactId() + " version:" + model.getVersion()
+ + " has plugin repositories " + bannedRepos );
}
}
}
@@ -157,7 +171,7 @@
}
}

- private static List findBannedRepositories( List repos, List allowedRepos )
+ private static List findBannedRepositories( List repos, List allowedRepos, boolean allowSnapshots )
{
List bannedRepos = new ArrayList( allowedRepos.size() );
for ( Iterator i = repos.iterator(); i.hasNext(); )
@@ -165,7 +179,14 @@
Repository r = (Repository) i.next();
if ( !allowedRepos.contains( r.getId() ) )
{
- bannedRepos.add( r.getId() );
+ if ( !allowSnapshots || r.getReleases().isEnabled() )
+ {
+ // if we are not allowing snapshots and this repo is enabled for releases
+ // it is banned. We don't care whether it is enabled for snapshots
+ // if you define a repo and don't enable it for anything, then we have nothing
+ // to worry about
+ bannedRepos.add( r.getId() );
+ }
}
}
return bannedRepos;

Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireNoRepositories.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireNoRepositories.java?rev=882889&r1=882888&r2=882889&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireNoRepositories.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireNoRepositories.java Sat Nov 21 12:40:35 2009
@@ -184,6 +184,66 @@
rule.execute( helper );
}

+ public void testReposNotAllowedWithSnapshotRepositories()
+ throws EnforcerRuleException
+ {
+ rule.allowSnapshotRepositories = true;
+
+ project.setArtifactId( "snapshot-plugin-repositories-child" );
+ project.setBaseDir( getTestFile( "target/test-classes/requireNoRepositories/snapshot-plugin-repositories/child" ) );
+
+ try
+ {
+ rule.execute( helper );
+ fail( "Should have exception" );
+ }
+ catch ( EnforcerRuleException e )
+ {
+ assertTrue( true );
+ }
+ }
+
+ public void testReposAllowedWithSnapshotRepositories()
+ throws EnforcerRuleException
+ {
+ rule.allowSnapshotRepositories = true;
+
+ project.setArtifactId( "snapshot-repositories-child" );
+ project.setBaseDir( getTestFile( "target/test-classes/requireNoRepositories/snapshot-repositories/child" ) );
+
+ rule.execute( helper );
+ }
+
+ public void testPluginReposNotAllowedWithSnapshotRepositories()
+ throws EnforcerRuleException
+ {
+ rule.allowSnapshotPluginRepositories = true;
+
+ project.setArtifactId( "snapshot-repositories-child" );
+ project.setBaseDir( getTestFile( "target/test-classes/requireNoRepositories/snapshot-repositories/child" ) );
+
+ try
+ {
+ rule.execute( helper );
+ fail( "Should have exception" );
+ }
+ catch ( EnforcerRuleException e )
+ {
+ assertTrue( true );
+ }
+ }
+
+ public void testPluginReposAllowedWithSnapshotPluginRepositories()
+ throws EnforcerRuleException
+ {
+ rule.allowSnapshotPluginRepositories = true;
+
+ project.setArtifactId( "snapshot-plugin-repositories-child" );
+ project.setBaseDir( getTestFile( "target/test-classes/requireNoRepositories/snapshot-plugin-repositories/child" ) );
+
+ rule.execute( helper );
+ }
+
/**
* Test id.
*/

Modified: maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-plugin-repositories/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-plugin-repositories/child/pom.xml?rev=882889&r1=882884&r2=882889&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-plugin-repositories/child/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-plugin-repositories/child/pom.xml Sat Nov 21 12:40:35 2009
@@ -2,8 +2,8 @@
<parent>
<groupId>org.apache.maven.plugins.enforcer.test
</groupId>
- <artifactId>with-plugin-repositories</artifactId>
+ <artifactId>snapshot-plugin-repositories</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>with-plugin-repositories-child</artifactId>
+ <artifactId>snapshot-plugin-repositories-child</artifactId>
</project>
\ No newline at end of file

Modified: maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-plugin-repositories/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-plugin-repositories/pom.xml?rev=882889&r1=882884&r2=882889&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-plugin-repositories/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-plugin-repositories/pom.xml Sat Nov 21 12:40:35 2009
@@ -1,11 +1,17 @@
<project>
<groupId>org.apache.maven.plugins.enforcer.test</groupId>
- <artifactId>with-plugin-repositories</artifactId>
+ <artifactId>snapshot-plugin-repositories</artifactId>
<version>1.0-SNAPSHOT</version>
<pluginRepositories>
<pluginRepository>
<id>repo</id>
<url>http://example.com/repo</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
</pluginRepository>
</pluginRepositories>
</project>
\ No newline at end of file

Modified: maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-repositories/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-repositories/child/pom.xml?rev=882889&r1=882884&r2=882889&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-repositories/child/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-repositories/child/pom.xml Sat Nov 21 12:40:35 2009
@@ -2,8 +2,8 @@
<parent>
<groupId>org.apache.maven.plugins.enforcer.test
</groupId>
- <artifactId>with-repositories</artifactId>
+ <artifactId>snapshot-repositories</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>with-repositories-child</artifactId>
+ <artifactId>snapshot-repositories-child</artifactId>
</project>
\ No newline at end of file

Modified: maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-repositories/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-repositories/pom.xml?rev=882889&r1=882884&r2=882889&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-repositories/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/resources/requireNoRepositories/snapshot-repositories/pom.xml Sat Nov 21 12:40:35 2009
@@ -1,11 +1,17 @@
<project>
<groupId>org.apache.maven.plugins.enforcer.test</groupId>
- <artifactId>with-repositories</artifactId>
+ <artifactId>snapshot-repositories</artifactId>
<version>1.0-SNAPSHOT</version>
<repositories>
<repository>
<id>repo</id>
<url>http://example.com/repo</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
</repository>
</repositories>
</project>
\ No newline at end of file

svn commit: r882873 - in /maven/components/branches/maven-2.0.11-RC: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-monitor/ maven-plugin-api/ maven-plugin-descripto...

2009-11-21T02:11:03Z

Author: brett
Date: Sat Nov 21 10:10:51 2009
New Revision: 882873

URL: http://svn.apache.org/viewvc?rev=882873&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/components/branches/maven-2.0.11-RC/apache-maven/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-artifact-manager/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-artifact-test/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-artifact/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-error-diagnostics/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-model/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-monitor/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-plugin-api/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-plugin-descriptor/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-plugin-parameter-documenter/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-plugin-registry/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-profile/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-project/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-reporting/maven-reporting-api/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-reporting/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-repository-metadata/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-ant/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-beanshell/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-script/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-settings/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-toolchain/pom.xml
maven/components/branches/maven-2.0.11-RC/pom.xml

Modified: maven/components/branches/maven-2.0.11-RC/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/apache-maven/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/apache-maven/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/apache-maven/pom.xml Sat Nov 21 10:10:51 2009
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>apache-maven</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-artifact-manager/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-artifact-manager/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-artifact-manager/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-artifact-manager/pom.xml Sat Nov 21 10:10:51 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-artifact-manager</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-artifact-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-artifact-test/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-artifact-test/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-artifact-test/pom.xml Sat Nov 21 10:10:51 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-artifact-test</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-artifact/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-artifact/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-artifact/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-artifact/pom.xml Sat Nov 21 10:10:51 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-artifact</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml Sat Nov 21 10:10:51 2009
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-core</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-error-diagnostics/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-error-diagnostics/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-error-diagnostics/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-error-diagnostics/pom.xml Sat Nov 21 10:10:51 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-error-diagnostics</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-model/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-model/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-model/pom.xml Sat Nov 21 10:10:51 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-model</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-monitor/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-monitor/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-monitor/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-monitor/pom.xml Sat Nov 21 10:10:51 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-monitor</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-plugin-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-plugin-api/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-plugin-api/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-plugin-api/pom.xml Sat Nov 21 10:10:51 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-plugin-api</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-plugin-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-plugin-descriptor/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-plugin-descriptor/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-plugin-descriptor/pom.xml Sat Nov 21 10:10:51 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-plugin-descriptor</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-plugin-parameter-documenter/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-plugin-parameter-documenter/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-plugin-parameter-documenter/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-plugin-parameter-documenter/pom.xml Sat Nov 21 10:10:51 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-plugin-parameter-documenter</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-plugin-registry/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-plugin-registry/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-plugin-registry/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-plugin-registry/pom.xml Sat Nov 21 10:10:51 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-plugin-registry</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-profile/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-profile/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-profile/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-profile/pom.xml Sat Nov 21 10:10:51 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-profile</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-project/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-project/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-project/pom.xml Sat Nov 21 10:10:51 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-project</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-reporting/maven-reporting-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-reporting/maven-reporting-api/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-reporting/maven-reporting-api/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-reporting/maven-reporting-api/pom.xml Sat Nov 21 10:10:51 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-reporting-api</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-reporting/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-reporting/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-reporting/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-reporting/pom.xml Sat Nov 21 10:10:51 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<groupId>org.apache.maven.reporting</groupId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-repository-metadata/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-repository-metadata/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-repository-metadata/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-repository-metadata/pom.xml Sat Nov 21 10:10:51 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-repository-metadata</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-ant/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-ant/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-ant/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-ant/pom.xml Sat Nov 21 10:10:51 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-script</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-script-ant</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-beanshell/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-beanshell/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-beanshell/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-beanshell/pom.xml Sat Nov 21 10:10:51 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-script</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-script-beanshell</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-script/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-script/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-script/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-script/pom.xml Sat Nov 21 10:10:51 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-script</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-settings/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-settings/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-settings/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-settings/pom.xml Sat Nov 21 10:10:51 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-settings</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-toolchain/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-toolchain/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-toolchain/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-toolchain/pom.xml Sat Nov 21 10:10:51 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-toolchain</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/pom.xml?rev=882873&r1=882872&r2=882873&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/pom.xml Sat Nov 21 10:10:51 2009
@@ -27,7 +27,7 @@
</parent>

<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Maven</name>
@@ -115,9 +115,9 @@
</mailingLists>

<scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.11-RC1</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.11-RC1</developerConnection>
- <url>https://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.11-RC1</url>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.11-RC</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.11-RC</developerConnection>
+ <url>https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.11-RC</url>
</scm>

<build>

svn commit: r882872 - /maven/components/tags/maven-2.0.11-RC1/

2009-11-21T02:09:48Z

Author: brett
Date: Sat Nov 21 10:09:46 2009
New Revision: 882872

URL: http://svn.apache.org/viewvc?rev=882872&view=rev
Log:
[maven-scm] copy for tag maven-2.0.11-RC1

Added:
maven/components/tags/maven-2.0.11-RC1/ (props changed)
- copied from r882871, maven/components/branches/maven-2.0.11-RC/

Propchange: maven/components/tags/maven-2.0.11-RC1/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Nov 21 10:09:46 2009
@@ -0,0 +1,19 @@
+bootstrap
+release.properties
+maven.log
+target
+.classpath
+.project
+bootstrap.repo
+maven-component.i*
+.settings
+mboot.jar
+dummy
+build.ajproperties
+.generated.lst
+*.iml
+*.iws
+*.ipr
+log.txt
+setup_env.sh
+target-eclipse

Propchange: maven/components/tags/maven-2.0.11-RC1/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Nov 21 10:09:46 2009
@@ -0,0 +1,4 @@
+/maven/components/branches/maven-2.0.10-RC:708790-728809,728834
+/maven/components/branches/maven-2.1.0-RC:753089
+/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,737683,738723,738753,739385,741507,741518,741870,742819,744645,745836,747468,747683,747799,748102,748111,748146,748815,749997,763796,766523,768995,769010-769011
+/maven/components/trunk:720001,721902,726845,729292

Propchange: maven/components/tags/maven-2.0.11-RC1/
------------------------------------------------------------------------------
--- svnmerge-integrated (added)
+++ svnmerge-integrated Sat Nov 21 10:09:46 2009
@@ -0,0 +1 @@
+/maven/components/trunk:1-368287,368989,369304,369305,370406,371079,372056,372061,379247,379285,379288,379372,379516,379549,379572,379587

svn commit: r882871 - in /maven/components/branches/maven-2.0.11-RC: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-monitor/ maven-plugin-api/ maven-plugin-descripto...

2009-11-21T02:09:32Z

Author: brett
Date: Sat Nov 21 10:09:21 2009
New Revision: 882871

URL: http://svn.apache.org/viewvc?rev=882871&view=rev
Log:
[maven-release-plugin] prepare release maven-2.0.11-RC1

Modified:
maven/components/branches/maven-2.0.11-RC/apache-maven/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-artifact-manager/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-artifact-test/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-artifact/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-error-diagnostics/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-model/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-monitor/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-plugin-api/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-plugin-descriptor/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-plugin-parameter-documenter/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-plugin-registry/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-profile/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-project/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-reporting/maven-reporting-api/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-reporting/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-repository-metadata/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-ant/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-beanshell/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-script/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-settings/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-toolchain/pom.xml
maven/components/branches/maven-2.0.11-RC/pom.xml

Modified: maven/components/branches/maven-2.0.11-RC/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/apache-maven/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/apache-maven/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/apache-maven/pom.xml Sat Nov 21 10:09:21 2009
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>apache-maven</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-artifact-manager/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-artifact-manager/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-artifact-manager/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-artifact-manager/pom.xml Sat Nov 21 10:09:21 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>maven-artifact-manager</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-artifact-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-artifact-test/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-artifact-test/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-artifact-test/pom.xml Sat Nov 21 10:09:21 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>maven-artifact-test</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-artifact/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-artifact/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-artifact/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-artifact/pom.xml Sat Nov 21 10:09:21 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>maven-artifact</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml Sat Nov 21 10:09:21 2009
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>maven-core</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-error-diagnostics/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-error-diagnostics/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-error-diagnostics/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-error-diagnostics/pom.xml Sat Nov 21 10:09:21 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>maven-error-diagnostics</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-model/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-model/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-model/pom.xml Sat Nov 21 10:09:21 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>maven-model</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-monitor/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-monitor/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-monitor/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-monitor/pom.xml Sat Nov 21 10:09:21 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>maven-monitor</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-plugin-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-plugin-api/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-plugin-api/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-plugin-api/pom.xml Sat Nov 21 10:09:21 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>maven-plugin-api</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-plugin-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-plugin-descriptor/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-plugin-descriptor/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-plugin-descriptor/pom.xml Sat Nov 21 10:09:21 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>maven-plugin-descriptor</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-plugin-parameter-documenter/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-plugin-parameter-documenter/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-plugin-parameter-documenter/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-plugin-parameter-documenter/pom.xml Sat Nov 21 10:09:21 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>maven-plugin-parameter-documenter</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-plugin-registry/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-plugin-registry/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-plugin-registry/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-plugin-registry/pom.xml Sat Nov 21 10:09:21 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>maven-plugin-registry</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-profile/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-profile/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-profile/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-profile/pom.xml Sat Nov 21 10:09:21 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>maven-profile</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-project/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-project/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-project/pom.xml Sat Nov 21 10:09:21 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>maven-project</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-reporting/maven-reporting-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-reporting/maven-reporting-api/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-reporting/maven-reporting-api/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-reporting/maven-reporting-api/pom.xml Sat Nov 21 10:09:21 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>maven-reporting-api</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-reporting/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-reporting/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-reporting/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-reporting/pom.xml Sat Nov 21 10:09:21 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<groupId>org.apache.maven.reporting</groupId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-repository-metadata/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-repository-metadata/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-repository-metadata/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-repository-metadata/pom.xml Sat Nov 21 10:09:21 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>maven-repository-metadata</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-ant/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-ant/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-ant/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-ant/pom.xml Sat Nov 21 10:09:21 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-script</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>maven-script-ant</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-beanshell/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-beanshell/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-beanshell/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-beanshell/pom.xml Sat Nov 21 10:09:21 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-script</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>maven-script-beanshell</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-script/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-script/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-script/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-script/pom.xml Sat Nov 21 10:09:21 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>maven-script</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-settings/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-settings/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-settings/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-settings/pom.xml Sat Nov 21 10:09:21 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>maven-settings</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-toolchain/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-toolchain/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-toolchain/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-toolchain/pom.xml Sat Nov 21 10:09:21 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
</parent>

<artifactId>maven-toolchain</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/pom.xml?rev=882871&r1=882870&r2=882871&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/pom.xml Sat Nov 21 10:09:21 2009
@@ -27,7 +27,7 @@
</parent>

<artifactId>maven</artifactId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC1</version>
<packaging>pom</packaging>

<name>Maven</name>
@@ -115,9 +115,9 @@
</mailingLists>

<scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.11-RC</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.11-RC</developerConnection>
- <url>https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.11-RC</url>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.11-RC1</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.11-RC1</developerConnection>
+ <url>https://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.11-RC1</url>
</scm>

<build>
@@ -221,7 +221,7 @@
</modules>

<properties>
- <mavenVersion>2.0.11-RC1-SNAPSHOT</mavenVersion>
+ <mavenVersion>2.0.11-RC1</mavenVersion>
<wagonVersion>1.0-beta-2</wagonVersion>
</properties>

svn commit: r882869 - /maven/components/tags/maven-2.0.11-RC1/

2009-11-21T02:01:13Z

Author: brett
Date: Sat Nov 21 10:01:13 2009
New Revision: 882869

URL: http://svn.apache.org/viewvc?rev=882869&view=rev
Log:
remove tag

Removed:
maven/components/tags/maven-2.0.11-RC1/

svn commit: r882868 - /maven/components/branches/maven-2.0.11-RC/pom.xml

2009-11-21T02:00:30Z

Author: brett
Date: Sat Nov 21 10:00:29 2009
New Revision: 882868

URL: http://svn.apache.org/viewvc?rev=882868&view=rev
Log:
don't generate the site - causes problems with the version not being installed and we don't need it on the RCs anyway.

Modified:
maven/components/branches/maven-2.0.11-RC/pom.xml

Modified: maven/components/branches/maven-2.0.11-RC/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/pom.xml?rev=882868&r1=882867&r2=882868&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/pom.xml Sat Nov 21 10:00:29 2009
@@ -137,8 +137,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <goals>clean deploy site-deploy</goals>
- <arguments>-Preporting-aggregate,apache-release</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>

svn commit: r882867 - in /maven/components/branches/maven-2.0.11-RC: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-monitor/ maven-plugin-api/ maven-plugin-descripto...

2009-11-21T01:59:01Z

Author: brett
Date: Sat Nov 21 09:58:56 2009
New Revision: 882867

URL: http://svn.apache.org/viewvc?rev=882867&view=rev
Log:
revert bad release

Modified:
maven/components/branches/maven-2.0.11-RC/apache-maven/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-artifact-manager/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-artifact-test/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-artifact/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-error-diagnostics/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-model/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-monitor/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-plugin-api/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-plugin-descriptor/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-plugin-parameter-documenter/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-plugin-registry/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-profile/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-project/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-reporting/maven-reporting-api/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-reporting/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-repository-metadata/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-ant/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-beanshell/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-script/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-settings/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-toolchain/pom.xml
maven/components/branches/maven-2.0.11-RC/pom.xml

Modified: maven/components/branches/maven-2.0.11-RC/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/apache-maven/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/apache-maven/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/apache-maven/pom.xml Sat Nov 21 09:58:56 2009
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>apache-maven</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-artifact-manager/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-artifact-manager/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-artifact-manager/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-artifact-manager/pom.xml Sat Nov 21 09:58:56 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>maven-artifact-manager</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-artifact-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-artifact-test/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-artifact-test/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-artifact-test/pom.xml Sat Nov 21 09:58:56 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>maven-artifact-test</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-artifact/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-artifact/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-artifact/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-artifact/pom.xml Sat Nov 21 09:58:56 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>maven-artifact</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml Sat Nov 21 09:58:56 2009
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>maven-core</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-error-diagnostics/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-error-diagnostics/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-error-diagnostics/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-error-diagnostics/pom.xml Sat Nov 21 09:58:56 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>maven-error-diagnostics</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-model/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-model/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-model/pom.xml Sat Nov 21 09:58:56 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>maven-model</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-monitor/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-monitor/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-monitor/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-monitor/pom.xml Sat Nov 21 09:58:56 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>maven-monitor</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-plugin-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-plugin-api/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-plugin-api/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-plugin-api/pom.xml Sat Nov 21 09:58:56 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>maven-plugin-api</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-plugin-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-plugin-descriptor/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-plugin-descriptor/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-plugin-descriptor/pom.xml Sat Nov 21 09:58:56 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>maven-plugin-descriptor</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-plugin-parameter-documenter/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-plugin-parameter-documenter/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-plugin-parameter-documenter/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-plugin-parameter-documenter/pom.xml Sat Nov 21 09:58:56 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>maven-plugin-parameter-documenter</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-plugin-registry/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-plugin-registry/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-plugin-registry/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-plugin-registry/pom.xml Sat Nov 21 09:58:56 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>maven-plugin-registry</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-profile/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-profile/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-profile/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-profile/pom.xml Sat Nov 21 09:58:56 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>maven-profile</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-project/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-project/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-project/pom.xml Sat Nov 21 09:58:56 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>maven-project</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-reporting/maven-reporting-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-reporting/maven-reporting-api/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-reporting/maven-reporting-api/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-reporting/maven-reporting-api/pom.xml Sat Nov 21 09:58:56 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>maven-reporting-api</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-reporting/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-reporting/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-reporting/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-reporting/pom.xml Sat Nov 21 09:58:56 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<groupId>org.apache.maven.reporting</groupId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-repository-metadata/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-repository-metadata/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-repository-metadata/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-repository-metadata/pom.xml Sat Nov 21 09:58:56 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>maven-repository-metadata</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-ant/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-ant/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-ant/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-ant/pom.xml Sat Nov 21 09:58:56 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-script</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>maven-script-ant</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-beanshell/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-beanshell/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-beanshell/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-beanshell/pom.xml Sat Nov 21 09:58:56 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-script</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>maven-script-beanshell</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-script/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-script/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-script/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-script/pom.xml Sat Nov 21 09:58:56 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>maven-script</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-settings/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-settings/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-settings/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-settings/pom.xml Sat Nov 21 09:58:56 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>maven-settings</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-toolchain/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-toolchain/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-toolchain/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-toolchain/pom.xml Sat Nov 21 09:58:56 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
</parent>

<artifactId>maven-toolchain</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/pom.xml?rev=882867&r1=882866&r2=882867&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/pom.xml Sat Nov 21 09:58:56 2009
@@ -27,7 +27,7 @@
</parent>

<artifactId>maven</artifactId>
- <version>2.0.11-RC2-SNAPSHOT</version>
+ <version>2.0.11-RC1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Maven</name>
@@ -223,7 +223,7 @@
</modules>

<properties>
- <mavenVersion>2.0.11-RC2-SNAPSHOT</mavenVersion>
+ <mavenVersion>2.0.11-RC1-SNAPSHOT</mavenVersion>
<wagonVersion>1.0-beta-2</wagonVersion>
</properties>

svn commit: r882803 - in /maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output: FullFileNameMapping.java StandardFileNameMapping.java

2009-11-20T16:15:58Z

Author: carlos
Date: Sat Nov 21 00:15:57 2009
New Revision: 882803

URL: http://svn.apache.org/viewvc?rev=882803&view=rev
Log:
Fix couple of typos in javadoc

Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FullFileNameMapping.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/StandardFileNameMapping.java

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FullFileNameMapping.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FullFileNameMapping.java?rev=882803&r1=882802&r2=882803&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FullFileNameMapping.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FullFileNameMapping.java Sat Nov 21 00:15:57 2009
@@ -23,7 +23,7 @@

/**
* A full file name mapping, useful if artifacts might have the same
- * name accross groups.
+ * name across groups.
*
* @author <a href="snicoll@...">Stephane Nicoll</a>
* @version $Id$

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/StandardFileNameMapping.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/StandardFileNameMapping.java?rev=882803&r1=882802&r2=882803&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/StandardFileNameMapping.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/StandardFileNameMapping.java Sat Nov 21 00:15:57 2009
@@ -22,7 +22,7 @@
import org.apache.maven.artifact.Artifact;

/**
- * The standard fine name mapping. It returns the name
+ * The standard file name mapping. It returns the name
* of the file in the local repository.
*
* @author <a href="snicoll@...">Stephane Nicoll</a>

svn commit: r882802 - /maven/components/branches/maven-2.0.11-RC/maven-core-it-runner/pom.xml

2009-11-20T16:14:56Z

Author: brett
Date: Sat Nov 21 00:14:55 2009
New Revision: 882802

URL: http://svn.apache.org/viewvc?rev=882802&view=rev
Log:
update version

Modified:
maven/components/branches/maven-2.0.11-RC/maven-core-it-runner/pom.xml

Modified: maven/components/branches/maven-2.0.11-RC/maven-core-it-runner/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-core-it-runner/pom.xml?rev=882802&r1=882801&r2=882802&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-core-it-runner/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-core-it-runner/pom.xml Sat Nov 21 00:14:55 2009
@@ -22,7 +22,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.0.11-RC1-SNAPSHOT</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>
<artifactId>maven-core-it-runner</artifactId>

svn commit: r882801 - in /maven/components/branches/maven-2.0.11-RC: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-monitor/ maven-plugin-api/ maven-plugin-descripto...

2009-11-20T16:11:54Z

Author: brett
Date: Sat Nov 21 00:11:50 2009
New Revision: 882801

URL: http://svn.apache.org/viewvc?rev=882801&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/components/branches/maven-2.0.11-RC/apache-maven/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-artifact-manager/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-artifact-test/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-artifact/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-error-diagnostics/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-model/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-monitor/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-plugin-api/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-plugin-descriptor/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-plugin-parameter-documenter/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-plugin-registry/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-profile/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-project/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-reporting/maven-reporting-api/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-reporting/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-repository-metadata/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-ant/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-beanshell/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-script/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-settings/pom.xml
maven/components/branches/maven-2.0.11-RC/maven-toolchain/pom.xml
maven/components/branches/maven-2.0.11-RC/pom.xml

Modified: maven/components/branches/maven-2.0.11-RC/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/apache-maven/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/apache-maven/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/apache-maven/pom.xml Sat Nov 21 00:11:50 2009
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>apache-maven</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-artifact-manager/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-artifact-manager/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-artifact-manager/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-artifact-manager/pom.xml Sat Nov 21 00:11:50 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-artifact-manager</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-artifact-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-artifact-test/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-artifact-test/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-artifact-test/pom.xml Sat Nov 21 00:11:50 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-artifact-test</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-artifact/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-artifact/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-artifact/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-artifact/pom.xml Sat Nov 21 00:11:50 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-artifact</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-core/pom.xml Sat Nov 21 00:11:50 2009
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-core</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-error-diagnostics/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-error-diagnostics/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-error-diagnostics/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-error-diagnostics/pom.xml Sat Nov 21 00:11:50 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-error-diagnostics</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-model/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-model/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-model/pom.xml Sat Nov 21 00:11:50 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-model</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-monitor/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-monitor/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-monitor/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-monitor/pom.xml Sat Nov 21 00:11:50 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-monitor</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-plugin-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-plugin-api/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-plugin-api/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-plugin-api/pom.xml Sat Nov 21 00:11:50 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-plugin-api</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-plugin-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-plugin-descriptor/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-plugin-descriptor/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-plugin-descriptor/pom.xml Sat Nov 21 00:11:50 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-plugin-descriptor</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-plugin-parameter-documenter/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-plugin-parameter-documenter/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-plugin-parameter-documenter/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-plugin-parameter-documenter/pom.xml Sat Nov 21 00:11:50 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-plugin-parameter-documenter</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-plugin-registry/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-plugin-registry/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-plugin-registry/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-plugin-registry/pom.xml Sat Nov 21 00:11:50 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-plugin-registry</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-profile/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-profile/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-profile/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-profile/pom.xml Sat Nov 21 00:11:50 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-profile</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-project/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-project/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-project/pom.xml Sat Nov 21 00:11:50 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-project</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-reporting/maven-reporting-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-reporting/maven-reporting-api/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-reporting/maven-reporting-api/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-reporting/maven-reporting-api/pom.xml Sat Nov 21 00:11:50 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-reporting-api</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-reporting/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-reporting/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-reporting/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-reporting/pom.xml Sat Nov 21 00:11:50 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<groupId>org.apache.maven.reporting</groupId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-repository-metadata/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-repository-metadata/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-repository-metadata/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-repository-metadata/pom.xml Sat Nov 21 00:11:50 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-repository-metadata</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-ant/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-ant/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-ant/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-ant/pom.xml Sat Nov 21 00:11:50 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-script</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-script-ant</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-beanshell/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-beanshell/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-beanshell/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-script/maven-script-beanshell/pom.xml Sat Nov 21 00:11:50 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-script</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-script-beanshell</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-script/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-script/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-script/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-script/pom.xml Sat Nov 21 00:11:50 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-script</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-settings/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-settings/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-settings/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-settings/pom.xml Sat Nov 21 00:11:50 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-settings</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/maven-toolchain/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/maven-toolchain/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/maven-toolchain/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/maven-toolchain/pom.xml Sat Nov 21 00:11:50 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
</parent>

<artifactId>maven-toolchain</artifactId>

Modified: maven/components/branches/maven-2.0.11-RC/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.11-RC/pom.xml?rev=882801&r1=882800&r2=882801&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.11-RC/pom.xml (original)
+++ maven/components/branches/maven-2.0.11-RC/pom.xml Sat Nov 21 00:11:50 2009
@@ -27,7 +27,7 @@
</parent>

<artifactId>maven</artifactId>
- <version>2.0.11-RC1</version>
+ <version>2.0.11-RC2-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Maven</name>
@@ -115,9 +115,9 @@
</mailingLists>

<scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.11-RC1</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.11-RC1</developerConnection>
- <url>https://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.11-RC1</url>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.11-RC</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.11-RC</developerConnection>
+ <url>https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.11-RC</url>
</scm>

<build>
@@ -223,7 +223,7 @@
</modules>

<properties>
- <mavenVersion>2.0.11-RC1</mavenVersion>
+ <mavenVersion>2.0.11-RC2-SNAPSHOT</mavenVersion>
<wagonVersion>1.0-beta-2</wagonVersion>
</properties>