You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by eo...@apache.org on 2019/01/02 12:54:03 UTC
[maven-enforcer] branch MENFORCER-324 updated (53a8e16 -> a2792ab)
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a change to branch MENFORCER-324
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git.
discard 53a8e16 [MENFORCER-324] - use System.lineSeparator() instead of '\n'
add 9106689 [MENFORCER-322] requireProfileIdsExist triggers if profile is defined at parent o Fixed iterating over parent poms. Added IT.
add 5ac7679 [MENFORCER-323] - Improve output of "Some plugins are missing valid versions" error
new a2792ab [MENFORCER-324] - Use System.lineSeparator() instead of '\n'
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 (53a8e16)
\
N -- N -- N refs/heads/MENFORCER-324 (a2792ab)
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:
.../plugins/enforcer/RequirePluginVersions.java | 7 ++--
.../plugins/enforcer/RequireProfileIdsExist.java | 27 ++++++++-----
.../require-plugin-versions-ci/verify.groovy | 2 +-
.../MENFORCER-322-module}/pom.xml | 15 +++++---
.../invoker.properties | 45 +++++++++++++---------
.../pom.xml | 9 +++--
.../verify.groovy | 4 +-
7 files changed, 69 insertions(+), 40 deletions(-)
copy maven-enforcer-plugin/src/it/projects/{require-profile-ids-exist_failure => require-profile-id-exist_defined_in_parent/MENFORCER-322-module}/pom.xml (83%)
copy maven-enforcer-plugin/src/it/projects/{always-fail => require-profile-id-exist_defined_in_parent}/invoker.properties (74%)
copy maven-enforcer-plugin/src/it/projects/{require-profile-ids-exist_failure => require-profile-id-exist_defined_in_parent}/pom.xml (89%)
copy maven-enforcer-plugin/src/it/projects/{require-profile-ids-exist_failure => require-profile-id-exist_defined_in_parent}/verify.groovy (82%)
[maven-enforcer] 01/01: [MENFORCER-324] - Use
System.lineSeparator() instead of '\n'
Posted by eo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch MENFORCER-324
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git
commit a2792ab04ee4650a66798fbf79deff45f11c63ad
Author: Josh Soref <js...@users.noreply.github.com>
AuthorDate: Mon Dec 10 23:46:18 2018 -0500
[MENFORCER-324] - Use System.lineSeparator() instead of '\n'
---
.../maven/plugins/enforcer/AbstractBanDependencies.java | 4 ++--
.../apache/maven/plugins/enforcer/AbstractRequireFiles.java | 6 +++---
.../java/org/apache/maven/plugins/enforcer/AlwaysFail.java | 2 +-
.../java/org/apache/maven/plugins/enforcer/AlwaysPass.java | 2 +-
.../plugins/enforcer/BanDuplicatePomDependencyVersions.java | 4 ++--
.../maven/plugins/enforcer/BanTransitiveDependencies.java | 4 ++--
.../java/org/apache/maven/plugins/enforcer/BannedPlugins.java | 2 +-
.../org/apache/maven/plugins/enforcer/BannedRepositories.java | 6 +++---
.../apache/maven/plugins/enforcer/DependencyConvergence.java | 9 +++++----
.../apache/maven/plugins/enforcer/RequireActiveProfile.java | 4 ++--
.../apache/maven/plugins/enforcer/RequireFilesDontExist.java | 2 +-
.../org/apache/maven/plugins/enforcer/RequireFilesExist.java | 2 +-
.../apache/maven/plugins/enforcer/RequireNoRepositories.java | 2 +-
.../apache/maven/plugins/enforcer/RequirePluginVersions.java | 4 ++--
.../apache/maven/plugins/enforcer/RequireReleaseVersion.java | 2 +-
.../apache/maven/plugins/enforcer/RequireSameVersions.java | 7 ++++---
.../apache/maven/plugins/enforcer/RequireSnapshotVersion.java | 2 +-
.../apache/maven/plugins/enforcer/RequireUpperBoundDeps.java | 8 ++++----
.../java/org/apache/maven/plugins/enforcer/EnforceMojo.java | 11 +++++++----
19 files changed, 44 insertions(+), 39 deletions(-)
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java
index 5d3acb1..5bdbaf0 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java
@@ -95,7 +95,7 @@ public abstract class AbstractBanDependencies
StringBuilder buf = new StringBuilder();
if ( message != null )
{
- buf.append( message + "\n" );
+ buf.append( message + System.lineSeparator() );
}
for ( Artifact artifact : foundExcludes )
{
@@ -110,7 +110,7 @@ public abstract class AbstractBanDependencies
protected CharSequence getErrorMessage( Artifact artifact )
{
- return "Found Banned Dependency: " + artifact.getId() + "\n";
+ return "Found Banned Dependency: " + artifact.getId() + System.lineSeparator();
}
protected Set<Artifact> getDependenciesToCheck( MavenProject project )
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java
index 893917d..90379bd 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java
@@ -90,7 +90,7 @@ public abstract class AbstractRequireFiles
StringBuilder buf = new StringBuilder();
if ( message != null )
{
- buf.append( message + "\n" );
+ buf.append( message + System.lineSeparator() );
}
buf.append( getErrorMsg() );
@@ -98,11 +98,11 @@ public abstract class AbstractRequireFiles
{
if ( file != null )
{
- buf.append( file.getAbsolutePath() + "\n" );
+ buf.append( file.getAbsolutePath() + System.lineSeparator() );
}
else
{
- buf.append( "(an empty filename was given and allowNulls is false)\n" );
+ buf.append( "(an empty filename was given and allowNulls is false)" + System.lineSeparator() );
}
}
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java
index 9488eb1..9b0045f 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java
@@ -40,7 +40,7 @@ public class AlwaysFail
StringBuffer buf = new StringBuffer();
if ( message != null )
{
- buf.append( message ).append( '\n' );
+ buf.append( message ).append( System.lineSeparator() );
}
buf.append( "Always fails!" );
throw new EnforcerRuleException( buf.toString() );
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java
index 018360e..862138c 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java
@@ -42,7 +42,7 @@ public class AlwaysPass
StringBuffer buf = new StringBuffer();
if ( message != null )
{
- buf.append( message ).append( '\n' );
+ buf.append( message ).append( System.lineSeparator() );
}
buf.append( "Always pass!" );
log.info( buf.toString() );
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDuplicatePomDependencyVersions.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDuplicatePomDependencyVersions.java
index 2b177c3..5eaa09a 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDuplicatePomDependencyVersions.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDuplicatePomDependencyVersions.java
@@ -165,7 +165,7 @@ public class BanDuplicatePomDependencyVersions
.append( duplicates )
.append( " duplicate dependency " );
message.append( duplicateDependencies.size() == 1 ? "declaration" : "declarations" )
- .append( " in this project:\n" );
+ .append( " in this project:" + System.lineSeparator() );
message.append( summary );
throw new EnforcerRuleException( message.toString() );
}
@@ -183,7 +183,7 @@ public class BanDuplicatePomDependencyVersions
.append( entry.getKey() )
.append( "] ( " )
.append( entry.getValue() )
- .append( " times )\n" );
+ .append( " times )" + System.lineSeparator() );
}
}
}
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java
index 0d4db57..6e1dcd4 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java
@@ -119,7 +119,7 @@ public class BanTransitiveDependencies
if ( excluded )
{
- message.append( " [excluded]\n" );
+ message.append( " [excluded]" + System.lineSeparator() );
}
if ( hasTransitiveDependencies )
@@ -129,7 +129,7 @@ public class BanTransitiveDependencies
message.append( " has transitive dependencies:" );
}
- message.append( "\n" ).append( messageFromChildren );
+ message.append( System.lineSeparator() ).append( messageFromChildren );
}
}
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedPlugins.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedPlugins.java
index ddcfb26..03201fd 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedPlugins.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedPlugins.java
@@ -41,7 +41,7 @@ public class BannedPlugins
@Override
protected CharSequence getErrorMessage( Artifact artifact )
{
- return "Found Banned Plugin: " + artifact.getId() + "\n";
+ return "Found Banned Plugin: " + artifact.getId() + System.lineSeparator();
}
}
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedRepositories.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedRepositories.java
index dfa7757..c76a70f 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedRepositories.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedRepositories.java
@@ -196,8 +196,8 @@ public class BannedRepositories
if ( !resultBannedRepos.isEmpty() )
{
errMsg.append( "Current maven session contains banned" + errorMessagePrefix
- + "repository urls, please double check your pom or settings.xml:\n"
- + getRepositoryUrlString( resultBannedRepos ) + "\n\n" );
+ + "repository urls, please double check your pom or settings.xml:" + System.lineSeparator()
+ + getRepositoryUrlString( resultBannedRepos ) + System.lineSeparator() + System.lineSeparator() );
}
return errMsg.toString();
@@ -208,7 +208,7 @@ public class BannedRepositories
StringBuffer urls = new StringBuffer( "" );
for ( ArtifactRepository repo : resultBannedRepos )
{
- urls.append( repo.getId() + " - " + repo.getUrl() + "\n" );
+ urls.append( repo.getId() + " - " + repo.getUrl() + System.lineSeparator() );
}
return urls.toString();
}
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
index ed5d300..684f984 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
@@ -156,7 +156,7 @@ public class DependencyConvergence
builder.append( " " );
}
builder.append( "+-" + loc.get( i ) );
- builder.append( "\n" );
+ builder.append( System.lineSeparator() );
}
return builder;
}
@@ -174,15 +174,16 @@ public class DependencyConvergence
private String buildConvergenceErrorMsg( List<DependencyNode> nodeList )
{
StringBuilder builder = new StringBuilder();
- builder.append( "\nDependency convergence error for " + getFullArtifactName( nodeList.get( 0 ).getArtifact() )
- + " paths to dependency are:\n" );
+ builder.append( System.lineSeparator() + "Dependency convergence error for "
+ + getFullArtifactName( nodeList.get( 0 ).getArtifact() )
+ + " paths to dependency are:" + System.lineSeparator() );
if ( nodeList.size() > 0 )
{
builder.append( buildTreeString( nodeList.get( 0 ) ) );
}
for ( DependencyNode node : nodeList.subList( 1, nodeList.size() ) )
{
- builder.append( "and\n" );
+ builder.append( "and" + System.lineSeparator() );
builder.append( buildTreeString( node ) );
}
return builder.toString();
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java
index 79c1e67..919f304 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java
@@ -106,12 +106,12 @@ public class RequireActiveProfile
StringBuilder buf = new StringBuilder();
if ( message != null )
{
- buf.append( message + "\n" );
+ buf.append( message + System.lineSeparator() );
}
for ( String profile : missingProfiles )
{
- buf.append( "Profile \"" + profile + "\" is not activated.\n" );
+ buf.append( "Profile \"" + profile + "\" is not activated." + System.lineSeparator() );
}
throw new EnforcerRuleException( buf.toString() );
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesDontExist.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesDontExist.java
index 2389d34..7ad08f5 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesDontExist.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesDontExist.java
@@ -37,7 +37,7 @@ public class RequireFilesDontExist
@Override
String getErrorMsg()
{
- return "Some files should not exist:\n";
+ return "Some files should not exist:" + System.lineSeparator();
}
}
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesExist.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesExist.java
index df4252b..5727bd8 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesExist.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesExist.java
@@ -37,7 +37,7 @@ public class RequireFilesExist
@Override
String getErrorMsg()
{
- return "Some required files are missing:\n";
+ return "Some required files are missing:" + System.lineSeparator();
}
}
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
index 6419b73..c4a25a4 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
@@ -141,7 +141,7 @@ public class RequireNoRepositories
List<Model> badModels = new ArrayList<Model>();
StringBuilder newMsg = new StringBuilder();
- newMsg.append( "Some poms have repositories defined:\n" );
+ newMsg.append( "Some poms have repositories defined:" + System.lineSeparator() );
for ( Model model : models )
{
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
index b63af6e..0c19c85 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
@@ -278,7 +278,7 @@ public class RequirePluginVersions
{
newMsg.append( "SNAPSHOT " );
}
- newMsg.append( "are not allowed)" );
+ newMsg.append( "are not allowed)" + System.lineSeparator() );
}
newMsg.append( "\n" );
for ( Plugin plugin : failures )
@@ -309,7 +309,7 @@ public class RequirePluginVersions
log.debug( "Exception while determining plugin Version.", e );
newMsg.append( ". Unable to determine the plugin version." );
}
- newMsg.append( "\n" );
+ newMsg.append( System.lineSeparator() );
}
String message = getMessage();
if ( StringUtils.isNotEmpty( message ) )
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java
index 590ad2c..2a682d5 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java
@@ -57,7 +57,7 @@ public class RequireReleaseVersion
StringBuffer buf = new StringBuffer();
if ( message != null )
{
- buf.append( message ).append( '\n' );
+ buf.append( message ).append( System.lineSeparator() );
}
buf.append( "This project cannot be a snapshot:" ).append( project.getArtifact().getId() );
throw new EnforcerRuleException( buf.toString() );
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSameVersions.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSameVersions.java
index d4eab55..d247ec6 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSameVersions.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSameVersions.java
@@ -82,13 +82,14 @@ public class RequireSameVersions
if ( versionMembers.size() > 1 )
{
- StringBuilder builder = new StringBuilder( "Found entries with different versions\n" );
+ StringBuilder builder = new StringBuilder( "Found entries with different versions"
+ + System.lineSeparator() );
for ( Map.Entry<String, List<String>> entry : versionMembers.entrySet() )
{
- builder.append( "Entries with version " ).append( entry.getKey() ).append( '\n' );
+ builder.append( "Entries with version " ).append( entry.getKey() ).append( System.lineSeparator() );
for ( String conflictId : entry.getValue() )
{
- builder.append( "- " ).append( conflictId ).append( '\n' );
+ builder.append( "- " ).append( conflictId ).append( System.lineSeparator() );
}
}
throw new EnforcerRuleException( builder.toString() );
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSnapshotVersion.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSnapshotVersion.java
index 91e826f..a7d9fd2 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSnapshotVersion.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSnapshotVersion.java
@@ -51,7 +51,7 @@ public class RequireSnapshotVersion
StringBuilder sb = new StringBuilder();
if ( message != null )
{
- sb.append( message ).append( '\n' );
+ sb.append( message ).append( System.lineSeparator() );
}
sb.append( "This project cannot be a release:" ).append( artifact.getId() );
throw new EnforcerRuleException( sb.toString() );
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
index 9769553..458554a 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
@@ -182,15 +182,15 @@ public class RequireUpperBoundDeps
private String buildErrorMessage( List<DependencyNode> conflict )
{
StringBuilder errorMessage = new StringBuilder();
- errorMessage.append( "\nRequire upper bound dependencies error for "
- + getFullArtifactName( conflict.get( 0 ), false ) + " paths to dependency are:\n" );
+ errorMessage.append( System.lineSeparator() + "Require upper bound dependencies error for "
+ + getFullArtifactName( conflict.get( 0 ), false ) + " paths to dependency are:" + System.lineSeparator() );
if ( conflict.size() > 0 )
{
errorMessage.append( buildTreeString( conflict.get( 0 ) ) );
}
for ( DependencyNode node : conflict.subList( 1, conflict.size() ) )
{
- errorMessage.append( "and\n" );
+ errorMessage.append( "and" + System.lineSeparator() );
errorMessage.append( buildTreeString( node ) );
}
return errorMessage.toString();
@@ -222,7 +222,7 @@ public class RequireUpperBoundDeps
builder.append( " " );
}
builder.append( "+-" ).append( loc.get( i ) );
- builder.append( "\n" );
+ builder.append( System.lineSeparator() );
}
return builder;
}
diff --git a/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceMojo.java b/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceMojo.java
index 3fa2b3b..73786cc 100644
--- a/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceMojo.java
+++ b/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceMojo.java
@@ -213,19 +213,22 @@ public class EnforceMojo
// false if fail is false.
if ( failFast && level == EnforcerLevel.ERROR )
{
- throw new MojoExecutionException( currentRule + " failed with message:\n" + e.getMessage(), e );
+ throw new MojoExecutionException( currentRule + " failed with message:"
+ + System.lineSeparator() + e.getMessage(), e );
}
else
{
if ( level == EnforcerLevel.ERROR )
{
hasErrors = true;
- list.add( "Rule " + i + ": " + currentRule + " failed with message:\n" + e.getMessage() );
+ list.add( "Rule " + i + ": " + currentRule + " failed with message:"
+ + System.lineSeparator() + e.getMessage() );
log.debug( "Adding failure due to exception", e );
}
else
{
- list.add( "Rule " + i + ": " + currentRule + " warned with message:\n" + e.getMessage() );
+ list.add( "Rule " + i + ": " + currentRule + " warned with message:"
+ + System.lineSeparator() + e.getMessage() );
log.debug( "Adding warning due to exception", e );
}
}
@@ -349,7 +352,7 @@ public class EnforceMojo
protected String createRuleMessage( int i, String currentRule, EnforcerRuleException e )
{
- return "Rule " + i + ": " + currentRule + " failed with message:\n" + e.getMessage();
+ return "Rule " + i + ": " + currentRule + " failed with message:" + System.lineSeparator() + e.getMessage();
}
/**