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

o Configured proper user agent 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@989902 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2010-08-26 19:39:41 +00:00
parent 901e599986
commit f52c2d2dd6
1 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
maven-core/src/main/java/org/apache/maven/DefaultMaven.java
View File

@ -16,6 +16,8 @@ package org.apache.maven;
*/ */
import java.io.File; import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -27,6 +29,7 @@ import java.util.LinkedHashMap;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties;
import org.apache.maven.artifact.ArtifactUtils; import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager; import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
@ -66,8 +69,10 @@ import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.dag.CycleDetectedException; import org.codehaus.plexus.util.dag.CycleDetectedException;
import org.sonatype.aether.ConfigurationProperties;
import org.sonatype.aether.RepositoryEvent; import org.sonatype.aether.RepositoryEvent;
import org.sonatype.aether.RepositorySystem; import org.sonatype.aether.RepositorySystem;
import org.sonatype.aether.RepositorySystemSession; import org.sonatype.aether.RepositorySystemSession;
@ -329,7 +334,11 @@ public class DefaultMaven
session.setUserProps( request.getUserProperties() ); session.setUserProps( request.getUserProperties() );
session.setSystemProps( request.getSystemProperties() ); session.setSystemProps( request.getSystemProperties() );
session.setConfigProps( request.getSystemProperties() ); Map<Object, Object> configProps = new LinkedHashMap<Object, Object>();
configProps.put( ConfigurationProperties.USER_AGENT, getUserAgent() );
configProps.putAll( request.getSystemProperties() );
configProps.putAll( request.getUserProperties() );
session.setConfigProps( configProps );
session.setOffline( request.isOffline() ); session.setOffline( request.isOffline() );
session.setChecksumPolicy( request.getGlobalChecksumPolicy() ); session.setChecksumPolicy( request.getGlobalChecksumPolicy() );
@ -445,6 +454,41 @@ public class DefaultMaven
return session; return session;
} }
private String getUserAgent()
{
StringBuilder buffer = new StringBuilder( 128 );
buffer.append( "Apache-Maven/" ).append( getMavenVersion() );
buffer.append( " (" );
buffer.append( "Java " ).append( System.getProperty( "java.version" ) );
buffer.append( "; " );
buffer.append( System.getProperty( "os.name" ) ).append( " " ).append( System.getProperty( "os.version" ) );
buffer.append( ")" );
return buffer.toString();
}
private String getMavenVersion()
{
Properties props = new Properties();
InputStream is = getClass().getResourceAsStream( "/META-INF/maven/org.apache.maven/maven-core/pom.properties" );
if ( is != null )
{
try
{
props.load( is );
}
catch ( IOException e )
{
logger.debug( "Failed to read Maven version", e );
}
IOUtil.close( is );
}
return props.getProperty( "version", "unknown-version" );
}
@SuppressWarnings({"ResultOfMethodCallIgnored"}) @SuppressWarnings({"ResultOfMethodCallIgnored"})
private void validateLocalRepository( MavenExecutionRequest request ) private void validateLocalRepository( MavenExecutionRequest request )
throws LocalRepositoryNotAccessibleException throws LocalRepositoryNotAccessibleException