Author: michaelo Date: Thu May 12 22:07:51 2016 New Revision: 1743586 URL: http://svn.apache.org/viewvc?rev=1743586&view=rev Log: [MNGSITE-283] Remove M2_HOME from documentation
Modified: maven/site/trunk/content/apt/examples/maven-3-lifecycle-extensions.apt.vm maven/site/trunk/content/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt maven/site/trunk/content/apt/guides/introduction/introduction-to-profiles.apt maven/site/trunk/content/apt/guides/mini/guide-3rd-party-jars-remote.apt maven/site/trunk/content/markdown/settings.md Modified: maven/site/trunk/content/apt/examples/maven-3-lifecycle-extensions.apt.vm URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/examples/maven-3-lifecycle-extensions.apt.vm?rev=1743586&r1=1743585&r2=1743586&view=diff ============================================================================== --- maven/site/trunk/content/apt/examples/maven-3-lifecycle-extensions.apt.vm (original) +++ maven/site/trunk/content/apt/examples/maven-3-lifecycle-extensions.apt.vm Thu May 12 22:07:51 2016 @@ -117,7 +117,7 @@ public class BeerMavenLifecycleParticipa You have two ways to use your extension within your builds: - * add your extension jar in $M2_HOME/lib/ext. + * add your extension jar in <<<$\{maven.home\}/lib/ext>>>. * add it as a build extension in your pom. Modified: maven/site/trunk/content/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt?rev=1743586&r1=1743585&r2=1743586&view=diff ============================================================================== --- maven/site/trunk/content/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt (original) +++ maven/site/trunk/content/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt Thu May 12 22:07:51 2016 @@ -127,7 +127,7 @@ mvn somePrefix:goal groupId locations for plugin-prefix mappings. As it turns out, this is simple. In the Maven settings file (per-user: - <<<~/.m2/settings.xml>>>; global: <<<$M2_HOME/conf/settings.xml>>>), you can + <<<~/.m2/settings.xml>>>; global: <<<$\{maven.home\}/conf/settings.xml>>>), you can provide a custom <<pluginGroups>> section, listing the plugin groupIds you want to search (each groupId goes in its own <<pluginGroup>> sub-element). For example, if my project uses a Modello model file, I might have the Modified: maven/site/trunk/content/apt/guides/introduction/introduction-to-profiles.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/introduction/introduction-to-profiles.apt?rev=1743586&r1=1743585&r2=1743586&view=diff ============================================================================== --- maven/site/trunk/content/apt/guides/introduction/introduction-to-profiles.apt (original) +++ maven/site/trunk/content/apt/guides/introduction/introduction-to-profiles.apt Thu May 12 22:07:51 2016 @@ -69,7 +69,7 @@ Introduction to Build Profiles * Global - Defined in the {{{http://maven.apache.org/ref/2.2.1/maven-settings/settings.html} global Maven-settings}} - <<<(%M2_HOME%/conf/settings.xml)>>>. + <<<($\{maven.home\}/conf/settings.xml)>>>. * Profile descriptor Modified: maven/site/trunk/content/apt/guides/mini/guide-3rd-party-jars-remote.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-3rd-party-jars-remote.apt?rev=1743586&r1=1743585&r2=1743586&view=diff ============================================================================== --- maven/site/trunk/content/apt/guides/mini/guide-3rd-party-jars-remote.apt (original) +++ maven/site/trunk/content/apt/guides/mini/guide-3rd-party-jars-remote.apt Thu May 12 22:07:51 2016 @@ -37,7 +37,7 @@ Guide to deploying 3rd party JARs to rem maven-deploy-plugin. First, the wagon-provider(wagon-ftp, wagon-file, etc..) must be placed to - your %M2_HOME%/lib. + your <<<$\{maven.home\}/lib>>>. Then execute the command: Modified: maven/site/trunk/content/markdown/settings.md URL: http://svn.apache.org/viewvc/maven/site/trunk/content/markdown/settings.md?rev=1743586&r1=1743585&r2=1743586&view=diff ============================================================================== --- maven/site/trunk/content/markdown/settings.md (original) +++ maven/site/trunk/content/markdown/settings.md Thu May 12 22:07:51 2016 @@ -31,7 +31,7 @@ authentication information. There are two locations where a `settings.xml` file may live: -- The Maven install: `$M2_HOME/conf/settings.xml` +- The Maven install: `${maven.home}/conf/settings.xml` - A user's install: `${user.home}/.m2/settings.xml` The former `settings.xml` are also called global settings, the latter