Author: brett
Date: Mon Sep 12 07:58:31 2005
New Revision: 280349
URL: http://svn.apache.org/viewcvs?rev=280349&view=rev
Log:
PR: MNG-613
revert previous flushing of metadata as not all metadata is attached during
transformation
instead fix the problem of setting of local copy directly
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.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/deployer/DefaultArtifactDeployer.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java?rev=280349&r1=280348&r2=280349&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
Mon Sep 12 07:58:31 2005
@@ -76,7 +76,9 @@
ArtifactMetadata metadata = (ArtifactMetadata) i.next();
repositoryMetadataManager.deploy( metadata, localRepository,
deploymentRepository );
}
- artifact.getMetadataList().clear();
+ // TODO: would like to flush this, but the plugin metadata is
added in advance, not as an install/deploy transformation
+ // This would avoid the need to merge and clear out the state
during deployment
+// artifact.getMetadataList().clear();
}
catch ( TransferFailedException e )
{
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java?rev=280349&r1=280348&r2=280349&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
Mon Sep 12 07:58:31 2005
@@ -75,7 +75,9 @@
ArtifactMetadata metadata = (ArtifactMetadata) i.next();
repositoryMetadataManager.install( metadata, localRepository );
}
- artifact.getMetadataList().clear();
+ // TODO: would like to flush this, but the plugin metadata is
added in advance, not as an install/deploy transformation
+ // This would avoid the need to merge and clear out the state
during deployment
+// artifact.getMetadataList().clear();
}
catch ( IOException e )
{
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=280349&r1=280348&r2=280349&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
Mon Sep 12 07:58:31 2005
@@ -140,6 +140,11 @@
s.setBuildNumber(
snapshot.getBuildNumber() );
changed = true;
}
+ if ( s.isLocalCopy() )
+ {
+ s.setLocalCopy( false );
+ changed = true;
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
