This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch maven-3.8.x in repository https://gitbox.apache.org/repos/asf/maven.git
commit 11199cf7bc2dd40b7cea8eb3fbbd8b4415adeeb6 Author: Andrey Bruykhov <[email protected]> AuthorDate: Wed Feb 8 20:34:39 2023 +0300 Normalize regex patterns This closes #988 --- maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java | 2 +- .../src/test/java/org/apache/maven/project/ProjectBuilderTest.java | 2 +- .../maven/model/profile/activation/JdkVersionProfileActivator.java | 2 +- .../java/org/apache/maven/model/validation/DefaultModelValidator.java | 2 +- 4 files changed, 4 insertions(+), 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 index 377935da0..df6c4c02b 100644 --- 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 index 99e408ffe..b8818ee08 100644 --- 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 class ProjectBuilderTest // 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/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java index 70a0c2bd2..de2174631 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java +++ b/maven-model-builder/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/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java index f77321c16..b19c70784 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java +++ b/maven-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 = "\\/:\"<>|?*";
