You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2018/05/06 19:15:18 UTC
[maven] branch MNG-6403 updated (68a8fd9 -> 55193ab)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-6403
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 68a8fd9 [MNG-6403] Artifact#VERSION_FILE_PATTERN does not escape period between date and time
new 55193ab [MNG-6403] Artifact#VERSION_FILE_PATTERN does not escape period between date and time
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 (68a8fd9)
\
N -- N -- N refs/heads/MNG-6403 (55193ab)
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:
.../src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java | 1 +
1 file changed, 1 insertion(+)
--
To stop receiving notification emails like this one, please contact
michaelo@apache.org.
[maven] 01/01: [MNG-6403] Artifact#VERSION_FILE_PATTERN does not
escape period between date and time
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6403
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 55193abfdf7ef554c4ab4ff1f0c1578afd44fdc5
Author: kevin-canadian <ke...@gmail.com>
AuthorDate: Fri Apr 7 14:51:42 2017 +0200
[MNG-6403] Artifact#VERSION_FILE_PATTERN does not escape period between date and time
This closes #112
---
maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java | 2 +-
.../src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
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 9546433..377935d 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( "^(.*)-([0-9]{8}\\.[0-9]{6})-([0-9]+)$" );
// TODO into artifactScope handler
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
index a80f337..1704e37 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
@@ -56,6 +56,7 @@ public class ArtifactUtilsTest
assertEquals( "1.2.3", ArtifactUtils.toSnapshotVersion( "1.2.3" ) );
assertEquals( "1.2.3-SNAPSHOT", ArtifactUtils.toSnapshotVersion( "1.2.3-SNAPSHOT" ) );
assertEquals( "1.2.3-SNAPSHOT", ArtifactUtils.toSnapshotVersion( "1.2.3-20090413.094722-2" ) );
+ assertEquals( "1.2.3-20090413X094722-2", ArtifactUtils.toSnapshotVersion( "1.2.3-20090413X094722-2" ) );
}
/**
--
To stop receiving notification emails like this one, please contact
michaelo@apache.org.