Skip to content

Commit 99f2b64

Browse files
authored
[MNGSITE-393] Remove references to Maven 2.x (#2024)
1 parent e33e900 commit 99f2b64

File tree

4 files changed

+7
-13
lines changed

4 files changed

+7
-13
lines changed

api/maven-api-settings/src/main/mdo/settings.mdo

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -546,9 +546,9 @@
546546
<type>String</type>
547547
<description>
548548
<![CDATA[
549-
A repository id or (since Maven 2.0.9) an expression matching one or many repository ids to mirror, e.g.,
549+
A repository id or an expression matching one or many repository ids to mirror, e.g.,
550550
<code>central</code> or <code>*,!repo1</code>.
551-
<code>*</code> (since Maven 2.0.5), <code>external:*</code> (since Maven 2.0.9) and <code>external:http:*</code> (since Maven 3.8.0) have
551+
<code>*</code>, <code>external:*</code> and <code>external:http:*</code> (since Maven 3.8.0) have
552552
a special meaning: see <a href="/guides/mini/guide-mirror-settings.html">Mirror Settings</a> guide.
553553
]]>
554554
</description>
@@ -896,7 +896,7 @@
896896
<version>1.0.0+</version>
897897
<description>
898898
What to do when verification of an artifact checksum fails. Valid values are "fail" (default for Maven 4 and
899-
above), "warn" (default for Maven 2 and 3) or "ignore".
899+
above), "warn" (default for Maven 3) or "ignore".
900900
</description>
901901
<type>String</type>
902902
</field>

api/maven-api-toolchain/src/main/mdo/toolchains.mdo

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
<field>
137137
<name>provides</name>
138138
<version>1.0.0/1.0.99</version> <!-- fake upperbound, it's inclusive -->
139-
<type>DOM</type> <!-- DOM for Maven 2.0.9/2.3.3 -->
139+
<type>DOM</type>
140140
<description>
141141
Toolchain identification information, which will be matched against project requirements.
142142
&lt;p>Actual content structure is completely open: each toolchain type will define its own format and
@@ -148,18 +148,14 @@
148148
<field>
149149
<name>provides</name>
150150
<version>1.1.0+</version>
151-
<type>Properties</type> <!-- Properties for Maven 2.3.4+ -->
151+
<type>Properties</type>
152152
<association xml.mapStyle="inline">
153153
<type>String</type>
154154
<multiplicity>*</multiplicity>
155155
</association>
156156
<!-- <identifier>true</identifier> -->
157157
<description>
158158
Toolchain identification information, which will be matched against project requirements.
159-
&lt;p>For Maven 2.0.9 to 3.2.3, the actual content structure was completely open: each toolchain type would
160-
define its own format and semantics. This was generally a properties format.
161-
&lt;p>Since Maven 3.2.4, the type for this field has been changed to Properties to match the de-facto
162-
format.
163159
&lt;p>Each toolchain defines its own properties names and semantics.
164160
</description>
165161
</field>

compat/maven-compat/src/main/mdo/profiles.mdo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ under the License.
2424
<id>profiles</id>
2525
<name>Profiles</name>
2626
<description><![CDATA[
27-
<b>Deprecated in Maven 2</b> Project-local overrides to the build process based on detected or user-provided environmental parameters.
27+
<b>Deprecated</b> Project-local overrides to the build process based on detected or user-provided environmental parameters.
2828
This is the model specification for <code>${basedir}/profiles.xml</code>.
2929
]]></description>
3030
<defaults>
@@ -309,7 +309,7 @@ under the License.
309309
<version>1.0.0</version>
310310
<description>
311311
What to do when verification of an artifact checksum fails. Valid values are "fail" (default for Maven 4 and
312-
above), "warn" (default for Maven 2 and 3) or "ignore".
312+
above), "warn" (default for Maven 3) or "ignore".
313313
</description>
314314
<type>String</type>
315315
</field>

impl/maven-core/plugin-manager.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ h4. Working with POMs during development
103103

104104
During the development of a plugin we would want to make it easy for a developer to create a plugin which means we would allow the direct use of a POM to state the dependencies of a given plugin and any tooling we created would be responsible for turning the dependency information in the POM into plugin metadata which described the dependencies of the plugin.
105105

106-
We are looking at using Mercury for the resolution and retrieval of the plugin dependencies so during development we would translate the POMs into dependency information that Mercury can understand, and in production we would have the pre-digested format that Mercury could utilize to resolve and retrieve dependencies. We need to be careful that we are using Mercury during development and production so that we don’t get in the situation where Maven 2.x is resolving differently than Mercury is. We can still leverage POMs during development but we need to make sure Mercury is doing the work.
107-
108106
With respect to development inside an IDE the workspace from which we would like to resolve and retrieve dependencies is a read-only local repository to Mercury which is put at the front-end of the search order of any repository that Mercury will consult for artifacts.
109107

110108
h4. Generation of plugin metadata and packaging

0 commit comments

Comments
 (0)