You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@maven.apache.org by GitBox <gi...@apache.org> on 2021/10/13 07:29:34 UTC
[GitHub] [maven] Giovds opened a new pull request #586: [MNG-6389] Introduce separate toolchain artifact
Giovds opened a new pull request #586:
URL: https://github.com/apache/maven/pull/586
Following this checklist to help us incorporate your
contribution quickly and easily:
- [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/MNG) filed
for the change (usually before you start working on it). Trivial changes like typos do not
require a JIRA issue. Your pull request should address just this issue, without
pulling in other changes.
- [ ] Each commit in the pull request should have a meaningful subject line and body.
- [ ] Format the pull request title like `[MNG-XXX] - Fixes bug in ApproximateQuantiles`,
where you replace `MNG-XXX` with the appropriate JIRA issue. Best practice
is to use the JIRA issue title in the pull request title and in the first line of the
commit message.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Run `mvn clean verify` to make sure basic checks pass. A more thorough check will
be performed on your pull request automatically.
- [ ] You have run the [Core IT][core-its] successfully.
If your pull request is about ~20 lines of code you don't need to sign an
[Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf) if you are unsure
please ask on the developers list.
To make clear that you license your contribution under
the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0)
you have to acknowledge this by using the following check-box.
- [ ] I hereby declare this contribution to be licenced under the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0)
- [ ] In any other case, please file an [Apache Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
[core-its]: https://maven.apache.org/core-its/core-it-suite/
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] mthmulders commented on pull request #586: [MNG-6389] Move the toolchains model to a separate artifactId
Posted by GitBox <gi...@apache.org>.
mthmulders commented on pull request #586:
URL: https://github.com/apache/maven/pull/586#issuecomment-942348638
Thanks for the review, @michael-o.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] mthmulders commented on a change in pull request #586: [MNG-6389] Introduce separate toolchain artifact
Posted by GitBox <gi...@apache.org>.
mthmulders commented on a change in pull request #586:
URL: https://github.com/apache/maven/pull/586#discussion_r727896943
##########
File path: maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extend.xml
##########
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF8"?>
+
+<!--
+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.
+-->
+
+<toolchains>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>1.5</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>${env.JAVA_HOME}</jdkHome>
Review comment:
This file was supposed to be _moved_ rather than added; it contains nothing new or changed. I've removed the original copy of the file.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] mthmulders commented on a change in pull request #586: [MNG-6389] Introduce separate toolchain artifact
Posted by GitBox <gi...@apache.org>.
mthmulders commented on a change in pull request #586:
URL: https://github.com/apache/maven/pull/586#discussion_r727896943
##########
File path: maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extend.xml
##########
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF8"?>
+
+<!--
+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.
+-->
+
+<toolchains>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>1.5</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>${env.JAVA_HOME}</jdkHome>
Review comment:
This file was supposed to be _moved_ rather than added; it contains nothing new or changed. I've removed the original copy of the file.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] michael-o commented on a change in pull request #586: [MNG-6389] Introduce separate toolchain artifact
Posted by GitBox <gi...@apache.org>.
michael-o commented on a change in pull request #586:
URL: https://github.com/apache/maven/pull/586#discussion_r727832515
##########
File path: maven-core/pom.xml
##########
@@ -212,9 +220,7 @@ under the License.
<artifactId>modello-maven-plugin</artifactId>
Review comment:
If there are no models anymore, why not throw out the plugin altogether from this module?
##########
File path: maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java
##########
@@ -19,13 +19,13 @@
* under the License.
*/
+import org.apache.maven.building.Problem;
Review comment:
Please drop this change to reduce the diff.
##########
File path: maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
##########
@@ -19,21 +19,20 @@
* under the License.
*/
+import org.apache.maven.toolchain.model.PersistedToolchains;
+import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
+import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
Review comment:
Please drop this change to reduce the diff.
##########
File path: maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java
##########
@@ -19,14 +19,14 @@
* under the License.
*/
+import org.apache.maven.toolchain.model.PersistedToolchains;
Review comment:
Please drop this change to reduce the diff.
##########
File path: maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
##########
@@ -19,11 +19,11 @@
* under the License.
*/
-import java.util.List;
-
import org.apache.maven.building.Problem;
import org.apache.maven.toolchain.model.PersistedToolchains;
+import java.util.List;
Review comment:
Please drop this change to reduce the diff.
##########
File path: maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extend.xml
##########
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF8"?>
+
+<!--
+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.
+-->
+
+<toolchains>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>1.5</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>${env.JAVA_HOME}</jdkHome>
Review comment:
Attention: This might fail becuase Maven 4 itself does not require `JAVA_HOME` to be set.
##########
File path: maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java
##########
@@ -19,14 +19,14 @@
* under the License.
*/
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.maven.toolchain.model.PersistedToolchains;
import org.apache.maven.toolchain.model.ToolchainModel;
import org.codehaus.plexus.util.xml.Xpp3Dom;
+import java.util.LinkedHashMap;
Review comment:
Please drop this change to reduce the diff.
##########
File path: maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
##########
@@ -19,12 +19,12 @@
* under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.maven.building.Problem;
import org.apache.maven.toolchain.model.PersistedToolchains;
+import java.util.ArrayList;
+import java.util.List;
Review comment:
Please drop this change to reduce the diff.
##########
File path: maven-toolchain-builder/pom.xml
##########
@@ -0,0 +1,70 @@
+<?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-builder</artifactId>
+
+ <name>Maven Toolchain Builder</name>
+ <description>The effective toolchain builder.</description>
Review comment:
Is this desc similar to model and settings builder?
##########
File path: maven-core/pom.xml
##########
@@ -212,9 +220,7 @@ under the License.
<artifactId>modello-maven-plugin</artifactId>
Review comment:
Ah ok, please add a comment for that in the POM.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] asfgit closed pull request #586: [MNG-6389] Move the toolchains model to a separate artifactId
Posted by GitBox <gi...@apache.org>.
asfgit closed pull request #586:
URL: https://github.com/apache/maven/pull/586
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] michael-o commented on pull request #586: [MNG-6389] Introduce separate toolchain artifact
Posted by GitBox <gi...@apache.org>.
michael-o commented on pull request #586:
URL: https://github.com/apache/maven/pull/586#issuecomment-942311718
Running tests...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] mthmulders commented on pull request #586: [MNG-6389] Introduce separate toolchain artifact
Posted by GitBox <gi...@apache.org>.
mthmulders commented on pull request #586:
URL: https://github.com/apache/maven/pull/586#issuecomment-942107674
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] michael-o commented on pull request #586: [MNG-6389] Introduce separate toolchain artifact
Posted by GitBox <gi...@apache.org>.
michael-o commented on pull request #586:
URL: https://github.com/apache/maven/pull/586#issuecomment-942066067
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] Giovds commented on a change in pull request #586: [MNG-6389] Introduce separate toolchain artifact
Posted by GitBox <gi...@apache.org>.
Giovds commented on a change in pull request #586:
URL: https://github.com/apache/maven/pull/586#discussion_r727886446
##########
File path: maven-core/pom.xml
##########
@@ -212,9 +220,7 @@ under the License.
<artifactId>modello-maven-plugin</artifactId>
Review comment:
The `<models></models>` attribute is unfortunately a [required](https://codehaus-plexus.github.io/modello/modello-maven-plugin/generate-mojo.html) element in the plugin configuration, therefore it can not be removed. This plugin needs to stay, because of the `modello-site-doc` execution. However [that model](https://github.com/apache/maven/blob/0080e845884922814d26914d0ae9f59b084bee35/maven-core/src/main/mdo/extension.mdo#L33) must explicitly not generate java code.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] asfgit closed pull request #586: [MNG-6389] Move the toolchains model to a separate artifactId
Posted by GitBox <gi...@apache.org>.
asfgit closed pull request #586:
URL: https://github.com/apache/maven/pull/586
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] mthmulders commented on pull request #586: [MNG-6389] Introduce separate toolchain artifact
Posted by GitBox <gi...@apache.org>.
mthmulders commented on pull request #586:
URL: https://github.com/apache/maven/pull/586#issuecomment-942107674
Running through [Jenkins](https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven/job/MNG-6389-introduce-seperate-toolchain-artifact/).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] Giovds commented on a change in pull request #586: [MNG-6389] Introduce separate toolchain artifact
Posted by GitBox <gi...@apache.org>.
Giovds commented on a change in pull request #586:
URL: https://github.com/apache/maven/pull/586#discussion_r727900826
##########
File path: maven-toolchain-builder/pom.xml
##########
@@ -0,0 +1,70 @@
+<?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-builder</artifactId>
+
+ <name>Maven Toolchain Builder</name>
+ <description>The effective toolchain builder.</description>
Review comment:
Yes. [model](https://github.com/apache/maven/blob/0080e845884922814d26914d0ae9f59b084bee35/maven-settings/pom.xml#L34) and [builder](https://github.com/apache/maven/blob/0080e845884922814d26914d0ae9f59b084bee35/maven-settings-builder/pom.xml#L34)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] michael-o commented on pull request #586: [MNG-6389] Introduce separate toolchain artifact
Posted by GitBox <gi...@apache.org>.
michael-o commented on pull request #586:
URL: https://github.com/apache/maven/pull/586#issuecomment-942066067
Very nice...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] Giovds commented on a change in pull request #586: [MNG-6389] Introduce separate toolchain artifact
Posted by GitBox <gi...@apache.org>.
Giovds commented on a change in pull request #586:
URL: https://github.com/apache/maven/pull/586#discussion_r727886446
##########
File path: maven-core/pom.xml
##########
@@ -212,9 +220,7 @@ under the License.
<artifactId>modello-maven-plugin</artifactId>
Review comment:
The `<models></models>` attribute is unfortunately a [required](https://codehaus-plexus.github.io/modello/modello-maven-plugin/generate-mojo.html) element in the plugin configuration, therefore it can not be removed. This plugin needs to stay, because of the `modello-site-doc` execution. However [that model](https://github.com/apache/maven/blob/0080e845884922814d26914d0ae9f59b084bee35/maven-core/src/main/mdo/extension.mdo#L33) must explicitly not generate java code.
##########
File path: maven-toolchain-builder/pom.xml
##########
@@ -0,0 +1,70 @@
+<?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-builder</artifactId>
+
+ <name>Maven Toolchain Builder</name>
+ <description>The effective toolchain builder.</description>
Review comment:
Yes. [model](https://github.com/apache/maven/blob/0080e845884922814d26914d0ae9f59b084bee35/maven-settings/pom.xml#L34) and [builder](https://github.com/apache/maven/blob/0080e845884922814d26914d0ae9f59b084bee35/maven-settings-builder/pom.xml#L34)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] michael-o commented on a change in pull request #586: [MNG-6389] Introduce separate toolchain artifact
Posted by GitBox <gi...@apache.org>.
michael-o commented on a change in pull request #586:
URL: https://github.com/apache/maven/pull/586#discussion_r727832515
##########
File path: maven-core/pom.xml
##########
@@ -212,9 +220,7 @@ under the License.
<artifactId>modello-maven-plugin</artifactId>
Review comment:
If there are no models anymore, why not throw out the plugin altogether from this module?
##########
File path: maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java
##########
@@ -19,13 +19,13 @@
* under the License.
*/
+import org.apache.maven.building.Problem;
Review comment:
Please drop this change to reduce the diff.
##########
File path: maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
##########
@@ -19,21 +19,20 @@
* under the License.
*/
+import org.apache.maven.toolchain.model.PersistedToolchains;
+import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
+import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
Review comment:
Please drop this change to reduce the diff.
##########
File path: maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java
##########
@@ -19,14 +19,14 @@
* under the License.
*/
+import org.apache.maven.toolchain.model.PersistedToolchains;
Review comment:
Please drop this change to reduce the diff.
##########
File path: maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
##########
@@ -19,11 +19,11 @@
* under the License.
*/
-import java.util.List;
-
import org.apache.maven.building.Problem;
import org.apache.maven.toolchain.model.PersistedToolchains;
+import java.util.List;
Review comment:
Please drop this change to reduce the diff.
##########
File path: maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extend.xml
##########
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF8"?>
+
+<!--
+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.
+-->
+
+<toolchains>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>1.5</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>${env.JAVA_HOME}</jdkHome>
Review comment:
Attention: This might fail becuase Maven 4 itself does not require `JAVA_HOME` to be set.
##########
File path: maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java
##########
@@ -19,14 +19,14 @@
* under the License.
*/
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.maven.toolchain.model.PersistedToolchains;
import org.apache.maven.toolchain.model.ToolchainModel;
import org.codehaus.plexus.util.xml.Xpp3Dom;
+import java.util.LinkedHashMap;
Review comment:
Please drop this change to reduce the diff.
##########
File path: maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
##########
@@ -19,12 +19,12 @@
* under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.maven.building.Problem;
import org.apache.maven.toolchain.model.PersistedToolchains;
+import java.util.ArrayList;
+import java.util.List;
Review comment:
Please drop this change to reduce the diff.
##########
File path: maven-toolchain-builder/pom.xml
##########
@@ -0,0 +1,70 @@
+<?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-builder</artifactId>
+
+ <name>Maven Toolchain Builder</name>
+ <description>The effective toolchain builder.</description>
Review comment:
Is this desc similar to model and settings builder?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] michael-o commented on a change in pull request #586: [MNG-6389] Introduce separate toolchain artifact
Posted by GitBox <gi...@apache.org>.
michael-o commented on a change in pull request #586:
URL: https://github.com/apache/maven/pull/586#discussion_r727887272
##########
File path: maven-core/pom.xml
##########
@@ -212,9 +220,7 @@ under the License.
<artifactId>modello-maven-plugin</artifactId>
Review comment:
Ah ok, please add a comment for that in the POM.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org