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

PR: MNG-644 

remove deprecated ant task properties

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293336 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-10-03 13:22:55 +00:00
parent fa65152c43
commit 30856aef92
2 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
View File

@ -112,12 +112,8 @@ public abstract class AbstractArtifactTask
{
repositoryFactory = (ArtifactRepositoryFactory) lookup( ArtifactRepositoryFactory.ROLE );
ArtifactRepositoryPolicy snapshots = buildArtifactRepositoryPolicy( repository.getSnapshots(),
repository.getSnapshotPolicy(),
repository.getChecksumPolicy() );
ArtifactRepositoryPolicy releases = buildArtifactRepositoryPolicy( repository.getReleases(),
repository.getSnapshotPolicy(),
repository.getChecksumPolicy() );
ArtifactRepositoryPolicy snapshots = buildArtifactRepositoryPolicy( repository.getSnapshots() );
ArtifactRepositoryPolicy releases = buildArtifactRepositoryPolicy( repository.getReleases() );
artifactRepository = repositoryFactory.createArtifactRepository( "remote", repository.getUrl(),
repositoryLayout, snapshots, releases );
@ -137,13 +133,11 @@ public abstract class AbstractArtifactTask
return artifactRepository;
}
private static ArtifactRepositoryPolicy buildArtifactRepositoryPolicy( RepositoryPolicy policy,
String defaultUpdatePolicy,
String defaultChecksumPolicy )
private static ArtifactRepositoryPolicy buildArtifactRepositoryPolicy( RepositoryPolicy policy )
{
boolean enabled = true;
String updatePolicy = defaultUpdatePolicy;
String checksumPolicy = defaultChecksumPolicy;
String updatePolicy = null;
String checksumPolicy = null;
if ( policy != null )
{

30
maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java
View File

@ -29,16 +29,6 @@ public class RemoteRepository
private Authentication authentication;
/**
* @deprecated use <snapshots/> and <updatePolicy> instead.
*/
private String snapshotPolicy;
/**
* @deprecated use <snapshots/> and <checksumPolicy> instead.
*/
private String checksumPolicy;
private Proxy proxy;
private RepositoryPolicy snapshots;
@ -65,16 +55,6 @@ public class RemoteRepository
this.authentication = authentication;
}
public void setSnapshotPolicy( String snapshotPolicy )
{
this.snapshotPolicy = snapshotPolicy;
}
public String getSnapshotPolicy()
{
return snapshotPolicy;
}
public void addProxy( Proxy proxy )
{
this.proxy = proxy;
@ -85,16 +65,6 @@ public class RemoteRepository
return proxy;
}
public String getChecksumPolicy()
{
return checksumPolicy;
}
public void setChecksumPolicy( String checksumPolicy )
{
this.checksumPolicy = checksumPolicy;
}
public RepositoryPolicy getSnapshots()
{
return snapshots;