brett 2004/03/22 17:45:57 Modified: . Tag: MAVEN-1_0-BRANCH project.xml xdocs Tag: MAVEN-1_0-BRANCH changes.xml Log: [maven-scm-plugin] prepare release 1.0-rc2 Revision Changes Path No revision No revision 1.317.4.16 +14 -17 maven/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/maven/project.xml,v retrieving revision 1.317.4.15 retrieving revision 1.317.4.16 diff -u -r1.317.4.15 -r1.317.4.16 --- project.xml 22 Mar 2004 02:29:56 -0000 1.317.4.15 +++ project.xml 23 Mar 2004 01:45:57 -0000 1.317.4.16 @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> + <!-- /* * Copyright 2001-2004 The Apache Software Foundation. @@ -17,12 +18,11 @@ */ --> - <project> <pomVersion>3</pomVersion> <id>maven</id> <name>Maven</name> - <currentVersion>1.0-rc2-SNAPSHOT</currentVersion> + <currentVersion>1.0-rc2</currentVersion> <organization> <name>Apache Software Foundation</name> <url>http://www.apache.org/</url> @@ -108,8 +108,13 @@ <name>1.0-rc2-SNAPSHOT</name> <tag>HEAD</tag> </version> + <version> + <id>1.0-rc2</id> + <name>1.0-rc2</name> + <tag>MAVEN_1_0_RC2</tag> + </version> </versions> - <branches></branches> + <branches/> <mailingLists> <mailingList> <name>Maven User List</name> @@ -247,10 +252,10 @@ <timezone>+1</timezone> </developer> <developer> - <name>Stéphane Mor</name> + <name>Stéphane Mor</name> <id>smor</id> <email>[EMAIL PROTECTED]</email> - <organization></organization> + <organization/> <roles> <role>Java Developer</role> </roles> @@ -259,7 +264,7 @@ <name>Kasper Nielsen</name> <id>knielsen</id> <email>[EMAIL PROTECTED]</email> - <organization></organization> + <organization/> <roles> <role>Developer</role> </roles> @@ -401,7 +406,6 @@ <organization>AJSoft Limited</organization> </contributor> </contributors> - <licenses> <license> <name>The Apache Software License, Version 2.0</name> @@ -409,11 +413,9 @@ <distribution>repo</distribution> </license> </licenses> - <!-- Need to mark these as compile-time/run-time --> <dependencies> - <!-- leave dom4j as the first entry or the tests fail --> <dependency> @@ -585,6 +587,7 @@ ant-xalan1.jar ant-xslp.jar --> + <dependency> <id>commons-betwixt</id> <version>1.0-beta-1.20030111.103454</version> @@ -595,7 +598,6 @@ <version>1.4.1</version> <url>http://jakarta.apache.org/commons/digester.html</url> </dependency> - <dependency> <id>commons-jelly</id> <version>20030902.160215</version> @@ -639,7 +641,6 @@ <version>20040114.081319</version> <url>http://werkz.codehaus.org/</url> </dependency> - <!-- Runtime dependencies --> <dependency> @@ -707,13 +708,11 @@ <endorsed>true</endorsed> </properties> </dependency> - <dependency> <groupId>plexus</groupId> <artifactId>plexus</artifactId> <version>0.6</version> </dependency> - </dependencies> <build> <nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress> @@ -724,6 +723,7 @@ <include>**/*Test.java</include> </includes> <!-- TODO - fix or remove --> + <excludes> <exclude>**/RepositoryTest.java</exclude> <exclude>**/JAXPTest.java</exclude> @@ -757,7 +757,6 @@ </resource> </resources> </build> - <reports> <!-- | @@ -786,12 +785,10 @@ <report>maven-faq-plugin</report> <report>maven-multiproject-plugin</report> </reports> - <!-- For maven internal testing --> <properties> <testName>testValue</testName> <pomProperty>${pomProperty}</pomProperty> </properties> - </project> No revision No revision 1.14.4.4 +13 -36 maven/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /home/cvs/maven/xdocs/changes.xml,v retrieving revision 1.14.4.3 retrieving revision 1.14.4.4 diff -u -r1.14.4.3 -r1.14.4.4 --- changes.xml 4 Mar 2004 17:45:56 -0000 1.14.4.3 +++ changes.xml 23 Mar 2004 01:45:57 -0000 1.14.4.4 @@ -1,4 +1,5 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> + <!-- /* * Copyright 2001-2004 The Apache Software Foundation. @@ -22,48 +23,24 @@ <title>Changes</title> <author email="[EMAIL PROTECTED]">Vincent Massol</author> </properties> - <body> - - <release version="1.0RC2" date="in CVS"> + <release version="1.0RC2" date="2004-03-22"> + <action dev="brett" type="fix">More than I can remember. Redesigned plugin manager internals to fix the memory leak in the reactor.</action> </release> - <release version="1.0RC1" date="2003-09-30"> - <action dev='dion' type='fix'> - Move maven.docs.* and maven.gen.docs to defaults.properties instead of xdoc plugin - </action> - <action dev="jvanzyl" type="add"> - Added the new POM marshaller and unmarshaller based on the xpp3 - xmlpull parser. This eliminates betwixt and friends from the POM - reading and writing. The POM is used so often and rarely changes so - the optimizations that are possible with are worth the effort of - creating the xpp3 tools. This also allows fine grained control over - the marshalling and unmarshalling processes. Betwixt doesn't handle - Maps very well and we had to resort to some Digester chicanery to - get properties to work correctly. Also using xpp3 allows us to - eliminate a big set of dependencies including Xerces as xpp3 - comes with a SAX Driver so we can also elimate pretty much all - JAXP and XML parser nonsense. - </action> - <action dev="vmassol" type="fix"> - Fixed dependency for ejb so that ejbs file have a jar extension. Fixes - bug + <action dev="dion" type="fix">Move maven.docs.* and maven.gen.docs to defaults.properties instead of xdoc plugin</action> + <action dev="jvanzyl" type="add">Added the new POM marshaller and unmarshaller based on the xpp3 xmlpull parser. This eliminates betwixt and friends from the POM reading and writing. The POM is used so often and rarely changes so the optimizations that are possible with are worth the effort of creating the xpp3 tools. This also allows fine grained control over the marshalling and unmarshalling processes. Betwixt doesn't handle Maps very well and we had to resort to some Digester chicanery to get properties to work correctly. Also using xpp3 allows us to eliminate a big set of dependencies including Xerces as xpp3 comes with a SAX Driver so we can also elimate pretty much all JAXP and XML parser nonsense.</action> + <action dev="vmassol" type="fix">Fixed dependency for ejb so that ejbs file have a jar extension. Fixes bug <a href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-196">MAVEN-196</a>. </action> - <action dev="vmassol" type="add"> - Added support for filtering resources both for runtime and test - resources. To use it, define a - <code><filtering>true</filtering></code> tag inside - any <code><resource/></code> tag and add Ant filters by defining - a pregoal on <code>java:jar-resources</code> or - <code>test:test-resources</code> in your project's + <action dev="vmassol" type="add">Added support for filtering resources both for runtime and test resources. To use it, define a + <code><filtering>true</filtering></code>tag inside any + <code><resource/></code>tag and add Ant filters by defining a pregoal on + <code>java:jar-resources</code>or + <code>test:test-resources</code>in your project's <code>maven.xml</code>. </action> - <action dev="vmassol" type="add"> - Lots of additions, bug fixes and updates but we were not counting at - that time! - </action> + <action dev="vmassol" type="add">Lots of additions, bug fixes and updates but we were not counting at that time!</action> </release> </body> </document> -
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]