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/07 22:20:28 UTC
[maven] branch MNG-6403 updated (72f7804 -> 9021d66)
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 72f7804 [MNG-6403] Artifact#VERSION_FILE_PATTERN does not escape period between date and time
add 8e0efaa [MNG-6386] ${project.baseUri} is not a valid URI (according to RFC 3986)
add 9abfc88 [MNG-5756] Java home output in mvn -v is misleading
new 14365ba [MNG-6403] Artifact#VERSION_FILE_PATTERN does not escape period between date and time
new 9021d66 Move ArtifactUtilsTest and friends from maven-compat to maven-artifact
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 (72f7804)
\
N -- N -- N refs/heads/MNG-6403 (9021d66)
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 2 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:
.../apache/maven/artifact/ArtifactUtilsTest.java | 0
.../apache/maven/artifact/DefaultArtifactTest.java | 0
.../artifact/handler/ArtifactHandlerMock.java | 0
.../AbstractStringBasedModelInterpolator.java | 2 +-
.../apache/maven/project/PomConstructionTest.java | 81 ++++++++++++----------
.../pom.xml | 0
.../org/apache/maven/cli/CLIReportingUtils.java | 7 +-
.../AbstractStringBasedModelInterpolator.java | 4 +-
8 files changed, 52 insertions(+), 42 deletions(-)
rename {maven-compat => maven-artifact}/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java (100%)
rename {maven-compat => maven-artifact}/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java (100%)
rename {maven-compat => maven-artifact}/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java (100%)
rename maven-core/src/test/resources-project-builder/{baseurl-interpolation => baseuri-interpolation}/pom.xml (100%)
--
To stop receiving notification emails like this one, please contact
michaelo@apache.org.
[maven] 02/02: Move ArtifactUtilsTest and friends from maven-compat
to maven-artifact
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 9021d66e53f979b0664677b7977c650e71d51d1d
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue May 8 00:18:49 2018 +0200
Move ArtifactUtilsTest and friends from maven-compat to maven-artifact
---
.../src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java | 0
.../src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java | 0
.../test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java | 0
3 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
similarity index 100%
rename from maven-compat/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
rename to maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
similarity index 100%
rename from maven-compat/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
rename to maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java b/maven-artifact/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java
similarity index 100%
rename from maven-compat/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java
rename to maven-artifact/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java
--
To stop receiving notification emails like this one, please contact
michaelo@apache.org.
[maven] 01/02: [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 14365baabef294b1d505fd429ead29dfd187cdc0
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 | 2 ++
2 files changed, 3 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..333f636 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
@@ -49,6 +49,7 @@ public class ArtifactUtilsTest
assertEquals( true, ArtifactUtils.isSnapshot( "1.2.3-SNAPSHOT" ) );
assertEquals( true, ArtifactUtils.isSnapshot( "1.2.3-snapshot" ) );
assertEquals( true, ArtifactUtils.isSnapshot( "1.2.3-20090413.094722-2" ) );
+ assertEquals( false, ArtifactUtils.isSnapshot( "1.2.3-20090413X094722-2"));
}
public void testToSnapshotVersion()
@@ -56,6 +57,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.