diff --git a/apache-maven/src/site/site.xml b/apache-maven/src/site/site.xml index cd7807c147f..71da9b0f1a3 100644 --- a/apache-maven/src/site/site.xml +++ b/apache-maven/src/site/site.xml @@ -23,9 +23,4 @@ under the License. xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd"> ${project.scm.url} - - - - - \ No newline at end of file diff --git a/maven-artifact/src/site/site.xml b/maven-artifact/src/site/site.xml index 8ffe43d07c3..78e98089a64 100644 --- a/maven-artifact/src/site/site.xml +++ b/maven-artifact/src/site/site.xml @@ -31,8 +31,5 @@ under the License. - - - \ No newline at end of file diff --git a/maven-builder-support/src/site/site.xml b/maven-builder-support/src/site/site.xml index 8ffe43d07c3..78e98089a64 100644 --- a/maven-builder-support/src/site/site.xml +++ b/maven-builder-support/src/site/site.xml @@ -31,8 +31,5 @@ under the License. - - - \ No newline at end of file diff --git a/maven-compat/src/site/site.xml b/maven-compat/src/site/site.xml index 8ffe43d07c3..78e98089a64 100644 --- a/maven-compat/src/site/site.xml +++ b/maven-compat/src/site/site.xml @@ -31,8 +31,5 @@ under the License. - - - \ No newline at end of file diff --git a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java index 70d9cf20d07..47cfebcbbae 100644 --- a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java +++ b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java @@ -63,6 +63,7 @@ /** * @author Jason van Zyl + * @since 3.2.3 */ @Component(role = MavenRepositorySystem.class, hint = "default") public class MavenRepositorySystem { @@ -677,15 +678,15 @@ public static Mirror getMirror(ArtifactRepository repository, List mirro /** * This method checks if the pattern matches the originalRepository. Valid patterns: *
    - *
  • {@code *} = everything,
    • - *
  • {@code external:*} = everything not on the localhost and not file based,
    • - *
  • {@code external:http:*} = any repository not on the localhost using HTTP,
    • - *
  • {@code repo,repo1} = {@code repo} or {@code repo1},
    • - *
  • {@code *,!repo1} = everything except {@code repo1}.
    • + *
  • {@code *} (since 2.0.5)= everything,
    • + *
  • {@code external:*} (since 2.0.9)= everything not on the localhost and not file based,
    • + *
  • {@code external:http:*} (since 3.8.0)= any repository not on the localhost using HTTP,
    • + *
  • {@code repo,repo1} (since 2.0.9)= {@code repo} or {@code repo1},
    • + *
  • {@code *,!repo1} (since 2.0.9)= everything except {@code repo1}.
    • *
