You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2020/10/16 06:23:12 UTC
[maven-site] branch master updated: [MNG-6994] follow-up APT syntax
fixes
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site.git
The following commit(s) were added to refs/heads/master by this push:
new 89b2af4 [MNG-6994] follow-up APT syntax fixes
new 2131025 Merge pull request #210 from kwin/bugfix/MNGSITE-430-apt-fixes
89b2af4 is described below
commit 89b2af4aab5047539a4bb05faae1190d7b1f4913
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Wed Oct 7 17:46:14 2020 +0200
[MNG-6994] follow-up APT syntax fixes
---
.../introduction/introduction-to-profiles.apt | 8 ++++----
.../guides/mini/guide-multiple-repositories.apt | 22 ++++++++++++++--------
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/content/apt/guides/introduction/introduction-to-profiles.apt b/content/apt/guides/introduction/introduction-to-profiles.apt
index a7bd1eb..306877d 100644
--- a/content/apt/guides/introduction/introduction-to-profiles.apt
+++ b/content/apt/guides/introduction/introduction-to-profiles.apt
@@ -405,10 +405,10 @@ mvn groupId:artifactId:goal -P !profile-1,!profile-2
* Profile Order
-All profile elements in a POM from active profiles overwrite the global elements with the same name of the POM or extend those in case of collections.
-In case multiple profiles are active in the same POM or external file, the ones which are defined <<later>> take precedence over the ones defined <<earlier>> (independent of their profile id and activation order).
+ All profile elements in a POM from active profiles overwrite the global elements with the same name of the POM or extend those in case of collections.
+ In case multiple profiles are active in the same POM or external file, the ones which are defined <<later>> take precedence over the ones defined <<earlier>> (independent of their profile id and activation order).
-Example:
+ Example:
+---+
<project>
@@ -451,7 +451,7 @@ Example:
</project>
+---+
-This leads to the repository list: <<<profile-2-repo, profile-1-repo, global-repo>>>.
+ This leads to the repository list: <<<profile-2-repo, profile-1-repo, global-repo>>>.
* Profile Pitfalls
diff --git a/content/apt/guides/mini/guide-multiple-repositories.apt b/content/apt/guides/mini/guide-multiple-repositories.apt
index f9e29c5..c0480ae 100644
--- a/content/apt/guides/mini/guide-multiple-repositories.apt
+++ b/content/apt/guides/mini/guide-multiple-repositories.apt
@@ -105,14 +105,20 @@ mvn -Pmyprofile ...
<<Note>>: The settings descriptor documentation can be found on the {{{../../maven-settings/settings.html}Maven Local Settings Model Website}}.
- ** Repository Order
+* Repository Order
-Remote repository URLs are queried in the following order for artifacts until one returns a valid result:
+ Remote repository URLs are queried in the following order for artifacts until one returns a valid result:
-[[1]] Global <<<settings.xml>>>
-[[1]] User <<<settings.xml>>>
-[[1]] Local POM
-[[1]] Parent POMs, recursively
-[[1]] Super POM
+ [[1]] Global <<<settings.xml>>>
-For each of these locations, the repositories within the profiles are queried first in the order outlined at {{{../introduction/introduction-to-profiles.html}Introduction to build profiles}}.
+ [[1]] User <<<settings.xml>>>
+
+ [[1]] Local POM
+
+ [[1]] Parent POMs, recursively
+
+ [[1]] Super POM
+
+ []
+
+ For each of these locations, the repositories within the profiles are queried first in the order outlined at {{{../introduction/introduction-to-profiles.html}Introduction to build profiles}}.