Author: pgier Date: Tue May 12 14:28:49 2009 New Revision: 773909 URL: http://svn.apache.org/viewvc?rev=773909&view=rev Log: Minor site improvements and update release notes for 2.0.10
Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/mvn.apt maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/index.apt maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/release-notes.apt maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/usage.apt maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/fml/faq.fml Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/mvn.apt URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/mvn.apt?rev=773909&r1=773908&r2=773909&view=diff ============================================================================== --- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/mvn.apt (original) +++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/mvn.apt Tue May 12 14:28:49 2009 @@ -31,7 +31,7 @@ <<Note: This task is only available since version 2.0.10>> The maven ant tasks have some limited support for calling a full maven build from ant. - The <<<mvn>>> task is a subclass of the Ant {{{java}http://ant.apache.org/manual/CoreTasks/java.html}} + The <<<mvn>>> task is a subclass of the Ant {{{http://ant.apache.org/manual/CoreTasks/java.html}java}} task and supports all of it's options such as args, fork, resultproperty, etc. If maven is already installed on the local system the maven build can be called using @@ -69,7 +69,7 @@ </artifact:mvn> ----- - <<Note: this will use the 2.0.10 version of the core maven jar files>> + <<Note: this will use version 2.0.10 of the core maven jar files>> Using the Java Task @@ -114,4 +114,4 @@ goal="install" resultproperty="maven.build.result"/> ----- - \ No newline at end of file + Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/index.apt?rev=773909&r1=773908&r2=773909&view=diff ============================================================================== --- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/index.apt (original) +++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/index.apt Tue May 12 14:28:49 2009 @@ -44,7 +44,7 @@ * Usage - Instructions for installing and using the maven ant tasks can be found on the {{{installation.html}installation page}} + General instructions for installing and using the maven ant tasks can be found on the {{{installation.html}installation page}} and the {{{usage.html}usage page}} respectively. * Examples @@ -64,7 +64,7 @@ If you have any questions specific to the Ant tasks, please contact the {{{http://maven.apache.org/mail-lists.html} Maven Users Mailing List}}. - For more on the Maven functionality behind them, try the following links: + For more on the Maven functionality behind the Ant tasks, try the following links: * {{{http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html} Dependency Mechanism}} Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/release-notes.apt URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/release-notes.apt?rev=773909&r1=773908&r2=773909&view=diff ============================================================================== --- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/release-notes.apt (original) +++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/release-notes.apt Tue May 12 14:28:49 2009 @@ -28,6 +28,43 @@ Maven Ant Tasks +* 2.0.10 Release Notes + + The full list of changes can be found in our {{{http://jira.codehaus.org/secure/IssueNavigator.jspa?reset=true&pid=11533&fixfor=14199}issue management system}}, and is reproduced below. + +**Bug + + * [MANTTASKS-87] - Using a pom.xml for dependencies, in which the pom.xml has a parent pom.xml will cause a "Error downloading parent pom" error + + * [MANTTASKS-106] - Maven ant tasks artifact has maven inside the jar and so can't be used from inside the maven (maven-antrun-plugin) - classes do conflict + + * [MANTTASKS-111] - Support for SNAPSHOT deployment + + * [MANTTASKS-116] - NPE when install target is missing file and pom type is JAR + + * [MANTTASKS-142] - Default remote repository id not safe + + * [MANTTASKS-144] - "Error reading settings file" error is reported when settings.xml is deleted from maven/conf folder. + + * [MANTTASKS-145] - Dependency management doesn't work with pom and dependencies tasks + +** Improvement + + * [MANTTASKS-35] - Support profiles in pom type + + * [MANTTASKS-114] - improve documentation + + * [MANTTASKS-146] - Improvements to site documentation + + * [MANTTASKS-147] - Improvements to scope filtering + +** New Feature + + * [MANTTASKS-71] - running m2 inside Ant + + * [MANTTASKS-149] - Allow multiple types in the type filter + + * 2.0.9 Release Notes The full list of changes can be found in our {{{http://jira.codehaus.org/secure/IssueNavigator.jspa?reset=true&pid=11533&fixfor=13935&sorter/field=issuekey&sorter/order=DESC}issue management system}}, and is reproduced below. Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/usage.apt URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/usage.apt?rev=773909&r1=773908&r2=773909&view=diff ============================================================================== --- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/usage.apt (original) +++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/usage.apt Tue May 12 14:28:49 2009 @@ -163,21 +163,13 @@ * {{{http://maven.apache.org/guides/mini/guide-configuring-maven.html} Configuring Maven}}. + * {{{http://maven.apache.org/settings.html} Information about configuring settings.xml}}. + * {{{http://maven.apache.org/maven-settings/settings.html} Settings Descriptor Reference}}. * {{{http://maven.apache.org/guides/mini/guide-mirror-settings.html} Using Mirrors for Repositories}}. - * There is a - {{{http://svn.apache.org/repos/asf/maven/components/trunk/maven-distribution/src/conf/settings.xml} sample settings file}} - in the Maven installation. - -* Examples - - * {{{examples/dependencies.html} dependencies task}} - - * {{{examples/install-deploy.html} install and deploy tasks }} - - * {{{examples/pom.html} pom task }} +* More Examples * Maven Ant Tasks's {{{http://svn.apache.org/repos/asf/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml} sample.build.xml}} @@ -186,4 +178,6 @@ * Maven itself can be bootstrapped using Maven Ant Tasks: see {{{http://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x/build.xml} build.xml}} in Maven Core sources. Note that most content is about building Maven project: there is only a little part that is - using Maven Ant Tasks, to get dependencies, ie the <<<pull>>> target (with its <<<depends>>> targets). \ No newline at end of file + using Maven Ant Tasks, to get dependencies, ie the <<<pull>>> target (with its <<<depends>>> targets). + + Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/fml/faq.fml URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/fml/faq.fml?rev=773909&r1=773908&r2=773909&view=diff ============================================================================== --- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/fml/faq.fml (original) +++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/fml/faq.fml Tue May 12 14:28:49 2009 @@ -24,9 +24,9 @@ <faq id="build"> <question>How to build a Maven project with Maven Ant Tasks?</question> <answer> - <p>Maven Ant Tasks are not meant to <i>build</i> a project based on its <code>pom.xml</code>, but only - get dependencies defined in <code>pom.xml</code>.</p> + <p>See the <a href="examples/mvn.html">examples page</a> for the mvn task for information about building + a maven project from ant. </p> </answer> </faq> </part> -</faqs> \ No newline at end of file +</faqs>