Author: michaelo
Date: Thu May 12 22:16:32 2016
New Revision: 1743587
URL: http://svn.apache.org/viewvc?rev=1743587&view=rev
Log:
[MNGSITE-284] User ${user.home} instead of ~ when Java resolves a path
Modified:
maven/site/trunk/content/apt/guides/development/guide-testing-development-plugins.apt
maven/site/trunk/content/apt/guides/getting-started/index.apt
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-encryption.apt
maven/site/trunk/content/apt/guides/mini/guide-multiple-repositories.apt
maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt
Modified:
maven/site/trunk/content/apt/guides/development/guide-testing-development-plugins.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/development/guide-testing-development-plugins.apt?rev=1743587&r1=1743586&r2=1743587&view=diff
==============================================================================
---
maven/site/trunk/content/apt/guides/development/guide-testing-development-plugins.apt
(original)
+++
maven/site/trunk/content/apt/guides/development/guide-testing-development-plugins.apt
Thu May 12 22:16:32 2016
@@ -102,7 +102,7 @@ Guide to Testing Development Versions of
If you are using the goals from the command line on a number of projects,
you should include this in your
<<<settings.xml>>> file instead.
- You need to modify your <<<~/.m2/settings.xml>>> file to include two new
profiles
+ You need to modify your <<<$\{user.home\}/.m2/settings.xml>>> file to
include two new profiles
and then when you need access to the plugin snapshots use <<<-Papache>>>.
The profile only needs to be enabled once so that the plugins can be
downloaded into you local repository. Once
in your local repository Maven can succesfully resolve the dependencies and
Modified: maven/site/trunk/content/apt/guides/getting-started/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/getting-started/index.apt?rev=1743587&r1=1743586&r2=1743587&view=diff
==============================================================================
--- maven/site/trunk/content/apt/guides/getting-started/index.apt (original)
+++ maven/site/trunk/content/apt/guides/getting-started/index.apt Thu May 12
22:16:32 2016
@@ -359,7 +359,7 @@ mvn package
You can now take a look in the <<<$\{basedir\}/target>>> directory and you
will see the generated JAR file.
Now you'll want to install the artifact you've generated (the JAR file) in
your local repository
- (<<<~/.m2/repository>>> is the default location). For more information on
repositories you can refer to our
+ (<<<$\{user.home\}/.m2/repository>>> is the default location). For more
information on repositories you can refer to our
{{{../introduction/introduction-to-repositories.html}Introduction to
Repositories}} but let's move on to installing our artifact!
To do so execute the following command:
@@ -898,7 +898,7 @@ mvn process-resources "-Dcommand.line.pr
{{{../introduction/introduction-to-dependency-mechanism.html}Introduction to
Dependency Mechanism}}.
With this information about a dependency, Maven will be able to reference the
dependency when it builds the project. Where does
- Maven reference the dependency from? Maven looks in your local repository
(<<<~/.m2/repository>>> is the default location) to find
+ Maven reference the dependency from? Maven looks in your local repository
(<<<$\{user.home\}/.m2/repository>>> is the default location) to find
all dependencies. In a
{{{How_do_I_create_a_JAR_and_install_it_in_my_local_repository}previous
section}}, we installed the artifact
from our project (my-app-1.0-SNAPSHOT.jar) into the local repository. Once
it's installed there, another project can reference that jar
as a dependency simply by adding the dependency information to its pom.xml:
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=1743587&r1=1743586&r2=1743587&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:16:32 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: <<<$\{maven.home\}/conf/settings.xml>>>),
you can
+ <<<$\{user.home\}/.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=1743587&r1=1743586&r2=1743587&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:16:32 2016
@@ -408,7 +408,7 @@ mvn groupId:artifactId:goal -P !profile-
</project>
+---+
- Now, in your local <<<~/.m2/settings.xml>>>, you have:
+ Now, in your local <<<$\{user.home\}/.m2/settings.xml>>>, you have:
+---+
<settings>
Modified: maven/site/trunk/content/apt/guides/mini/guide-encryption.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-encryption.apt?rev=1743587&r1=1743586&r2=1743587&view=diff
==============================================================================
--- maven/site/trunk/content/apt/guides/mini/guide-encryption.apt (original)
+++ maven/site/trunk/content/apt/guides/mini/guide-encryption.apt Thu May 12
22:16:32 2016
@@ -54,7 +54,7 @@
The implemented solution adds the following capabilities:
- * authorized users have an additional <<<settings-security.xml>>> file in
their <<<~/.m2>>> folder
+ * authorized users have an additional <<<settings-security.xml>>> file in
their <<<$\{user.home\}/.m2>>> folder
** this file either contains encrypted <<master password>>, used to
encrypt other passwords
@@ -82,7 +82,7 @@ mvn --encrypt-master-password <password>
{jSMOWnoPFgsHVpMvz5VrIt5kRbzGpI8u+9EF1iFQyJQ=}
+------------------------------------+
- Store this password in the <<<~/.m2/settings-security.xml>>>; it should look
like
+ Store this password in the <<<$\{user.home\}/.m2/settings-security.xml>>>; it
should look like
+------------------------------------+
<settingsSecurity>
@@ -168,7 +168,7 @@ mvn deploy:deploy-file -Durl=https://mav
in the file <<</Volumes/mySecureUsb/secure/settings-security.xml>>>
- And then I create <<<~/.m2/settings-security.xml>>> with the following
content:
+ And then I create <<<$\{user.home\}/.m2/settings-security.xml>>> with the
following content:
+------------------------------------+
<settingsSecurity>
Modified:
maven/site/trunk/content/apt/guides/mini/guide-multiple-repositories.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-multiple-repositories.apt?rev=1743587&r1=1743586&r2=1743587&view=diff
==============================================================================
--- maven/site/trunk/content/apt/guides/mini/guide-multiple-repositories.apt
(original)
+++ maven/site/trunk/content/apt/guides/mini/guide-multiple-repositories.apt
Thu May 12 22:16:32 2016
@@ -60,7 +60,7 @@ Setting up Multiple Repositories
{{{../introduction/introduction-to-the-pom.html#Super_POM}Super POM}}.
The other way you can specify the use of multiple repositories by creating a
profile in
- your <<<~/.m2/settings.xml>>> file like the following:
+ your <<<$\{user.home\}/.m2/settings.xml>>> file like the following:
+----+
Modified: maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt?rev=1743587&r1=1743586&r2=1743587&view=diff
==============================================================================
--- maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt
(original)
+++ maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt Thu May
12 22:16:32 2016
@@ -123,7 +123,7 @@ Guide to Using Toolchains
does the plugin know where this JDK is installed? This is where the
<<<toolchains.xml>>> file comes in.
The <<<toolchains.xml>>> file (see below) is the configuration file where
you set the installation paths of your toolchains.
- This file should be put in your <<<${user.home}/.m2>>> directory. When the
<<<maven-toolchains-plugin>>> executes, it looks for the <<<toolchains.xml>>>
file,
+ This file should be put in your <<<$\{user.home\}/.m2>>> directory. When the
<<<maven-toolchains-plugin>>> executes, it looks for the <<<toolchains.xml>>>
file,
reads it and looks for a toolchain matching the toolchains requirements
configured in the plugin. In our example, that would be a JDK toolchain with
<<<\<version\>>>> "1.5" and <<<\<vendor\>>>> "sun". Once a match is found,
the plugin then stores the toolchain to be used in the MavenSession. As you
can see in our <<<toolchains.xml>>> below, there is indeed a JDK
