Merge branch 'refs/heads/master' into MNG-8524

# Conflicts:
#	impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsBuilder.java
#	impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultToolchainsBuilder.java
#	impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/ConditionProfileActivator.java

Author: CrazyHZM

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

@@ -173,7 +173,7 @@ under the License.
   <repositories>
     <repository>
       <id>central</id>
-      <name>Central Repository</name>
+      <name>Maven Central Repository</name>
       <url>${maven.repo.central}</url>
       <snapshots>
         <enabled>false</enabled>
@@ -187,7 +187,7 @@ under the License.
   <pluginRepositories>
     <pluginRepository>
       <id>central</id>
-      <name>Central Repository</name>
+      <name>Maven Central Repository</name>
       <url>${maven.repo.central}</url>
       <snapshots>
         <enabled>false</enabled>

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

@@ -546,9 +546,9 @@
           <type>String</type>
           <description>
             <![CDATA[
-            A repository id or (since Maven 2.0.9) an expression matching one or many repository ids to mirror, e.g.,
+            A repository id or an expression matching one or many repository ids to mirror, e.g.,
             <code>central</code> or <code>*,!repo1</code>.
-            <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
+            <code>*</code>, <code>external:*</code> and <code>external:http:*</code> (since Maven 3.8.0) have
             a special meaning: see <a href="/guides/mini/guide-mirror-settings.html">Mirror Settings</a> guide.
             ]]>
           </description>
@@ -896,7 +896,7 @@
           <version>1.0.0+</version>
           <description>
             What to do when verification of an artifact checksum fails. Valid values are "fail" (default for Maven 4 and
-            above), "warn" (default for Maven 2 and 3) or "ignore".
+            above), "warn" (default for Maven 3) or "ignore".
           </description>
           <type>String</type>
         </field>

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

@@ -136,7 +136,7 @@
         <field>
           <name>provides</name>
           <version>1.0.0/1.0.99</version> <!-- fake upperbound, it's inclusive -->
-          <type>DOM</type> <!-- DOM for Maven 2.0.9/2.3.3 -->
+          <type>DOM</type>
           <description>
             Toolchain identification information, which will be matched against project requirements.
             &lt;p>Actual content structure is completely open: each toolchain type will define its own format and
@@ -148,18 +148,14 @@
         <field>
           <name>provides</name>
           <version>1.1.0+</version>
-          <type>Properties</type> <!-- Properties for Maven 2.3.4+ -->
+          <type>Properties</type>
           <association xml.mapStyle="inline">
             <type>String</type>
             <multiplicity>*</multiplicity>
           </association>
           <!-- <identifier>true</identifier> -->
           <description>
             Toolchain identification information, which will be matched against project requirements.
-            &lt;p>For Maven 2.0.9 to 3.2.3, the actual content structure was completely open: each toolchain type would
-            define its own format and semantics. This was generally a properties format.
-            &lt;p>Since Maven 3.2.4, the type for this field has been changed to Properties to match the de-facto
-            format.
             &lt;p>Each toolchain defines its own properties names and semantics.
           </description>
         </field>

compat/maven-builder-support/pom.xml

@@ -30,10 +30,15 @@ under the License.
 
   <artifactId>maven-builder-support</artifactId>
 
-  <name>Maven Builder Support</name>
+  <name>Maven Builder Support (deprecated)</name>
   <description>Support for descriptor builders (model, setting, toolchains)</description>
 
   <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-api-core</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>

compat/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java

@@ -23,7 +23,9 @@
  * thrown or a simple string message. In addition, a problem carries a hint about its source, e.g. the settings file
  * that exhibits the problem.
  *
+ * @deprecated since 4.0.0, use {@link org.apache.maven.api.services} instead
  */
+@Deprecated(since = "4.0.0")
 class DefaultProblem implements Problem {
 
     private final String source;

compat/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblemCollector.java

@@ -24,7 +24,9 @@
 /**
  * Collects problems that are encountered during settings building.
  *
+ * @deprecated since 4.0.0, use {@link org.apache.maven.api.services} instead
  */
+@Deprecated(since = "4.0.0")
 class DefaultProblemCollector implements ProblemCollector {
 
     private final List<Problem> problems;

compat/maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java

@@ -28,7 +28,9 @@
 /**
  * Wraps an ordinary {@link File} as a source.
  *
+ * @deprecated since 4.0.0, use {@link org.apache.maven.api.services} instead
  */
+@Deprecated(since = "4.0.0")
 public class FileSource implements Source {
     private final Path path;
 

compat/maven-builder-support/src/main/java/org/apache/maven/building/Problem.java

@@ -23,7 +23,9 @@
  * thrown or a simple string message. In addition, a problem carries a hint about its source, e.g. the settings file
  * that exhibits the problem.
  *
+ * @deprecated since 4.0.0, use {@link org.apache.maven.api.services} instead
  */
+@Deprecated(since = "4.0.0")
 public interface Problem {
 
     /**

compat/maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollector.java

@@ -23,7 +23,9 @@
 /**
  * Collects problems that are encountered during settings building.
  *
+ * @deprecated since 4.0.0, use {@link org.apache.maven.api.services} instead
  */
+@Deprecated(since = "4.0.0")
 public interface ProblemCollector {
 
     /**

compat/maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollectorFactory.java

@@ -23,7 +23,9 @@
 /**
  *
  * @since 3.3.0
+ * @deprecated since 4.0.0, use {@link org.apache.maven.api.services} instead
  */
+@Deprecated(since = "4.0.0")
 public class ProblemCollectorFactory {
 
     /**