Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginMappingManager.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginMappingManager.java?rev=278881&r1=278880&r2=278881&view=diff ============================================================================== --- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginMappingManager.java (original) +++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginMappingManager.java Mon Sep 5 16:12:55 2005 @@ -16,6 +16,7 @@ * limitations under the License. */ +import org.apache.maven.artifact.metadata.ArtifactMetadata; import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.metadata.GroupRepositoryMetadata; @@ -96,7 +97,7 @@ private void loadPluginMappings( String groupId, List pluginRepositories, ArtifactRepository localRepository ) throws ArtifactMetadataRetrievalException { - GroupRepositoryMetadata metadata = new GroupRepositoryMetadata( groupId ); + ArtifactMetadata metadata = new GroupRepositoryMetadata( groupId ); repositoryMetadataManager.resolve( metadata, pluginRepositories, localRepository ); @@ -110,7 +111,7 @@ loadRepositoryPluginMappings( metadata, localRepository, localRepository ); } - private void loadRepositoryPluginMappings( GroupRepositoryMetadata metadata, ArtifactRepository remoteRepository, + private void loadRepositoryPluginMappings( ArtifactMetadata metadata, ArtifactRepository remoteRepository, ArtifactRepository localRepository ) throws ArtifactMetadataRetrievalException { @@ -121,24 +122,21 @@ { Metadata pluginMap = readMetadata( metadataFile ); - if ( pluginMap != null ) + for ( Iterator pluginIterator = pluginMap.getPlugins().iterator(); pluginIterator.hasNext(); ) { - for ( Iterator pluginIterator = pluginMap.getPlugins().iterator(); pluginIterator.hasNext(); ) - { - Plugin mapping = (Plugin) pluginIterator.next(); + Plugin mapping = (Plugin) pluginIterator.next(); - String prefix = mapping.getPrefix(); + String prefix = mapping.getPrefix(); - String artifactId = mapping.getArtifactId(); + String artifactId = mapping.getArtifactId(); - org.apache.maven.model.Plugin plugin = new org.apache.maven.model.Plugin(); + org.apache.maven.model.Plugin plugin = new org.apache.maven.model.Plugin(); - plugin.setGroupId( metadata.getGroupId() ); + plugin.setGroupId( metadata.getGroupId() ); - plugin.setArtifactId( artifactId ); + plugin.setArtifactId( artifactId ); - pluginDefinitionsByPrefix.put( prefix, plugin ); - } + pluginDefinitionsByPrefix.put( prefix, plugin ); } } }
Modified: maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java?rev=278881&r1=278880&r2=278881&view=diff ============================================================================== --- maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java (original) +++ maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java Mon Sep 5 16:12:55 2005 @@ -136,6 +136,7 @@ String version = dep.getVersion(); if ( snapshot ) { + // TODO: augment with maven-metadata String filename = getSnapshotMetadataFile( destinationFile.getName(), "SNAPSHOT.version.txt" ); File file = localRepository.getMetadataFile( dep.getGroupId(), dep.getArtifactId(), dep.getVersion(), dep.getType(), filename ); @@ -173,7 +174,7 @@ } else { - log( "WARNING: local SNAPSHOT version not found, using default" ); + log( "WARNING: local SNAPSHOT version not found, using default" ); } } if ( !dep.getType().equals( "pom" ) ) Modified: maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java?rev=278881&r1=278880&r2=278881&view=diff ============================================================================== --- maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java (original) +++ maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java Mon Sep 5 16:12:55 2005 @@ -20,8 +20,9 @@ import org.apache.maven.artifact.deployer.ArtifactDeployer; import org.apache.maven.artifact.deployer.ArtifactDeploymentException; import org.apache.maven.artifact.metadata.ArtifactMetadata; -import org.apache.maven.artifact.metadata.ReleaseArtifactMetadata; import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata; +import org.apache.maven.artifact.repository.metadata.Versioning; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.project.artifact.ProjectArtifactMetadata; @@ -130,8 +131,10 @@ if ( updateReleaseInfo ) { - ReleaseArtifactMetadata metadata = new ReleaseArtifactMetadata( artifact ); - metadata.setVersion( artifact.getVersion() ); + // TODO: clean up + Versioning versioning = new Versioning(); + versioning.setRelease( artifact.getVersion() ); + ArtifactRepositoryMetadata metadata = new ArtifactRepositoryMetadata( artifact, versioning ); artifact.addMetadata( metadata ); } Modified: maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java?rev=278881&r1=278880&r2=278881&view=diff ============================================================================== --- maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java (original) +++ maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java Mon Sep 5 16:12:55 2005 @@ -19,7 +19,8 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.installer.ArtifactInstallationException; import org.apache.maven.artifact.metadata.ArtifactMetadata; -import org.apache.maven.artifact.metadata.ReleaseArtifactMetadata; +import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata; +import org.apache.maven.artifact.repository.metadata.Versioning; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.project.artifact.ProjectArtifactMetadata; @@ -29,6 +30,7 @@ /** * Installs project's main artifact in local repository. + * * @author <a href="mailto:[EMAIL PROTECTED]">Emmanuel Venisse</a> * @version $Id$ * @goal install @@ -68,7 +70,7 @@ * @parameter expression="${updateReleaseInfo}" */ private boolean updateReleaseInfo = false; - + /** * @parameter expression="${project.artifact}" * @required @@ -87,7 +89,7 @@ throws MojoExecutionException { boolean isPomArtifact = "pom".equals( packaging ); - + File pom = new File( basedir, "pom.xml" ); if ( !isPomArtifact ) { @@ -97,11 +99,13 @@ if ( updateReleaseInfo ) { - ReleaseArtifactMetadata metadata = new ReleaseArtifactMetadata( artifact ); - metadata.setVersion( artifact.getVersion() ); + // TODO: clean up + Versioning versioning = new Versioning(); + versioning.setRelease( artifact.getVersion() ); + ArtifactRepositoryMetadata metadata = new ArtifactRepositoryMetadata( artifact, versioning ); artifact.addMetadata( metadata ); } - + try { if ( isPomArtifact ) Modified: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java?rev=278881&r1=278880&r2=278881&view=diff ============================================================================== --- maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java (original) +++ maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java Mon Sep 5 16:12:55 2005 @@ -1,8 +1,9 @@ package org.apache.maven.plugin.plugin.metadata; import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.metadata.LatestArtifactMetadata; +import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata; import org.apache.maven.artifact.repository.metadata.GroupRepositoryMetadata; +import org.apache.maven.artifact.repository.metadata.Versioning; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.descriptor.PluginDescriptor; @@ -39,10 +40,10 @@ { Artifact projectArtifact = project.getArtifact(); - LatestArtifactMetadata metadata = new LatestArtifactMetadata( projectArtifact ); - - metadata.setVersion( projectArtifact.getVersion() ); - + // TODO: clean up + Versioning versioning = new Versioning(); + versioning.setLatest( projectArtifact.getVersion() ); + ArtifactRepositoryMetadata metadata = new ArtifactRepositoryMetadata( projectArtifact, versioning ); projectArtifact.addMetadata( metadata ); GroupRepositoryMetadata groupMetadata = new GroupRepositoryMetadata( project.getGroupId() ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