* * @param originalRepository to compare for a match. - * @param pattern used for match. Currently only '*' is supported. + * @param pattern used for match. * @return true if the repository is a match to this pattern. */ static boolean matchPattern(ArtifactRepository originalRepository, String pattern) { diff --git a/maven-core/src/site/site.xml b/maven-core/src/site/site.xml index e5ce8e6f353..942308b06e7 100644 --- a/maven-core/src/site/site.xml +++ b/maven-core/src/site/site.xml @@ -33,13 +33,7 @@ under the License. - - - - - - \ No newline at end of file diff --git a/maven-embedder/src/site/site.xml b/maven-embedder/src/site/site.xml index c1bd4a7df21..78e98089a64 100644 --- a/maven-embedder/src/site/site.xml +++ b/maven-embedder/src/site/site.xml @@ -31,12 +31,5 @@ under the License. - - - - - - - \ No newline at end of file diff --git a/maven-model-builder/src/site/site.xml b/maven-model-builder/src/site/site.xml index 61e47a68fe2..78e98089a64 100644 --- a/maven-model-builder/src/site/site.xml +++ b/maven-model-builder/src/site/site.xml @@ -31,12 +31,5 @@ under the License. - - - - - - - \ No newline at end of file diff --git a/maven-model/src/site/site.xml b/maven-model/src/site/site.xml index 8ffe43d07c3..78e98089a64 100644 --- a/maven-model/src/site/site.xml +++ b/maven-model/src/site/site.xml @@ -31,8 +31,5 @@ under the License. - - - \ No newline at end of file diff --git a/maven-plugin-api/src/site/site.xml b/maven-plugin-api/src/site/site.xml index 1cbf42b0962..598e4439435 100644 --- a/maven-plugin-api/src/site/site.xml +++ b/maven-plugin-api/src/site/site.xml @@ -35,8 +35,5 @@ - - - \ No newline at end of file diff --git a/maven-repository-metadata/src/site/site.xml b/maven-repository-metadata/src/site/site.xml index be08a3317f3..2d73551ce4c 100644 --- a/maven-repository-metadata/src/site/site.xml +++ b/maven-repository-metadata/src/site/site.xml @@ -31,8 +31,5 @@ under the License. - - - \ No newline at end of file diff --git a/maven-resolver-provider/src/site/site.xml b/maven-resolver-provider/src/site/site.xml index 8ffe43d07c3..78e98089a64 100644 --- a/maven-resolver-provider/src/site/site.xml +++ b/maven-resolver-provider/src/site/site.xml @@ -31,8 +31,5 @@ under the License. - - - \ No newline at end of file diff --git a/maven-settings-builder/src/site/site.xml b/maven-settings-builder/src/site/site.xml index 8ffe43d07c3..78e98089a64 100644 --- a/maven-settings-builder/src/site/site.xml +++ b/maven-settings-builder/src/site/site.xml @@ -31,8 +31,5 @@ under the License. - - - \ No newline at end of file diff --git a/maven-settings/src/main/mdo/settings.mdo b/maven-settings/src/main/mdo/settings.mdo index 55307bd7b06..a77acc4a562 100644 --- a/maven-settings/src/main/mdo/settings.mdo +++ b/maven-settings/src/main/mdo/settings.mdo @@ -28,9 +28,9 @@ This is a reference for the user-specific configuration for Maven.

-

Includes things that should not be distributed with the pom.xml file, such as developer identity, along with +

Includes things that should not be distributed with the pom.xml file, such as developer identity, along with local settings, like proxy information.

-

The default location for the settings file is ~/.m2/settings.xml

+

The default location for the user settings file is ~/.m2/settings.xml

]]> @@ -99,6 +99,7 @@ String default true + Item identifier. @@ -137,7 +138,7 @@ 1.0.0+ plugin-registry.xml file to manage plugin versions. ]]> boolean @@ -169,8 +170,8 @@ 1.0.0+ @@ -495,7 +496,7 @@ 1.0.0+ |). ]]> String @@ -596,8 +597,12 @@ 1.0.0+ String - The server ID of the repository being mirrored, e.g., - "central". This MUST NOT match the mirror id. + central or *,!repo1. + * (since Maven 2.0.5), external:* (since Maven 2.0.9) and external:http:* (since Maven 3.8.0) have + a special meaning: see Mirror Settings guide. + ]]> @@ -621,7 +626,12 @@ 1.1.0+ String default - The layout of the mirror repository. Since Maven 3. + + Since: Maven 3 + ]]> + mirrorOfLayouts @@ -629,8 +639,11 @@ String default,legacy + Since: Maven 3 + ]]> @@ -639,7 +652,11 @@ boolean false + Default value is: false +
Since: Maven 3.8.0 + ]]> diff --git a/maven-settings/src/site/apt/index.apt b/maven-settings/src/site/apt/index.apt index 2b42ccd16a3..027f6d41a06 100644 --- a/maven-settings/src/site/apt/index.apt +++ b/maven-settings/src/site/apt/index.apt @@ -25,7 +25,8 @@ Maven Settings Model - This is strictly the model for Maven settings. + This is strictly the model for Maven settings. All the effective settings building logic from multiple <<>> files + is done in {{{../maven-settings-builder/}Maven Settings Builder}}. The following are generated from this model: @@ -34,3 +35,15 @@ Maven Settings Model * A {{{./settings.html}Descriptor Reference}} * An {{{https://maven.apache.org/xsd/settings-1.2.0.xsd}XSD}} + +* See Also User Documentation + + * {{{https://maven.apache.org/settings.html} Settings Reference}}, + + * {{{https://maven.apache.org/guides/mini/guide-mirror-settings.html} Mirror Settings}}, + + * {{{https://maven.apache.org/guides/mini/guide-deployment-security-settings.html} Security and Deployment Settings}}, + + * {{{https://maven.apache.org/guides/mini/guide-encryption.html} Password Encryption}}, + + * {{{https://maven.apache.org/guides/mini/guide-proxies.html} Configuring a proxy}}. diff --git a/maven-settings/src/site/site.xml b/maven-settings/src/site/site.xml index 8ffe43d07c3..78e98089a64 100644 --- a/maven-settings/src/site/site.xml +++ b/maven-settings/src/site/site.xml @@ -31,8 +31,5 @@ under the License. - - - \ No newline at end of file diff --git a/maven-slf4j-provider/src/site/site.xml b/maven-slf4j-provider/src/site/site.xml index 8ffe43d07c3..78e98089a64 100644 --- a/maven-slf4j-provider/src/site/site.xml +++ b/maven-slf4j-provider/src/site/site.xml @@ -31,8 +31,5 @@ under the License. - - - \ No newline at end of file diff --git a/src/site/site.xml b/src/site/site.xml index 3ba52bda596..71a31a02b1a 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -46,25 +46,26 @@ under the License. - + - + + - + - - + + \ No newline at end of file