Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Normalize regex patterns 

This closes #988
This commit is contained in:
Andrey Bruykhov 2023-02-08 20:34:39 +03:00 committed by Michael Osipov
parent fbf6bdaf01
commit 4454cd6d82
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
View File

@ -43,7 +43,7 @@ public interface Artifact extends Comparable<Artifact> {
String SNAPSHOT_VERSION = "SNAPSHOT"; 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 // TODO into artifactScope handler

2
maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
View File

@ -161,7 +161,7 @@ public class ProjectBuilderTest extends AbstractCoreMavenComponentTestCase {
// modify parent // modify parent
File parent = new File(tempDir.toFile(), "pom.xml"); File parent = new File(tempDir.toFile(), "pom.xml");
String parentContent = FileUtils.readFileToString(parent, "UTF-8"); String parentContent = FileUtils.readFileToString(parent, "UTF-8");
parentContent = parentContent.replaceAll( parentContent = parentContent.replace(
"<packaging>pom</packaging>", "<packaging>pom</packaging>",
"<packaging>pom</packaging><properties><addedProperty>addedValue</addedProperty></properties>"); "<packaging>pom</packaging><properties><addedProperty>addedValue</addedProperty></properties>");
FileUtils.write(parent, parentContent, "UTF-8"); FileUtils.write(parent, parentContent, "UTF-8");

2
maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java
View File

@ -44,7 +44,7 @@ import org.apache.maven.model.profile.ProfileActivationContext;
@Singleton @Singleton
public class JdkVersionProfileActivator implements ProfileActivator { 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_2 = Pattern.compile("[._-]");
private static final Pattern FILTER_3 = Pattern.compile("\\."); // used for split now private static final Pattern FILTER_3 = Pattern.compile("\\."); // used for split now

2
maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
View File

@ -68,7 +68,7 @@ import org.codehaus.plexus.util.StringUtils;
@Singleton @Singleton
public class DefaultModelValidator implements ModelValidator { 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 = "\\/:\"<>|?*"; private static final String ILLEGAL_FS_CHARS = "\\/:\"<>|?*";