mirror of https://github.com/apache/maven.git
o added an offline mode to the bootstrap, so on my machine I can bootstrap
in 20s when ibiblio isn't consulted. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162898 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
cecdbd417c
commit
269fa79368
|
@ -105,6 +105,8 @@ public class MBoot
|
||||||
|
|
||||||
private List coreDeps;
|
private List coreDeps;
|
||||||
|
|
||||||
|
private boolean online = true;
|
||||||
|
|
||||||
// ----------------------------------------------------------------------
|
// ----------------------------------------------------------------------
|
||||||
//
|
//
|
||||||
// ----------------------------------------------------------------------
|
// ----------------------------------------------------------------------
|
||||||
|
@ -120,7 +122,7 @@ public class MBoot
|
||||||
public void run( String[] args )
|
public void run( String[] args )
|
||||||
throws Exception
|
throws Exception
|
||||||
{
|
{
|
||||||
File mavenPropertiesFile = new File( System.getProperty( "user.home" ), "maven.properties" );
|
File mavenPropertiesFile = new File( System.getProperty( "user.home" ), "maven.properties" );
|
||||||
|
|
||||||
if ( !mavenPropertiesFile.exists() )
|
if ( !mavenPropertiesFile.exists() )
|
||||||
{
|
{
|
||||||
|
@ -143,7 +145,14 @@ public class MBoot
|
||||||
{
|
{
|
||||||
String key = (String) i.next();
|
String key = (String) i.next();
|
||||||
|
|
||||||
properties.setProperty( key, StringUtils.interpolate( properties.getProperty(key), System.getProperties() ) );
|
properties.setProperty( key, StringUtils.interpolate( properties.getProperty( key ), System.getProperties() ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
String onlineProperty = properties.getProperty( "maven.online" );
|
||||||
|
|
||||||
|
if ( onlineProperty != null && onlineProperty.equals( "false" ) )
|
||||||
|
{
|
||||||
|
online = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
downloader = new ArtifactDownloader( properties );
|
downloader = new ArtifactDownloader( properties );
|
||||||
|
@ -154,13 +163,18 @@ public class MBoot
|
||||||
|
|
||||||
String basedir = System.getProperty( "user.dir" );
|
String basedir = System.getProperty( "user.dir" );
|
||||||
|
|
||||||
checkMBootDeps();
|
mbootDependencies = Arrays.asList( deps );
|
||||||
|
|
||||||
|
if ( online )
|
||||||
|
{
|
||||||
|
checkMBootDeps();
|
||||||
|
}
|
||||||
|
|
||||||
// Install maven-components POM
|
// Install maven-components POM
|
||||||
installPomFile( repoLocal, new File( basedir, "pom.xml" ) );
|
installPomFile( repoLocal, new File( basedir, "pom.xml" ) );
|
||||||
|
|
||||||
// Install plugin-parent POM
|
// Install plugin-parent POM
|
||||||
installPomFile( repoLocal, new File( basedir, "maven-plugins/pom.xml" ) );
|
installPomFile( repoLocal, new File( basedir, "maven-plugins/pom.xml" ) );
|
||||||
|
|
||||||
for ( int i = 0; i < builds.length; i++ )
|
for ( int i = 0; i < builds.length; i++ )
|
||||||
{
|
{
|
||||||
|
@ -356,9 +370,12 @@ public class MBoot
|
||||||
// Download deps
|
// Download deps
|
||||||
// ----------------------------------------------------------------------
|
// ----------------------------------------------------------------------
|
||||||
|
|
||||||
System.out.println( "Downloading dependencies ..." );
|
if ( online )
|
||||||
|
{
|
||||||
|
System.out.println( "Downloading dependencies ..." );
|
||||||
|
|
||||||
downloadDependencies( reader.getDependencies() );
|
downloadDependencies( reader.getDependencies() );
|
||||||
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------------
|
// ----------------------------------------------------------------------
|
||||||
// Generating sources
|
// Generating sources
|
||||||
|
@ -526,8 +543,6 @@ public class MBoot
|
||||||
{
|
{
|
||||||
System.out.println( "Checking for MBoot's dependencies ..." );
|
System.out.println( "Checking for MBoot's dependencies ..." );
|
||||||
|
|
||||||
mbootDependencies = Arrays.asList( deps );
|
|
||||||
|
|
||||||
downloader.downloadDependencies( mbootDependencies );
|
downloader.downloadDependencies( mbootDependencies );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue