You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/11/25 23:10:17 UTC
svn commit: r884296 - in /maven/maven-3/trunk:
maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Author: bentmann
Date: Wed Nov 25 22:10:16 2009
New Revision: 884296
URL: http://svn.apache.org/viewvc?rev=884296&view=rev
Log:
[MNG-4470] [regression] Proxies are ignored during artifact deployment
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java?rev=884296&r1=884295&r2=884296&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java Wed Nov 25 22:10:16 2009
@@ -194,21 +194,22 @@
private void connectWagon( Wagon wagon, ArtifactRepository repository )
throws ConnectionException, AuthenticationException
{
- if ( repository.getAuthentication() != null )
+ if ( repository.getAuthentication() != null && repository.getProxy() != null )
{
- wagon.connect( new Repository( repository.getId(), repository.getUrl() ), authenticationInfo( repository ) );
+ wagon.connect( new Repository( repository.getId(), repository.getUrl() ), authenticationInfo( repository ),
+ proxyInfo( repository ) );
}
- else if ( repository.getProxy() != null )
+ else if ( repository.getAuthentication() != null )
{
- wagon.connect( new Repository( repository.getId(), repository.getUrl() ), proxyInfo( repository ) );
+ wagon.connect( new Repository( repository.getId(), repository.getUrl() ), authenticationInfo( repository ) );
}
- else if ( repository.getAuthentication() != null && repository.getProxy() != null )
+ else if ( repository.getProxy() != null )
{
- wagon.connect( new Repository( repository.getId(), repository.getUrl() ), authenticationInfo( repository ), proxyInfo( repository ) );
+ wagon.connect( new Repository( repository.getId(), repository.getUrl() ), proxyInfo( repository ) );
}
else
{
- wagon.connect( new Repository( repository.getId(), repository.getUrl() ) );
+ wagon.connect( new Repository( repository.getId(), repository.getUrl() ) );
}
}
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=884296&r1=884295&r2=884296&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java Wed Nov 25 22:10:16 2009
@@ -1792,6 +1792,7 @@
{
ArtifactRepository repo =
repositorySystem.buildArtifactRepository( getDistributionManagement().getRepository() );
+ repositorySystem.injectProxy( Arrays.asList( repo ), projectBuilderConfiguration.getProxies() );
repositorySystem.injectAuthentication( Arrays.asList( repo ), projectBuilderConfiguration.getServers() );
setReleaseArtifactRepository( repo );
}
@@ -1811,6 +1812,7 @@
{
ArtifactRepository repo =
repositorySystem.buildArtifactRepository( getDistributionManagement().getSnapshotRepository() );
+ repositorySystem.injectProxy( Arrays.asList( repo ), projectBuilderConfiguration.getProxies() );
repositorySystem.injectAuthentication( Arrays.asList( repo ), projectBuilderConfiguration.getServers() );
setSnapshotArtifactRepository( repo );
}