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 2021/06/26 20:57:38 UTC
[maven] branch maven-3.8.x updated (76d5f0d -> b476b28)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch maven-3.8.x
in repository https://gitbox.apache.org/repos/asf/maven.git.
from 76d5f0d [MNG-6843] Parallel build fails due to missing JAR artifacts in compilePath
new a9f337f [MNG-6937] StringSearchModelInterpolatorTest fails on symlinked paths
new ce27f0e [MNG-6964] Maven version sorting is internally inconsistent.
new b476b28 [MNG-7000] metadata.mdo contains invalid link to schema
The 3 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:
.../maven/artifact/versioning/ComparableVersion.java | 12 ++++++++++--
.../maven/artifact/versioning/ComparableVersionTest.java | 15 +++++++++++++++
.../interpolation/StringSearchModelInterpolatorTest.java | 2 +-
maven-repository-metadata/src/main/mdo/metadata.mdo | 2 +-
4 files changed, 27 insertions(+), 4 deletions(-)
[maven] 03/03: [MNG-7000] metadata.mdo contains invalid link to
schema
Posted by mi...@apache.org.
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 b476b28ecbf521d8c4b0d0ce601a68efa03908d1
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Oct 17 17:40:06 2020 +0200
[MNG-7000] metadata.mdo contains invalid link to schema
---
maven-repository-metadata/src/main/mdo/metadata.mdo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maven-repository-metadata/src/main/mdo/metadata.mdo b/maven-repository-metadata/src/main/mdo/metadata.mdo
index e2d0753..a6f5299 100644
--- a/maven-repository-metadata/src/main/mdo/metadata.mdo
+++ b/maven-repository-metadata/src/main/mdo/metadata.mdo
@@ -20,7 +20,7 @@ under the License.
<model xmlns="http://codehaus-plexus.github.io/MODELLO/1.4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/1.4.0 http://codehaus-plexus.github.io/modello/xsd/modello-1.4.0.xsd"
xsd.namespace="http://maven.apache.org/METADATA/${version}"
- xml.schemaLocation="http://maven.apache.org/xsd/metadata-${version}.xsd">
+ xml.schemaLocation="https://maven.apache.org/xsd/repository-metadata-${version}.xsd">
<id>repository-metadata</id>
<name>Metadata</name>
<description><![CDATA[
[maven] 01/03: [MNG-6937] StringSearchModelInterpolatorTest fails
on symlinked paths
Posted by mi...@apache.org.
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 a9f337fd63963b2017c7b057234f9a9e3e78be46
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Jun 10 09:55:52 2020 +0200
[MNG-6937] StringSearchModelInterpolatorTest fails on symlinked paths
Don't compare baseDir in a canonical form when the second comparing value
(System.getProperty( "user.dir" )) is not canonicalized.
This closes #361
---
.../maven/model/interpolation/StringSearchModelInterpolatorTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
index b66abca..df10511 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
@@ -365,7 +365,7 @@ public class StringSearchModelInterpolatorTest
interpolator.interpolateObject( obj, model, new File( "." ), config, collector );
assertProblemFree( collector );
- assertThat( baseDir.getCanonicalPath(), is( System.getProperty( "user.dir" ) ) );
+ assertThat( baseDir.getAbsolutePath(), is( System.getProperty( "user.dir" ) ) );
assertThat( obj.values.size(), is( 1 ) );
assertThat( (String) obj.values.get( "key" ), is( anyOf(
is( System.getProperty( "user.dir" ) + File.separator + "target" ),
[maven] 02/03: [MNG-6964] Maven version sorting is internally
inconsistent.
Posted by mi...@apache.org.
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 ce27f0ec6184cdee40609817a2796c768d0df261
Author: Dennis Lundberg <de...@apache.org>
AuthorDate: Wed Jul 22 11:24:26 2020 +0200
[MNG-6964] Maven version sorting is internally inconsistent.
---
.../maven/artifact/versioning/ComparableVersion.java | 12 ++++++++++--
.../maven/artifact/versioning/ComparableVersionTest.java | 15 +++++++++++++++
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index 811bab2..23eb846 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -530,8 +530,16 @@ public class ComparableVersion
{
return 0; // 1-0 = 1- (normalize) = 1
}
- Item first = get( 0 );
- return first.compareTo( null );
+ // Compare the entire list of items with null - not just the first one, MNG-6964
+ for ( Item i : this )
+ {
+ int result = i.compareTo( null );
+ if ( result != 0 )
+ {
+ return result;
+ }
+ }
+ return 0;
}
switch ( item.getType() )
{
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
index 70fc1d8..97fb46d 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
@@ -295,6 +295,21 @@ public class ComparableVersionTest
checkVersionsArrayEqual( arr );
}
+ /**
+ * Test <a href="https://issues.apache.org/jira/browse/MNG-6964">MNG-6964</a> edge cases
+ * for qualifiers that start with "-0.", which was showing A == C and B == C but A < B.
+ */
+ public void testMng6964()
+ {
+ String a = "1-0.alpha";
+ String b = "1-0.beta";
+ String c = "1";
+
+ checkVersionsOrder( a, c ); // Now a < c, but before MNG-6964 they were equal
+ checkVersionsOrder( b, c ); // Now b < c, but before MNG-6964 they were equal
+ checkVersionsOrder( a, b ); // Should still be true
+ }
+
public void testLocaleIndependent()
{
Locale orig = Locale.getDefault();