You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/10/10 10:18:37 UTC

[maven] branch master updated: [MNG-7292] Unnecessarily escaped character

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
     new b9fb762  [MNG-7292] Unnecessarily escaped character
b9fb762 is described below

commit b9fb76221525b459e6f0f4e9ecaef96f061b3a34
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Fri Oct 8 18:39:39 2021 +0200

    [MNG-7292] Unnecessarily escaped character
    
    
    Closes #573
---
 .../java/org/apache/maven/profiles/DefaultProfileManager.java     | 6 +++---
 .../apache/maven/repository/legacy/DefaultUpdateCheckManager.java | 2 +-
 .../maven/repository/legacy/WagonConfigurationException.java      | 4 ++--
 .../maven/project/inheritance/t12/ProjectInheritanceTest.java     | 3 ++-
 .../artifact/repository/metadata/AbstractRepositoryMetadata.java  | 2 +-
 .../src/main/java/org/apache/maven/execution/ReactorManager.java  | 4 ++--
 .../java/org/apache/maven/plugin/PluginParameterException.java    | 8 ++++----
 .../maven/plugin/version/PluginVersionNotFoundException.java      | 2 +-
 .../maven/plugin/version/PluginVersionResolutionException.java    | 6 +++---
 .../apache/maven/model/validation/DefaultModelValidatorTest.java  | 8 ++++----
 .../main/java/org/apache/maven/plugin/descriptor/Parameter.java   | 2 +-
 11 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
index 375460a..11dc0a3 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
@@ -109,7 +109,7 @@ public class DefaultProfileManager
         Profile existing = profilesById.get( profileId );
         if ( existing != null )
         {
-            logger.warn( "Overriding profile: \'" + profileId + "\' (source: " + existing.getSource()
+            logger.warn( "Overriding profile: '" + profileId + "' (source: " + existing.getSource()
                 + ") with new instance from source: " + profile.getSource() );
         }
 
@@ -130,7 +130,7 @@ public class DefaultProfileManager
     {
         if ( !activatedIds.contains( profileId ) )
         {
-            logger.debug( "Profile with id: \'" + profileId + "\' has been explicitly activated." );
+            logger.debug( "Profile with id: '" + profileId + "' has been explicitly activated." );
 
             activatedIds.add( profileId );
         }
@@ -154,7 +154,7 @@ public class DefaultProfileManager
     {
         if ( !deactivatedIds.contains( profileId ) )
         {
-            logger.debug( "Profile with id: \'" + profileId + "\' has been explicitly deactivated." );
+            logger.debug( "Profile with id: '" + profileId + "' has been explicitly deactivated." );
 
             deactivatedIds.add( profileId );
         }
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
index cd01ec9..b2a0ef0 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
@@ -323,7 +323,7 @@ public class DefaultUpdateCheckManager
                 }
                 catch ( NumberFormatException e )
                 {
-                    getLogger().debug( "Cannot parse lastUpdated date: \'" + rawVal + "\'. Ignoring.", e );
+                    getLogger().debug( "Cannot parse lastUpdated date: '" + rawVal + "'. Ignoring.", e );
                 }
             }
         }
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java
index 5542125..67b9ec7 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java
@@ -37,7 +37,7 @@ public class WagonConfigurationException
                                         String message,
                                         Throwable cause )
     {
-        super( "While configuring wagon for \'" + repositoryId + "\': " + message, cause );
+        super( "While configuring wagon for '" + repositoryId + "': " + message, cause );
 
         this.repositoryId = repositoryId;
         this.originalMessage = message;
@@ -46,7 +46,7 @@ public class WagonConfigurationException
     public WagonConfigurationException( String repositoryId,
                                         String message )
     {
-        super( "While configuring wagon for \'" + repositoryId + "\': " + message );
+        super( "While configuring wagon for '" + repositoryId + "': " + message );
 
         this.repositoryId = repositoryId;
         this.originalMessage = message;
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java
index 086d710..50f5f08 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java
@@ -65,6 +65,7 @@ public class ProjectInheritanceTest extends AbstractProjectInheritanceTestCase
         assertNotNull( compilerPlugin );
 
         Map executionMap = compilerPlugin.getExecutionsAsMap();
-        assertNull( executionMap.get( "test" ), "Plugin execution: \'test\' should NOT exist in the compiler plugin specification for the child project!" );
+        assertNull( executionMap.get( "test" ),
+                "Plugin execution: 'test' should NOT exist in the compiler plugin specification for the child project!" );
     }
 }
\ No newline at end of file
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
index 3078294..ed02da8 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
@@ -149,7 +149,7 @@ public abstract class AbstractRepositoryMetadata
 
     public String toString()
     {
-        return "repository metadata for: \'" + getKey() + "\'";
+        return "repository metadata for: '" + getKey() + "'";
     }
 
     protected static Metadata createMetadata( Artifact artifact, Versioning versioning )
