You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2021/03/21 15:45:14 UTC
[maven] branch MNG-6806 updated (d604e6d -> 1e910b2)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-6806
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard d604e6d Rename to maven-bom Let Maven use its own BOM by lifting up the parent for maven-bom (to prevent cyclic dependency).
discard 67668a0 [MNG-6808] Provide Maven BOM
add d87a1f5 [MNG-7119] Upgrade Maven Wagon to 3.4.3
add 612dfdd [MNG-3220] fix doc: dependencyManagement import require scope import
add acd61cc use Maven Resolver 1.6.2
add 3b21386 [MNG-7116] add support for mirrorOf external:http:*
add 28b4ea9 [MNG-7117] add support for blocked mirror
add 6712567 [MNG-7118] block HTTP repositories by default
add 1e19805 [MNG-6075] Increase the model validation level to the next minor level version
new 1e910b2 [MNG-6808] Provide Maven BOM
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d604e6d)
\
N -- N -- N refs/heads/MNG-6806 (1e910b2)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
apache-maven/src/assembly/maven/conf/settings.xml | 11 +++-
maven-bom/pom.xml | 6 +-
.../maven/repository/DefaultMirrorSelector.java | 41 ++++++++++++-
.../apache/maven/bridge/MavenRepositorySystem.java | 39 +++++++++++-
.../DefaultRepositorySystemSessionFactory.java | 4 +-
.../project/DefaultMavenProjectBuilderTest.java | 2 +
.../maven/model/building/ModelBuildingRequest.java | 2 +-
maven-model-builder/src/site/apt/index.apt | 2 +-
.../validation/DefaultModelValidatorTest.java | 70 ++++++++--------------
maven-settings/pom.xml | 2 +-
maven-settings/src/main/mdo/settings.mdo | 13 ++++
pom.xml | 4 +-
12 files changed, 135 insertions(+), 61 deletions(-)
[maven] 01/01: [MNG-6808] Provide Maven BOM
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6806
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 1e910b2061c9a26fd8c5d4fe0a661cf88077c870
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun Mar 14 19:54:59 2021 +0100
[MNG-6808] Provide Maven BOM
Let Maven use its own BOM by lifting up the parent for maven-bom (to prevent
cyclic dependency).
This closes #457
---
maven-bom/pom.xml | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
pom.xml | 67 +++-----------------------------
2 files changed, 117 insertions(+), 62 deletions(-)
diff --git a/maven-bom/pom.xml b/maven-bom/pom.xml
new file mode 100644
index 0000000..f11a852
--- /dev/null
+++ b/maven-bom/pom.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-parent</artifactId>
+ <version>34</version>
+ <relativePath />
+ </parent>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-bom</artifactId>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
+
+ <name>Maven Dependecies BOM</name>
+ <description>Bill Of Materials for Apache Maven dependencies</description>
+
+ <dependencyManagement>
+ <!-- Not included:
+ - apache-maven, as it delivers the binaries
+ - maven-compat, only used by apache-maven distributions to support older releases
+ - maven-slf4j-provider, only used by apache-maven distributions
+ - maven-test-support, only for internal test usage
+ - maven-wrapper, only used by apache-maven-wrapper distributions -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-builder-support</artifactId>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-embedder</artifactId>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model-builder</artifactId>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-repository-metadata</artifactId>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-resolver-provider</artifactId>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings-builder</artifactId>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-slf4j-wrapper</artifactId>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-xml</artifactId>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
diff --git a/pom.xml b/pom.xml
index 2d41452..34c2341 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,7 @@ under the License.
</properties>
<modules>
+ <module>maven-bom</module>
<module>maven-test-support</module>
<module>maven-plugin-api</module>
<module>maven-builder-support</module>
@@ -186,43 +187,10 @@ under the License.
<!--bootstrap-start-comment-->
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-test-support</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-settings</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-settings-builder</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-embedder</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model-builder</artifactId>
+ <artifactId>maven-bom</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -231,22 +199,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-resolver-provider</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-repository-metadata</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-builder-support</artifactId>
+ <artifactId>maven-test-support</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -254,16 +207,6 @@ under the License.
<artifactId>maven-slf4j-provider</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-slf4j-wrapper</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-xml</artifactId>
- <version>${project.version}</version>
- </dependency>
<!--bootstrap-end-comment-->
<!-- Plexus -->
<dependency>