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

o Removed debugging output 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750551 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-03-05 18:58:03 +00:00
parent c545d0964b
commit 0425ac9cb2
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.xml
View File

@ -64,6 +64,7 @@ END SNIPPET: ant-bootstrap -->
<property name="maven.home.effective" location="${maven.home.dirname}/${maven.home.basename.expected}"/>
<property name="maven.assembly" location="apache-maven/target/${maven.home.basename.expected}-bin.zip"/>
<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
<property name="maven.debug" value="-e"/>
<property name="surefire.useFile" value="true"/>
<echo>maven.home = ${maven.home.effective}</echo>
<echo>maven.repo.local = ${maven.repo.local}</echo>
@ -203,9 +204,8 @@ END SNIPPET: ant-bootstrap -->
<target name="maven-compile" depends="compile-boot,process-classes" description="compiles Maven using the bootstrap Maven, skipping automated tests">
<java fork="true" classname="org.apache.maven.cli.MavenCli" failonerror="true">
<classpath refid="maven.classpath"/>
<arg value="-e"/>
<arg value="${maven.debug}"/>
<arg value="-B"/>
<arg value="-X"/>
<arg value="clean"/>
<arg value="install"/>
<arg value="-Dmaven.repo.local=${maven.repo.local}"/>

10
maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
View File

@ -304,17 +304,7 @@ public class DefaultMavenExecutionRequestPopulator
// </mirror>
// </mirrors>
System.out.println( "ORIGINAL REPOSITORIES" );
for ( ArtifactRepository repo : request.getRemoteRepositories() )
{
System.out.println( repo );
}
request.setRemoteRepositories( repositorySystem.getMirrors( request.getRemoteRepositories() ) );
System.out.println( "MIRRORED REPOSITORIES" );
for ( ArtifactRepository repo : request.getRemoteRepositories() )
{
System.out.println( repo );
}
}
// ------------------------------------------------------------------------

9
maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java
View File

@ -31,7 +31,6 @@ import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
// This class needs to stick around because it was exposed the the remote resources plugin started using it instead of
@ -43,7 +42,7 @@ public final class ProjectUtils
{
}
public static List buildArtifactRepositories( List<Repository> repositories,
public static List<ArtifactRepository> buildArtifactRepositories( List<Repository> repositories,
ArtifactRepositoryFactory artifactRepositoryFactory,
PlexusContainer container )
throws InvalidRepositoryException
@ -56,14 +55,8 @@ public final class ProjectUtils
remoteRepositories.add( buildArtifactRepository( r, artifactRepositoryFactory, container ) );
}
// FIXME: remove
System.out.println( "REMOTE REPOSITORIES: " + remoteRepositories );
remoteRepositories = rs( container ).getMirrors( remoteRepositories );
// FIXME: remove
System.out.println( "MIRRORED REPOSITORIES: " + remoteRepositories );
return remoteRepositories;
}