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

TODOs and cleanup 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220314 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-07-22 12:50:26 +00:00
parent 9c4c5e57ff
commit 64399eb8e3
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java
View File

@ -17,7 +17,6 @@ package org.apache.maven.artifact.ant;
*/ */
import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.installer.ArtifactInstallationException; import org.apache.maven.artifact.installer.ArtifactInstallationException;
import org.apache.maven.artifact.installer.ArtifactInstaller; import org.apache.maven.artifact.installer.ArtifactInstaller;
import org.apache.maven.artifact.metadata.ArtifactMetadata; import org.apache.maven.artifact.metadata.ArtifactMetadata;

2
maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
View File

@ -17,7 +17,6 @@ package org.apache.maven.plugin.install;
*/ */
import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.installer.ArtifactInstallationException; import org.apache.maven.artifact.installer.ArtifactInstallationException;
import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoExecutionException;
@ -79,6 +78,7 @@ public class InstallFileMojo
public void execute() public void execute()
throws MojoExecutionException throws MojoExecutionException
{ {
// TODO: validate
// TODO: maybe not strictly correct, while we should enfore that packaging has a type handler of the same id, we don't // TODO: maybe not strictly correct, while we should enfore that packaging has a type handler of the same id, we don't
Artifact artifact = artifactFactory.createArtifact( groupId, artifactId, version, null, packaging ); Artifact artifact = artifactFactory.createArtifact( groupId, artifactId, version, null, packaging );

2
maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -615,7 +615,7 @@ public class DefaultMavenProjectBuilder
version = p.getVersion(); version = p.getVersion();
} }
Artifact artifact = null; Artifact artifact;
try try
{ {
artifact = artifactFactory.createPluginArtifact( p.getGroupId(), p.getArtifactId(), artifact = artifactFactory.createPluginArtifact( p.getGroupId(), p.getArtifactId(),

3
maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
View File

@ -122,6 +122,8 @@ public class MavenMetadataSource
try try
{ {
// TODO: we could possibly use p.getDependencyArtifacts instead, but they haven't been filtered or used the
// scope (should that be passed to the buildFromRepository method above?
Set artifacts = createArtifacts( artifactFactory, p.getDependencies(), artifact.getScope(), Set artifacts = createArtifacts( artifactFactory, p.getDependencies(), artifact.getScope(),
artifact.getDependencyFilter() ); artifact.getDependencyFilter() );
@ -143,6 +145,7 @@ public class MavenMetadataSource
{ {
Dependency d = (Dependency) i.next(); Dependency d = (Dependency) i.next();
// TODO: validate
VersionRange versionRange = VersionRange.createFromVersionSpec( d.getVersion() ); VersionRange versionRange = VersionRange.createFromVersionSpec( d.getVersion() );
Artifact artifact = artifactFactory.createDependencyArtifact( d.getGroupId(), d.getArtifactId(), Artifact artifact = artifactFactory.createDependencyArtifact( d.getGroupId(), d.getArtifactId(),
versionRange, d.getType(), d.getScope(), versionRange, d.getType(), d.getScope(),