You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mt...@apache.org on 2021/10/13 10:13:10 UTC
[maven] 05/05: [MNG-6389] Resolve PR feedback
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 78de56cad43914cc86f88c06516210988ea7bd0f
Author: Giovanni van der Schelde <Gi...@infosupport.com>
AuthorDate: Wed Oct 13 12:11:09 2021 +0200
[MNG-6389] Resolve PR feedback
---
maven-core/pom.xml | 2 ++
.../building/DefaultToolchainsBuildingResult.java | 6 +++---
.../toolchain/building/ToolchainsBuildingException.java | 4 ++--
.../toolchain/building/ToolchainsBuildingResult.java | 4 ++--
.../maven/toolchain/io/DefaultToolchainsReader.java | 15 ++++++++-------
.../org/apache/maven/toolchain/io/ToolchainsReader.java | 4 ++--
.../maven/toolchain/merge/MavenToolchainMerger.java | 8 ++++----
7 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 9e12f98..f46fdeb 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -220,10 +220,12 @@ under the License.
<artifactId>modello-maven-plugin</artifactId>
<configuration>
<version>1.1.0</version>
+ <!-- This is a required attribute and is intentionally left empty -->
<models></models>
</configuration>
<executions>
<execution>
+ <!-- This step is required to generate xdoc, and does not generate java code -->
<id>modello-site-doc</id>
<phase>pre-site</phase>
<goals>
diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
index fd96162..2d07a4a 100644
--- a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
+++ b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
@@ -19,12 +19,12 @@ package org.apache.maven.toolchain.building;
* under the License.
*/
-import org.apache.maven.building.Problem;
-import org.apache.maven.toolchain.model.PersistedToolchains;
-
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.building.Problem;
+import org.apache.maven.toolchain.model.PersistedToolchains;
+
/**
* Holds the result of the merged toolchains and holds the problems during this build, if any.
*
diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java
index dce9e5c..ccd354b 100644
--- a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java
+++ b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java
@@ -19,13 +19,13 @@ package org.apache.maven.toolchain.building;
* under the License.
*/
-import org.apache.maven.building.Problem;
-
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.building.Problem;
+
/**
* @author Robert Scholte
* @since 3.3.0
diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
index 4ec3ee6..f7c5f71 100644
--- a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
+++ b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
@@ -19,11 +19,11 @@ package org.apache.maven.toolchain.building;
* under the License.
*/
+import java.util.List;
+
import org.apache.maven.building.Problem;
import org.apache.maven.toolchain.model.PersistedToolchains;
-import java.util.List;
-
/**
* Collects the output of the toolchains builder.
*
diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
index 4d766a1..2522551 100644
--- a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
+++ b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
@@ -19,13 +19,6 @@ package org.apache.maven.toolchain.io;
* 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;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -33,6 +26,14 @@ import java.io.Reader;
import java.util.Map;
import java.util.Objects;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+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;
+
/**
* Handles deserialization of toolchains from the default textual format.
*
diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java
index 306b832..44dc2bd 100644
--- a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java
+++ b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java
@@ -19,14 +19,14 @@ package org.apache.maven.toolchain.io;
* under the License.
*/
-import org.apache.maven.toolchain.model.PersistedToolchains;
-
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.util.Map;
+import org.apache.maven.toolchain.model.PersistedToolchains;
+
/**
* Handles deserialization of toolchains from some kind of textual format like XML.
*
diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java
index b477f82..11436fe 100644
--- a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java
+++ b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java
@@ -19,14 +19,14 @@ package org.apache.maven.toolchain.merge;
* under the License.
*/
-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;
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;
+
/**
*
* @author Robert Scholte