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 <[email protected]> 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>
