mirror of https://github.com/apache/maven.git
mboot fixes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163746 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
f5270e45f7
commit
a5c95ef10e
|
@ -33,6 +33,7 @@ import java.util.TreeMap;
|
||||||
public class MBoot
|
public class MBoot
|
||||||
{
|
{
|
||||||
String[] pluginGeneratorDeps = new String[]{"plexus/jars/plexus-container-default-1.0-alpha-2.jar",
|
String[] pluginGeneratorDeps = new String[]{"plexus/jars/plexus-container-default-1.0-alpha-2.jar",
|
||||||
|
"qdox/jars/qdox-1.2.jar",
|
||||||
"org.apache.maven/jars/maven-core-2.0-SNAPSHOT.jar",
|
"org.apache.maven/jars/maven-core-2.0-SNAPSHOT.jar",
|
||||||
"org.apache.maven/jars/maven-artifact-2.0-SNAPSHOT.jar",
|
"org.apache.maven/jars/maven-artifact-2.0-SNAPSHOT.jar",
|
||||||
"org.apache.maven/jars/maven-model-2.0-SNAPSHOT.jar",
|
"org.apache.maven/jars/maven-model-2.0-SNAPSHOT.jar",
|
||||||
|
@ -628,10 +629,9 @@ public class MBoot
|
||||||
File f = new File( repoLocal, dependency );
|
File f = new File( repoLocal, dependency );
|
||||||
if ( !f.exists() )
|
if ( !f.exists() )
|
||||||
{
|
{
|
||||||
throw new FileNotFoundException( "Missing dependency: " + dependency +
|
throw new FileNotFoundException( "Missing dependency: " + dependency + ( !online
|
||||||
( !online
|
? "; run again online"
|
||||||
? "; run again online"
|
: "; there was a problem downloading it earlier" ) );
|
||||||
: "; there was a problem downloading it earlier" ) );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
cl.addURL( f.toURL() );
|
cl.addURL( f.toURL() );
|
||||||
|
|
|
@ -88,7 +88,7 @@ public class ArtifactDownloader
|
||||||
{
|
{
|
||||||
Dependency dep = (Dependency) j.next();
|
Dependency dep = (Dependency) j.next();
|
||||||
|
|
||||||
if ( !downloadedArtifacts.contains( dep ) )
|
if ( !downloadedArtifacts.contains( dep.getId() ) )
|
||||||
{
|
{
|
||||||
String repositoryPath = dep.getRepositoryPath();
|
String repositoryPath = dep.getRepositoryPath();
|
||||||
File destinationFile = new File( mavenRepoLocal, repositoryPath );
|
File destinationFile = new File( mavenRepoLocal, repositoryPath );
|
||||||
|
@ -113,7 +113,7 @@ public class ArtifactDownloader
|
||||||
throw new Exception( "Failed to download " + dep );
|
throw new Exception( "Failed to download " + dep );
|
||||||
}
|
}
|
||||||
|
|
||||||
downloadedArtifacts.add( dep );
|
downloadedArtifacts.add( dep.getId() );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue