Skip to content

Commit 2e01948

Browse files
authored
[MNG-8345] Maven generates both settings 1.3.0 and 2.0.0 (#1835)
1 parent 4407e98 commit 2e01948

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

apache-maven/src/assembly/maven/conf/settings.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ under the License.
4444
| values (values used when the setting is not specified) are provided.
4545
|
4646
|-->
47-
<settings xmlns="http://maven.apache.org/SETTINGS/1.3.0"
47+
<settings xmlns="http://maven.apache.org/SETTINGS/2.0.0"
4848
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
49-
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.3.0 https://maven.apache.org/xsd/settings-1.3.0.xsd">
49+
xsi:schemaLocation="http://maven.apache.org/SETTINGS/2.0.0 https://maven.apache.org/xsd/settings-2.0.0.xsd">
5050
<!-- localRepository
5151
| The path to the local repository maven will use to store artifacts.
5252
|

api/maven-api-settings/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ under the License.
8383
</goals>
8484
<phase>generate-resources</phase>
8585
<configuration>
86-
<version>1.3.0</version>
86+
<version>2.0.0</version>
8787
<models>
8888
<model>src/main/mdo/settings.mdo</model>
8989
</models>

maven-settings/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ under the License.
114114
</templates>
115115
</configuration>
116116
</execution>
117+
<execution>
118+
<id>modello-site-docs</id>
119+
<phase>none</phase>
120+
</execution>
117121
</executions>
118122
</plugin>
119123
<plugin>

0 commit comments

Comments
 (0)