diff --git a/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java b/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
index 1a7f500..795ac34 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
@@ -91,8 +91,8 @@ public class ReactorManager
         else
         {
             throw new IllegalArgumentException(
-                "Invalid failure behavior (must be one of: \'" + FAIL_FAST + "\', \'" + FAIL_AT_END + "\', \'"
-                    + FAIL_NEVER + "\')." );
+                    "Invalid failure behavior (must be one of: '" + FAIL_FAST + "', '" + FAIL_AT_END + "', '"
+                    + FAIL_NEVER + "')." );
         }
     }
 
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
index d0a21ed..d1fa98d 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
@@ -105,9 +105,9 @@ public class PluginParameterException
                 }
             }
 
-            messageBuffer.append( "Inside the definition for plugin \'" );
+            messageBuffer.append( "Inside the definition for plugin '" );
             messageBuffer.append( mojo.getPluginDescriptor().getArtifactId() );
-            messageBuffer.append( "\', specify the following:" ).append( LS ).append( LS );
+            messageBuffer.append( "', specify the following:" ).append( LS ).append( LS );
             messageBuffer.append( "<configuration>" ).append( LS ).append( "  ..." ).append( LS );
             messageBuffer.append( "  <" ).append( param.getName() ).append( '>' );
             if ( isArray || isCollection )
@@ -179,9 +179,9 @@ public class PluginParameterException
         List<Parameter> params = getParameters();
         MojoDescriptor mojo = getMojoDescriptor();
 
-        messageBuffer.append( "One or more required plugin parameters are invalid/missing for \'" )
+        messageBuffer.append( "One or more required plugin parameters are invalid/missing for '" )
             .append( mojo.getPluginDescriptor().getGoalPrefix() ).append( ':' ).append( mojo.getGoal() )
-            .append( "\'" ).append( LS );
+            .append( "'" ).append( LS );
 
         int idx = 0;
         for ( Iterator<Parameter> it = params.iterator(); it.hasNext(); idx++ )
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java
index 13b1fb9..b4864fc 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java
@@ -31,7 +31,7 @@ public class PluginVersionNotFoundException
 
     public PluginVersionNotFoundException( String groupId, String artifactId )
     {
-        super( "The plugin \'" + groupId + ":" + artifactId + "\' does not exist or no valid version could be found" );
+        super( "The plugin '" + groupId + ":" + artifactId + "' does not exist or no valid version could be found" );
 
         this.groupId = groupId;
         this.artifactId = artifactId;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
index c1b5ccf..6bde3f2 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
@@ -38,7 +38,7 @@ public class PluginVersionResolutionException
 
     public PluginVersionResolutionException( String groupId, String artifactId, String baseMessage, Throwable cause )
     {
-        super( "Error resolving version for plugin \'" + groupId + ":" + artifactId + "\': " + baseMessage, cause );
+        super( "Error resolving version for plugin '" + groupId + ":" + artifactId + "': " + baseMessage, cause );
 
         this.groupId = groupId;
         this.artifactId = artifactId;
@@ -47,7 +47,7 @@ public class PluginVersionResolutionException
 
     public PluginVersionResolutionException( String groupId, String artifactId, String baseMessage )
     {
-        super( "Error resolving version for plugin \'" + groupId + ":" + artifactId + "\': " + baseMessage );
+        super( "Error resolving version for plugin '" + groupId + ":" + artifactId + "': " + baseMessage );
 
         this.groupId = groupId;
         this.artifactId = artifactId;
@@ -57,7 +57,7 @@ public class PluginVersionResolutionException
     public PluginVersionResolutionException( String groupId, String artifactId, LocalRepository localRepository,
                                              List<RemoteRepository> remoteRepositories, String baseMessage )
     {
-        super( "Error resolving version for plugin \'" + groupId + ":" + artifactId + "\' from the repositories "
+        super( "Error resolving version for plugin '" + groupId + ":" + artifactId + "' from the repositories "
             + format( localRepository, remoteRepositories ) + ": " + baseMessage );
 
         this.groupId = groupId;
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
index fd63809..4517eb7 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
@@ -278,10 +278,10 @@ public class DefaultModelValidatorTest
 
         List<String> messages = result.getErrors();
 
-        assertTrue( messages.contains( "\'modelVersion\' is missing." ) );
-        assertTrue( messages.contains( "\'groupId\' is missing." ) );
-        assertTrue( messages.contains( "\'artifactId\' is missing." ) );
-        assertTrue( messages.contains( "\'version\' is missing." ) );
+        assertTrue( messages.contains( "'modelVersion' is missing." ) );
+        assertTrue( messages.contains( "'groupId' is missing." ) );
+        assertTrue( messages.contains( "'artifactId' is missing." ) );
+        assertTrue( messages.contains( "'version' is missing." ) );
         // type is inherited from the super pom
     }
 
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java
index 6c5036b..14fd2f0 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java
@@ -155,7 +155,7 @@ public class Parameter
 
     public String toString()
     {
-        return "Mojo parameter [name: \'" + getName() + "\'; alias: \'" + getAlias() + "\']";
+        return "Mojo parameter [name: '" + getName() + "'; alias: '" + getAlias() + "']";
     }
 
     public Requirement getRequirement()