This is an automated email from the ASF dual-hosted git repository.
gnodet 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 2e01948c1e [MNG-8345] Maven generates both settings 1.3.0 and 2.0.0
(#1835)
2e01948c1e is described below
commit 2e01948c1e3921b87db96def735c4bc1fa547142
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu Oct 24 17:53:41 2024 +0200
[MNG-8345] Maven generates both settings 1.3.0 and 2.0.0 (#1835)
---
apache-maven/src/assembly/maven/conf/settings.xml | 4 ++--
api/maven-api-settings/pom.xml | 2 +-
maven-settings/pom.xml | 4 ++++
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/apache-maven/src/assembly/maven/conf/settings.xml
b/apache-maven/src/assembly/maven/conf/settings.xml
index 05a46c8802..9c7d69dc29 100644
--- a/apache-maven/src/assembly/maven/conf/settings.xml
+++ b/apache-maven/src/assembly/maven/conf/settings.xml
@@ -44,9 +44,9 @@ under the License.
| values (values used when the setting is not specified) are provided.
|
|-->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.3.0";
+<settings xmlns="http://maven.apache.org/SETTINGS/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.3.0
https://maven.apache.org/xsd/settings-1.3.0.xsd";>
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/2.0.0
https://maven.apache.org/xsd/settings-2.0.0.xsd";>
<!-- localRepository
| The path to the local repository maven will use to store artifacts.
|
diff --git a/api/maven-api-settings/pom.xml b/api/maven-api-settings/pom.xml
index 5ccd02d3d4..d5ca340bed 100644
--- a/api/maven-api-settings/pom.xml
+++ b/api/maven-api-settings/pom.xml
@@ -83,7 +83,7 @@ under the License.
</goals>
<phase>generate-resources</phase>
<configuration>
- <version>1.3.0</version>
+ <version>2.0.0</version>
<models>
<model>src/main/mdo/settings.mdo</model>
</models>
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index 0e211062ad..b57725c381 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -114,6 +114,10 @@ under the License.
</templates>
</configuration>
</execution>
+ <execution>
+ <id>modello-site-docs</id>
+ <phase>none</phase>
+ </execution>
</executions>
</plugin>
<plugin>
