Author: dennisl Date: Wed Aug 9 13:34:39 2006 New Revision: 430139 URL: http://svn.apache.org/viewvc?rev=430139&view=rev Log: o Copy the convert mojo from sandbox/plugins/maven-maven1-plugin. o Add documentation for the convert mojo.
Added: maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/PomV3ConvertMojo.java - copied, changed from r430129, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/PomV3ConvertMojo.java Modified: maven/plugins/trunk/maven-one-plugin/pom.xml maven/plugins/trunk/maven-one-plugin/src/site/apt/index.apt maven/plugins/trunk/maven-one-plugin/src/site/apt/usage.apt Modified: maven/plugins/trunk/maven-one-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-one-plugin/pom.xml?rev=430139&r1=430138&r2=430139&view=diff ============================================================================== --- maven/plugins/trunk/maven-one-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-one-plugin/pom.xml Wed Aug 9 13:34:39 2006 @@ -95,6 +95,11 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-model-converter</artifactId> + <version>2.0.5-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> <version>2.0</version> </dependency> Copied: maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/PomV3ConvertMojo.java (from r430129, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/PomV3ConvertMojo.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/PomV3ConvertMojo.java?p2=maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/PomV3ConvertMojo.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/PomV3ConvertMojo.java&r1=430129&r2=430139&rev=430139&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/PomV3ConvertMojo.java (original) +++ maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/PomV3ConvertMojo.java Wed Aug 9 13:34:39 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter; +package org.apache.maven.plugins.mavenone; /* * Copyright 2001-2006 The Apache Software Foundation. @@ -25,7 +25,7 @@ import java.io.File; /** - * Converts a Maven 1 project.xml (v3 pom) to a Maven 2 pom.xml (v4 pom). + * Convert a Maven 1 project.xml (v3 pom) to a Maven 2 pom.xml (v4 pom). * * @author Fabrizio Giustina * @author Dennis Lundberg Modified: maven/plugins/trunk/maven-one-plugin/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-one-plugin/src/site/apt/index.apt?rev=430139&r1=430138&r2=430139&view=diff ============================================================================== --- maven/plugins/trunk/maven-one-plugin/src/site/apt/index.apt (original) +++ maven/plugins/trunk/maven-one-plugin/src/site/apt/index.apt Wed Aug 9 13:34:39 2006 @@ -11,12 +11,16 @@ This plugin provides some integration tasks with Maven 1.x: - * Provides a packaging mechanism for Maven 1.x plugins, building using Maven 2.0 + * Helps you to switch your project from Maven 1 to Maven 2 by converting your <<<project.xml>>> to a <<<pom.xml>>> + + * Provides a packaging mechanism for Maven 1.x plugins, building them using Maven 2.0 * Provides a hook for installation that will copy built artifacts into a local or remote Maven 1.x repository, for concurrent development with Maven 1.x projects * Goals Overview + + * {{{convert-mojo.html}one:convert}} convert a Maven 1 project.xml (v3 pom) to a Maven 2 pom.xml (v4 pom). * {{{deploy-maven-one-repository-mojo.html}one:deploy-maven-one-repository}} deploy an artifact into a Maven 1 remote repository. Modified: maven/plugins/trunk/maven-one-plugin/src/site/apt/usage.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-one-plugin/src/site/apt/usage.apt?rev=430139&r1=430138&r2=430139&view=diff ============================================================================== --- maven/plugins/trunk/maven-one-plugin/src/site/apt/usage.apt (original) +++ maven/plugins/trunk/maven-one-plugin/src/site/apt/usage.apt Wed Aug 9 13:34:39 2006 @@ -8,6 +8,28 @@ Usage +* Maven 1 to Maven 2 conversion + + If you are moving a project from Maven 1 to Maven 2, you can get some help + from the Maven One plugin. It can convert your project's <<<project.xml>>> + and <<<project.properties>>> into a <<<pom.xml>>>. To do this, change to the + directory where your <<<project.xml>>> file is located and issue this command + on the command line: + +------- +mvn one:convert +------- + + This goal uses + {{{http://maven.apache.org/ref/current/maven-model-converter/}maven-model-converter}} + which not only converts your project model, it also has <relocators> for many + plugins and <converters> for their configurations. So if you had some + configuration properties for the Maven 1 jar-plugin, a converter will try + to create a suitable configuration section for the Maven 2 jar-plugin inside + your new <<<pom.xml>>>. You need to review the versions for the plugins in + <<<pom.xml>>> after it has been created, as the versions might not be the + same as for the Maven 1 plugins. + * Maven 1.x Plugin Packaging To package a Maven 1.x plugin using Maven 2.x, you need to include the Maven