Normalize regex patterns

This closes #988
apache · Mar 8, 2023 · 11199cf · 11199cf
1 parent 6f548e5
commit 11199cf
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java b/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
@@ -46,7 +46,7 @@ public interface Artifact
 
     String SNAPSHOT_VERSION = "SNAPSHOT";
 
-    Pattern VERSION_FILE_PATTERN = Pattern.compile( "^(.*)-([0-9]{8}\\.[0-9]{6})-([0-9]+)$" );
+    Pattern VERSION_FILE_PATTERN = Pattern.compile( "^(.*)-(\\d{8}\\.\\d{6})-(\\d+)$" );
 
     // TODO into artifactScope handler
 

diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
@@ -174,7 +174,7 @@ public void testReadModifiedPoms() throws Exception {
             // modify parent
             File parent = new File( tempDir.toFile(), "pom.xml" );
             String parentContent = FileUtils.fileRead( parent );
-            parentContent = parentContent.replaceAll( "<packaging>pom</packaging>",
+            parentContent = parentContent.replace( "<packaging>pom</packaging>",
                     "<packaging>pom</packaging><properties><addedProperty>addedValue</addedProperty></properties>" );
             FileUtils.fileWrite( parent, "UTF-8", parentContent );
             // re-build pom with modified parent

diff --git a/...r/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java b/...r/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java
@@ -46,7 +46,7 @@ public class JdkVersionProfileActivator
     implements ProfileActivator
 {
 
-    private static final Pattern FILTER_1 = Pattern.compile( "[^0-9._-]" );
+    private static final Pattern FILTER_1 = Pattern.compile( "[^\\d._-]" );
     private static final Pattern FILTER_2 = Pattern.compile( "[._-]" );
     private static final Pattern FILTER_3 = Pattern.compile( "\\." ); // used for split now
 

diff --git a/...-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/...-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
@@ -71,7 +71,7 @@ public class DefaultModelValidator
     implements ModelValidator
 {
 
-    private static final Pattern CI_FRIENDLY_EXPRESSION = Pattern.compile( "\\$\\{(.+?)\\}" );
+    private static final Pattern CI_FRIENDLY_EXPRESSION = Pattern.compile( "\\$\\{(.+?)}" );
 
     private static final String ILLEGAL_FS_CHARS = "\\/:\"<>|?*";