You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2021/01/30 22:05:09 UTC
[maven] branch avoid-empty-locations updated (d08e3ef -> ceb08cf)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch avoid-empty-locations
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard d08e3ef Test for empty locations and avoid printing them
new ceb08cf Test for empty locations and avoid printing them
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d08e3ef)
\
N -- N -- N refs/heads/avoid-empty-locations (ceb08cf)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/maven/model/building/DefaultModelProblem.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
[maven] 01/01: Test for empty locations and avoid printing them
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch avoid-empty-locations
in repository https://gitbox.apache.org/repos/asf/maven.git
commit ceb08cfa77cb552b8315b8ee60846d0584db9488
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jan 30 22:48:14 2021 +0100
Test for empty locations and avoid printing them
---
.../src/main/java/org/apache/maven/building/DefaultProblem.java | 8 +++++++-
.../java/org/apache/maven/exception/DefaultExceptionHandler.java | 2 +-
.../src/main/java/org/apache/maven/project/MavenProject.java | 9 ++-------
.../java/org/apache/maven/project/ProjectBuildingException.java | 8 ++++++--
.../org/apache/maven/model/building/DefaultModelProblem.java | 7 ++++++-
.../org/apache/maven/model/building/ModelBuildingException.java | 8 ++++++--
.../apache/maven/settings/building/DefaultSettingsProblem.java | 7 ++++++-
.../maven/settings/building/SettingsBuildingException.java | 8 ++++++--
8 files changed, 40 insertions(+), 17 deletions(-)
diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java b/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java
index c4bfe1e..212eaa1 100644
--- a/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java
+++ b/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java
@@ -153,7 +153,13 @@ class DefaultProblem
buffer.append( '[' ).append( getSeverity() ).append( "] " );
buffer.append( getMessage() );
- buffer.append( " @ " ).append( getLocation() );
+ String location = getLocation();
+ if ( !location.isEmpty() )
+ {
+ buffer.append( " @ " );
+ buffer.append( location );
+ }
+
return buffer.toString();
}
diff --git a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
index 4a5b281..30b73f4 100644
--- a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
+++ b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
@@ -163,7 +163,7 @@ public class DefaultExceptionHandler
String location = ModelProblemUtils.formatLocation( problem, projectId );
- if ( StringUtils.isNotEmpty( location ) )
+ if ( !location.isEmpty() )
{
message += " @ " + location;
}
diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
index 958df1e..57069a5 100644
--- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
+++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
@@ -1154,16 +1154,11 @@ public class MavenProject
sb.append( getArtifactId() );
sb.append( ':' );
sb.append( getVersion() );
- sb.append( " @ " );
-
- try
+ if ( getFile() != null )
{
+ sb.append( " @ " );
sb.append( getFile().getPath() );
}
- catch ( NullPointerException e )
- {
- // don't log it.
- }
return sb.toString();
}
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
index 7786c90..3ace7a4 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
@@ -135,8 +135,12 @@ public class ProjectBuildingException
writer.print( problem.getSeverity() );
writer.print( "] " );
writer.print( problem.getMessage() );
- writer.print( " @ " );
- writer.println( ModelProblemUtils.formatLocation( problem, result.getProjectId() ) );
+ String location = ModelProblemUtils.formatLocation( problem, result.getProjectId() );
+ if ( !location.isEmpty() )
+ {
+ writer.print( " @ " );
+ writer.println( location );
+ }
}
}
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
index e1b05aa..95c71c5 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
@@ -168,7 +168,12 @@ public class DefaultModelProblem
buffer.append( '[' ).append( getSeverity() ).append( "] " );
buffer.append( getMessage() );
- buffer.append( " @ " ).append( ModelProblemUtils.formatLocation( this, null ) );
+ String location = ModelProblemUtils.formatLocation( this, null );
+ if ( !location.isEmpty() )
+ {
+ buffer.append( " @ " );
+ buffer.append( location );
+ }
return buffer.toString();
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
index b527438..e9d18e4 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
@@ -170,8 +170,12 @@ public class ModelBuildingException
writer.print( problem.getSeverity() );
writer.print( "] " );
writer.print( problem.getMessage() );
- writer.print( " @ " );
- writer.println( ModelProblemUtils.formatLocation( problem, modelId ) );
+ String location = ModelProblemUtils.formatLocation( problem, modelId );
+ if ( !location.isEmpty() )
+ {
+ writer.print( " @ " );
+ writer.println( location );
+ }
}
return buffer.toString();
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java
index a8eb909..ac06109 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java
@@ -158,7 +158,12 @@ public class DefaultSettingsProblem
buffer.append( '[' ).append( getSeverity() ).append( "] " );
buffer.append( getMessage() );
- buffer.append( " @ " ).append( getLocation() );
+ String location = getLocation();
+ if ( !location.isEmpty() )
+ {
+ buffer.append( " @ " );
+ buffer.append( location );
+ }
return buffer.toString();
}
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java
index 0f2ade2..530d522 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java
@@ -80,8 +80,12 @@ public class SettingsBuildingException
writer.print( problem.getSeverity() );
writer.print( "] " );
writer.print( problem.getMessage() );
- writer.print( " @ " );
- writer.println( problem.getLocation() );
+ String location = problem.getLocation();
+ if ( !location.isEmpty() )
+ {
+ writer.print( " @ " );
+ writer.println( location );
+ }
}
return buffer.toString();