This is an automated email from the ASF dual-hosted git repository. mthmulders pushed a commit to branch MNG-6389-introduce-seperate-toolchain-artifact in repository https://gitbox.apache.org/repos/asf/maven.git
commit 049a72ccfe22a3187cf0553d75117a1e383625cd Author: Giovanni van der Schelde <[email protected]> AuthorDate: Wed Sep 29 13:44:08 2021 +0200 [MNG-6389] Move toolchain model to seperate module --- maven-bom/pom.xml | 5 ++ maven-core/pom.xml | 8 ++-- maven-toolchain-model/pom.xml | 56 ++++++++++++++++++++++ .../src/main/mdo/toolchains.mdo | 0 pom.xml | 1 + 5 files changed, 67 insertions(+), 3 deletions(-) diff --git a/maven-bom/pom.xml b/maven-bom/pom.xml index 3f9f983..4385302 100644 --- a/maven-bom/pom.xml +++ b/maven-bom/pom.xml @@ -130,6 +130,11 @@ under the License. </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-toolchain-model</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-slf4j-wrapper</artifactId> <version>${project.version}</version> </dependency> diff --git a/maven-core/pom.xml b/maven-core/pom.xml index dd1b72b..cf9ea01 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -54,6 +54,10 @@ under the License. </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-toolchain-model</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-repository-metadata</artifactId> </dependency> <dependency> @@ -212,9 +216,7 @@ under the License. <artifactId>modello-maven-plugin</artifactId> <configuration> <version>1.1.0</version> - <models> - <model>src/main/mdo/toolchains.mdo</model> - </models> + <models></models> </configuration> <executions> <execution> diff --git a/maven-toolchain-model/pom.xml b/maven-toolchain-model/pom.xml new file mode 100644 index 0000000..e824643 --- /dev/null +++ b/maven-toolchain-model/pom.xml @@ -0,0 +1,56 @@ +<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <parent> + <artifactId>maven</artifactId> + <groupId>org.apache.maven</groupId> + <version>4.0.0-alpha-1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>maven-toolchain-model</artifactId> + + <dependencies> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.modello</groupId> + <artifactId>modello-maven-plugin</artifactId> + <configuration> + <version>1.1.0</version> + <models> + <model>src/main/mdo/toolchains.mdo</model> + </models> + </configuration> + </plugin> + </plugins> + </build> + +</project> diff --git a/maven-core/src/main/mdo/toolchains.mdo b/maven-toolchain-model/src/main/mdo/toolchains.mdo similarity index 100% rename from maven-core/src/main/mdo/toolchains.mdo rename to maven-toolchain-model/src/main/mdo/toolchains.mdo diff --git a/pom.xml b/pom.xml index 49875c5..2a516c6 100644 --- a/pom.xml +++ b/pom.xml @@ -98,6 +98,7 @@ under the License. <module>apache-maven</module> <!-- rename to apache-maven/maven.pom after RAT-268 --> <module>maven-wrapper</module> <module>apache-maven/maven-wrapper.pom</module> + <module>maven-toolchain-model</module> </modules> <scm>
