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

merge fixes 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292384 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-09-29 03:48:30 +00:00
parent fa1eaf9a2c
commit 5d4c8f0aa9
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
View File

@ -101,21 +101,19 @@ public abstract class AbstractRepositoryMetadata
}
}
boolean changed = false;
boolean changed;
// If file could not be found or was not valid, start from scratch
if ( metadata == null )
{
metadata = new Metadata();
metadata.setGroupId( getGroupId() );
metadata.setArtifactId( getArtifactId() );
metadata.setVersion( getBaseVersion() );
metadata = this.metadata;
changed = true;
}
changed |= metadata.merge( this.metadata );
else
{
changed = metadata.merge( this.metadata );
}
if ( changed )
{

2
maven-repository-metadata/src/main/mdo/metadata.mdo
View File

@ -116,7 +116,7 @@
}
if ( v.getLastUpdated() == null || v.getLastUpdated().length() == 0 ||
versioning.getLastUpdated().compareTo( v.getLastUpdated() ) > 0 )
versioning.getLastUpdated().compareTo( v.getLastUpdated() ) >= 0 )
{
v.setLastUpdated( versioning.getLastUpdated() );