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 2018/04/11 05:43:57 UTC

[maven] branch master updated: updated model version to latest 1.1.0

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.git


The following commit(s) were added to refs/heads/master by this push:
     new ef41c0e  updated model version to latest 1.1.0
ef41c0e is described below

commit ef41c0e4f42ddc1c8000bec84c642334ef4fca64
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Wed Apr 11 07:43:55 2018 +0200

    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 5d2f745..f79c928 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 813ebc4..7547a9c 100644
--- a/maven-settings/src/main/mdo/settings.mdo
+++ b/maven-settings/src/main/mdo/settings.mdo
@@ -31,10 +31,6 @@
     <p>Includes things that should not be distributed with the pom.xml file, such as developer identity, along with
     local settings, like proxy information.</p>
     <p>The default location for the settings file is <i>~/.m2/settings.xml</i></p>
-    <p>An XSD is available at:</p>
-    <ul>
-      <li><a href="https://maven.apache.org/xsd/settings-1.0.0.xsd">https://maven.apache.org/xsd/settings-1.0.0.xsd</a>.</li>
-    </ul>
     ]]>
   </description>
   <defaults>
diff --git a/maven-settings/src/site/apt/index.apt b/maven-settings/src/site/apt/index.apt
index 17eaf8c..5d8e39c 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 a29f98d..660173b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -505,7 +505,6 @@ under the License.
               <exclude>src/test/projects/**</exclude>
               <exclude>src/test/remote-repo/**</exclude>
               <exclude>**/*.odg</exclude>
-              <exclude>**/.factorypath</exclude>
             </excludes>
           </configuration>
         </plugin>

-- 
To stop receiving notification emails like this one, please contact
hboutemy@apache.org.