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 2020/12/13 20:25:07 UTC
[maven] branch MNG-6957 updated: Adjustments based on review
comments
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-6957
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/MNG-6957 by this push:
new aab4950 Adjustments based on review comments
aab4950 is described below
commit aab495056842cf1c02c5a72786e6175bb3a46534
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun Dec 13 21:24:52 2020 +0100
Adjustments based on review comments
---
.../main/java/org/apache/maven/project/DefaultProjectBuilder.java | 8 ++++----
.../java/org/apache/maven/model/building/DefaultModelBuilder.java | 2 +-
.../apache/maven/model/building/DefaultTransformerContext.java | 2 +-
.../java/org/apache/maven/model/building/ModelBuildingResult.java | 2 +-
.../main/java/org/apache/maven/model/building/ModelCacheTag.java | 2 +-
.../apache/maven/model/building/TransformerContextBuilder.java | 2 +-
.../java/org/apache/maven/xml/sax/filter/ParentXMLFilterTest.java | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index bf9bdcc..851f2cc 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -271,7 +271,7 @@ public class DefaultProjectBuilder
{
ProjectBuildingRequest configuration = config.request;
- DefaultModelBuildingRequest request = new DefaultModelBuildingRequest();
+ ModelBuildingRequest request = new DefaultModelBuildingRequest();
RequestTrace trace = RequestTrace.newChild( null, configuration ).newChild( request );
@@ -391,12 +391,12 @@ public class DefaultProjectBuilder
boolean noErrors =
build( results, interimResults, projectIndex, pomFiles, new LinkedHashSet<>(), true, recursive,
config, poolBuilder );
-
+
ClassLoader oldContextClassLoader = Thread.currentThread().getContextClassLoader();
try
{
- // Phase 2: get effective from the reactor
+ // Phase 2: get effective models from the reactor
noErrors =
build( results, new ArrayList<>(), projectIndex, interimResults, request,
new HashMap<>(), config.session ) && noErrors;
@@ -489,7 +489,7 @@ public class DefaultProjectBuilder
InterimResult interimResult = new InterimResult( pomFile, request, result, listener, isRoot );
interimResults.add( interimResult );
-
+
if ( recursive )
{
File basedir = pomFile.getParentFile();
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index f9ca3a4..5c80e03 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -1793,7 +1793,7 @@ public class DefaultModelBuilder
* This is an inner class, as it must be able to call readRawModel()
*
* @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
*/
private class DefaultTransformerContextBuilder implements TransformerContextBuilder
{
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContext.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContext.java
index 48b60c2..8ca36bc 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContext.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContext.java
@@ -29,7 +29,7 @@ import org.apache.maven.model.Model;
/**
*
* @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
*/
class DefaultTransformerContext implements TransformerContext
{
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java
index 4937055..f9615c8 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java
@@ -45,7 +45,7 @@ public interface ModelBuildingResult
/**
*
* @return the file model
- * @since 3.7.0
+ * @since 4.0.0
*/
Model getFileModel();
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java
index cbbc155..c6fdc1c 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java
@@ -131,7 +131,7 @@ interface ModelCacheTag<T>
/**
* The tag used for the file model without profile activation
- * @since 3.7.0
+ * @since 4.0.0
*/
ModelCacheTag<Model> FILE = new ModelCacheTag<Model>()
{
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerContextBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerContextBuilder.java
index 932c581..a10798e 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerContextBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerContextBuilder.java
@@ -24,7 +24,7 @@ package org.apache.maven.model.building;
* In case rawModels are missing, it could do new buildingRequests on the ModelBuilder.
*
* @author Robert Scholte
- * @since 3.7.0
+ * @since 4.0.0
*/
public interface TransformerContextBuilder
{
diff --git a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ParentXMLFilterTest.java b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ParentXMLFilterTest.java
index 0e41da1..5cbf707 100644
--- a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ParentXMLFilterTest.java
+++ b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ParentXMLFilterTest.java
@@ -107,7 +107,7 @@ public class ParentXMLFilterTest extends AbstractXMLFilterTests
+ "<groupId>GROUPID</groupId>"
+ "<artifactId>ARTIFACTID</artifactId>"
+ "<relativePath/>" // SAX optimization, however "" != null ...
- + "</parent>";;
+ + "</parent>";
String actual = transform( input );