Skip to content

Commit 30fb050

Browse files
gnodetgnodet
committed
Create a new modelVersion 4.2.0
1 parent 3330cdb commit 30fb050

File tree

6 files changed

+139
-5
lines changed

6 files changed

+139
-5
lines changed

‎api/maven-api-core/src/main/java/org/apache/maven/api/services/ModelBuilder.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ public interface ModelBuilder extends Service {
2929

3030
String MODEL_VERSION_4_1_0 = "4.1.0";
3131

32-
List<String> VALID_MODEL_VERSIONS = List.of(MODEL_VERSION_4_0_0, MODEL_VERSION_4_1_0);
32+
String MODEL_VERSION_4_2_0 = "4.2.0";
33+
34+
List<String> VALID_MODEL_VERSIONS = List.of(MODEL_VERSION_4_0_0, MODEL_VERSION_4_1_0, MODEL_VERSION_4_2_0);
3335

3436
ModelBuilderSession newSession();
3537

‎api/maven-api-model/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ under the License.
4848
<groupId>org.codehaus.modello</groupId>
4949
<artifactId>modello-maven-plugin</artifactId>
5050
<configuration>
51-
<version>4.1.0</version>
51+
<version>4.2.0</version>
5252
<velocityBasedir>${project.basedir}/../../src/mdo</velocityBasedir>
5353
<models>
5454
<model>src/main/mdo/maven.mdo</model>

‎api/maven-api-model/src/main/mdo/maven.mdo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@
526526
<fields>
527527
<field xdoc.separator="blank">
528528
<name>modules</name>
529-
<version>4.0.0/4.1.0</version>
529+
<version>4.0.0/4.2.0</version>
530530
<description>
531531
@deprecated Use {@link #subprojects} instead.
532532
</description>
@@ -540,7 +540,7 @@
540540
</field>
541541
<field xdoc.separator="blank">
542542
<name>subprojects</name>
543-
<version>4.1.0</version>
543+
<version>4.1.0+</version>
544544
<description>The subprojects (formerly called modules) to build as a part of this
545545
project. Each subproject listed is a relative path to the directory containing the subproject.
546546
To be consistent with the way default URLs are calculated from parent, it is recommended

‎compat/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.2.0.xml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!--
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
-->
21+
22+
<!-- START SNIPPET: superpom -->
23+
<project>
24+
<modelVersion>4.0.0</modelVersion>
25+
26+
<properties>
27+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
28+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
29+
<!-- Fixed date for reproducible build -->
30+
<project.build.outputTimestamp>1980-02-01T00:00:00Z</project.build.outputTimestamp>
31+
</properties>
32+
33+
<build>
34+
<directory>${project.basedir}/target</directory>
35+
<outputDirectory>${project.build.directory}/classes</outputDirectory>
36+
<finalName>${project.artifactId}-${project.version}</finalName>
37+
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
38+
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
39+
<scriptSourceDirectory>${project.basedir}/src/main/scripts</scriptSourceDirectory>
40+
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
41+
<resources>
42+
<resource>
43+
<directory>${project.basedir}/src/main/resources</directory>
44+
</resource>
45+
<resource>
46+
<directory>${project.basedir}/src/main/resources-filtered</directory>
47+
<filtering>true</filtering>
48+
</resource>
49+
</resources>
50+
<testResources>
51+
<testResource>
52+
<directory>${project.basedir}/src/test/resources</directory>
53+
</testResource>
54+
<testResource>
55+
<directory>${project.basedir}/src/test/resources-filtered</directory>
56+
<filtering>true</filtering>
57+
</testResource>
58+
</testResources>
59+
</build>
60+
61+
<reporting>
62+
<outputDirectory>${project.build.directory}/site</outputDirectory>
63+
</reporting>
64+
65+
</project>
66+
<!-- END SNIPPET: superpom -->

‎impl/maven-impl/src/main/resources/org/apache/maven/model/pom-4.2.0.xml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!--
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
-->
21+
22+
<!-- START SNIPPET: superpom -->
23+
<project>
24+
<modelVersion>4.0.0</modelVersion>
25+
26+
<properties>
27+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
28+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
29+
<!-- Fixed date for reproducible build -->
30+
<project.build.outputTimestamp>1980-02-01T00:00:00Z</project.build.outputTimestamp>
31+
</properties>
32+
33+
<build>
34+
<directory>${project.basedir}/target</directory>
35+
<outputDirectory>${project.build.directory}/classes</outputDirectory>
36+
<finalName>${project.artifactId}-${project.version}</finalName>
37+
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
38+
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
39+
<scriptSourceDirectory>${project.basedir}/src/main/scripts</scriptSourceDirectory>
40+
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
41+
<resources>
42+
<resource>
43+
<directory>${project.basedir}/src/main/resources</directory>
44+
</resource>
45+
<resource>
46+
<directory>${project.basedir}/src/main/resources-filtered</directory>
47+
<filtering>true</filtering>
48+
</resource>
49+
</resources>
50+
<testResources>
51+
<testResource>
52+
<directory>${project.basedir}/src/test/resources</directory>
53+
</testResource>
54+
<testResource>
55+
<directory>${project.basedir}/src/test/resources-filtered</directory>
56+
<filtering>true</filtering>
57+
</testResource>
58+
</testResources>
59+
</build>
60+
61+
<reporting>
62+
<outputDirectory>${project.build.directory}/site</outputDirectory>
63+
</reporting>
64+
65+
</project>
66+
<!-- END SNIPPET: superpom -->

‎impl/maven-support/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
</goals>
186186
<phase>generate-sources</phase>
187187
<configuration>
188-
<version>4.1.0</version>
188+
<version>4.2.0</version>
189189
<basedir>${project.basedir}/../../api/maven-api-model</basedir>
190190
<velocityBasedir>${project.basedir}/../../src/mdo</velocityBasedir>
191191
<models>

0 commit comments

Comments
 (0)