Author: jzurbano
Date: Tue Jan 25 06:45:31 2011
New Revision: 1063154
URL: http://svn.apache.org/viewvc?rev=1063154&view=rev
Log:
fixed typo
Modified:
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
Modified:
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java?rev=1063154&r1=1063153&r2=1063154&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
(original)
+++
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
Tue Jan 25 06:45:31 2011
@@ -331,11 +331,11 @@ public class Maven2RepositoryMerger
List<ArtifactMetadata> sourceArtifacts =
metadataRepository.getArtifacts( sourceRepo );
List<ArtifactMetadata> conflictsArtifacts = new
ArrayList<ArtifactMetadata>();
- for ( ArtifactMetadata targerArtifact : targetArtifacts )
+ for ( ArtifactMetadata targetArtifact : targetArtifacts )
{
for ( ArtifactMetadata sourceArtifact : sourceArtifacts )
{
- if ( isEquals( targerArtifact, sourceArtifact ) )
+ if ( isEquals( targetArtifact, sourceArtifact ) )
{
if ( !conflictsArtifacts.contains( sourceArtifact ) )
{
