Author: brett
Date: Wed Sep 28 20:48:30 2005
New Revision: 292384
URL: http://svn.apache.org/viewcvs?rev=292384&view=rev
Log:
merge fixes
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
maven/components/trunk/maven-repository-metadata/src/main/mdo/metadata.mdo
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java?rev=292384&r1=292383&r2=292384&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
Wed Sep 28 20:48:30 2005
@@ -101,21 +101,19 @@
}
}
- 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 )
{
Modified:
maven/components/trunk/maven-repository-metadata/src/main/mdo/metadata.mdo
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-repository-metadata/src/main/mdo/metadata.mdo?rev=292384&r1=292383&r2=292384&view=diff
==============================================================================
--- maven/components/trunk/maven-repository-metadata/src/main/mdo/metadata.mdo
(original)
+++ maven/components/trunk/maven-repository-metadata/src/main/mdo/metadata.mdo
Wed Sep 28 20:48:30 2005
@@ -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() );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
