You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2021/03/15 18:48:22 UTC
[maven] branch MNG-6806 updated: Rename to maven-bom Let Maven use
its own BOM by lifting up the parent for maven-bom (to prevent cyclic
dependency).
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-6806
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/MNG-6806 by this push:
new d604e6d Rename to maven-bom Let Maven use its own BOM by lifting up the parent for maven-bom (to prevent cyclic dependency).
d604e6d is described below
commit d604e6d62a5334236ed2e7185018ddf38c72e77b
Author: rfscholte <rf...@apache.org>
AuthorDate: Mon Mar 15 19:46:53 2021 +0100
Rename to maven-bom
Let Maven use its own BOM by lifting up the parent for maven-bom (to prevent cyclic dependency).
---
{maven-dependencies => maven-bom}/pom.xml | 12 +++---
pom.xml | 68 +++----------------------------
2 files changed, 12 insertions(+), 68 deletions(-)
diff --git a/maven-dependencies/pom.xml b/maven-bom/pom.xml
similarity index 93%
rename from maven-dependencies/pom.xml
rename to maven-bom/pom.xml
index 17cf6f0..4dd8e1e 100644
--- a/maven-dependencies/pom.xml
+++ b/maven-bom/pom.xml
@@ -23,11 +23,13 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven</groupId>
- <artifactId>maven</artifactId>
- <version>4.0.0-alpha-1-SNAPSHOT</version>
+ <artifactId>maven-parent</artifactId>
+ <version>34</version>
+ <relativePath />
</parent>
- <artifactId>maven-dependencies</artifactId>
- <packaging>jar</packaging>
+ <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>
@@ -47,7 +49,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>builder-support</artifactId>
+ <artifactId>maven-builder-support</artifactId>
<version>4.0.0-alpha-1-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index b272a14..15ab53a 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>
@@ -101,7 +102,6 @@ under the License.
<module>maven-wrapper</module>
<module>apache-maven/maven-wrapper.pom</module>
<module>maven-xml</module>
- <module>maven-dependencies</module>
</modules>
<scm>
@@ -187,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>
@@ -232,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>
@@ -255,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>