From ef41c0e4f42ddc1c8000bec84c642334ef4fca64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Wed, 11 Apr 2018 07:43:55 +0200 Subject: [PATCH] updated model version to latest 1.1.0 and xsd link in model documentation is already generated by Modello, no need to duplicate information in handwritten description --- .gitignore | 1 - maven-settings/src/main/mdo/settings.mdo | 4 ---- maven-settings/src/site/apt/index.apt | 2 +- pom.xml | 1 - 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5d2f7453cd..f79c9285cd 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,3 @@ out/ /bootstrap /dependencies.xml .java-version -.factorypath \ 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 813ebc46d0..7547a9cd2e 100644 --- a/maven-settings/src/main/mdo/settings.mdo +++ b/maven-settings/src/main/mdo/settings.mdo @@ -31,10 +31,6 @@

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

-

An XSD is available at:

- ]]> diff --git a/maven-settings/src/site/apt/index.apt b/maven-settings/src/site/apt/index.apt index 17eaf8c8ce..5d8e39c14a 100644 --- a/maven-settings/src/site/apt/index.apt +++ b/maven-settings/src/site/apt/index.apt @@ -33,4 +33,4 @@ Maven Settings Model * A {{{./settings.html}Descriptor Reference}} - * An {{{https://maven.apache.org/xsd/settings-1.0.0.xsd}XSD}} + * An {{{https://maven.apache.org/xsd/settings-1.1.0.xsd}XSD}} diff --git a/pom.xml b/pom.xml index a29f98d56b..660173b073 100644 --- a/pom.xml +++ b/pom.xml @@ -505,7 +505,6 @@ under the License. src/test/projects/** src/test/remote-repo/** **/*.odg - **/.factorypath