Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-02-21 17:40:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MNG-4470] [regression] Proxies are ignored during artifact deployment

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@884296 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-11-25 22:10:16 +00:00
parent b1482a3cb4
commit f957961cb8
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
View File

@ -194,21 +194,22 @@ public void getArtifactMetadataFromDeploymentRepository( ArtifactMetadata metada
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.getAuthentication() != null )
{
wagon.connect( new Repository( repository.getId(), repository.getUrl() ), authenticationInfo( repository ) );
}
else if ( repository.getProxy() != null )
{
wagon.connect( new Repository( repository.getId(), repository.getUrl() ), proxyInfo( repository ) );
}
else if ( repository.getAuthentication() != null && 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() ) );
}
}

2
maven-core/src/main/java/org/apache/maven/project/MavenProject.java
View File

@ -1792,6 +1792,7 @@ protected ArtifactRepository getReleaseArtifactRepository()
{
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 @@ protected ArtifactRepository getSnapshotArtifactRepository()
{
ArtifactRepository repo =
repositorySystem.buildArtifactRepository( getDistributionManagement().getSnapshotRepository() );
repositorySystem.injectProxy( Arrays.asList( repo ), projectBuilderConfiguration.getProxies() );
repositorySystem.injectAuthentication( Arrays.asList( repo ), projectBuilderConfiguration.getServers() );
setSnapshotArtifactRepository( repo );
}