Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-02-22 18:04:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

PR: MNG-644

Browse Source 
remove deprecated repository settings

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293335 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-10-03 13:20:49 +00:00
parent 18d6128726
commit fa65152c43
4 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,8 +221,6 @@ protected RemoteRepository createAntRemoteRepository( org.apache.maven.model.Rep
{ {
RemoteRepository r = createAntRemoteRepositoryBase( pomRepository ); RemoteRepository r = createAntRemoteRepositoryBase( pomRepository );
r.setSnapshotPolicy( pomRepository.getSnapshotPolicy() );
if ( pomRepository.getSnapshots() != null ) if ( pomRepository.getSnapshots() != null )
{ {
r.addSnapshots( convertRepositoryPolicy( pomRepository.getSnapshots() ) ); r.addSnapshots( convertRepositoryPolicy( pomRepository.getSnapshots() ) );

18
maven-model/maven.mdo
View File

@ -2211,24 +2211,6 @@
Repository contains the information needed for establishing connections with remote repoistory Repository contains the information needed for establishing connections with remote repoistory
</description> </description>
<fields> <fields>
<!-- TODO: deprecated -->
<field>
<name>snapshotPolicy</name>
<version>4.0.0</version>
<description>
The policy for downloading snapshots - can be "always", "daily" (default), "interval:XXX" (in minutes) or
"never" (repository is not checked, even if the snapshot is not present locally).
</description>
<type>String</type>
</field>
<!-- TODO: deprecated -->
<field>
<name>checksumPolicy</name>
<version>4.0.0</version>
<description>What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are
"fail" or "warn"</description>
<type>String</type>
</field>
<field> <field>
<name>releases</name> <name>releases</name>
<version>4.0.0</version> <version>4.0.0</version>

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

@ -579,11 +579,9 @@ private static List cloneProfileRepositories( List repos )
Repository newRepo = new Repository(); Repository newRepo = new Repository();
newRepo.setChecksumPolicy( repo.getChecksumPolicy() );
newRepo.setId( repo.getId() ); newRepo.setId( repo.getId() );
newRepo.setLayout( repo.getLayout() ); newRepo.setLayout( repo.getLayout() );
newRepo.setName( repo.getName() ); newRepo.setName( repo.getName() );
newRepo.setSnapshotPolicy( repo.getSnapshotPolicy() );
RepositoryPolicy releasePolicy = repo.getReleases(); RepositoryPolicy releasePolicy = repo.getReleases();

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

@ -93,12 +93,8 @@ public static ArtifactRepository buildArtifactRepository( Repository repo,
// TODO: make this a map inside the factory instead, so no lookup needed // TODO: make this a map inside the factory instead, so no lookup needed
ArtifactRepositoryLayout layout = getRepositoryLayout( repo, container ); ArtifactRepositoryLayout layout = getRepositoryLayout( repo, container );
ArtifactRepositoryPolicy snapshots = buildArtifactRepositoryPolicy( repo.getSnapshots(), ArtifactRepositoryPolicy snapshots = buildArtifactRepositoryPolicy( repo.getSnapshots() );
repo.getSnapshotPolicy(), ArtifactRepositoryPolicy releases = buildArtifactRepositoryPolicy( repo.getReleases() );
repo.getChecksumPolicy() );
ArtifactRepositoryPolicy releases = buildArtifactRepositoryPolicy( repo.getReleases(),
repo.getSnapshotPolicy(),
repo.getChecksumPolicy() );
return artifactRepositoryFactory.createArtifactRepository( id, url, layout, snapshots, releases ); return artifactRepositoryFactory.createArtifactRepository( id, url, layout, snapshots, releases );
} }
@ -108,13 +104,11 @@ public static ArtifactRepository buildArtifactRepository( Repository repo,
} }
} }
private static ArtifactRepositoryPolicy buildArtifactRepositoryPolicy( RepositoryPolicy policy, private static ArtifactRepositoryPolicy buildArtifactRepositoryPolicy( RepositoryPolicy policy )
String defaultUpdatePolicy,
String defaultChecksumPolicy )
{ {
boolean enabled = true; boolean enabled = true;
String updatePolicy = defaultUpdatePolicy; String updatePolicy = null;
String checksumPolicy = defaultChecksumPolicy; String checksumPolicy = null;
if ( policy != null ) if ( policy != null )
{ {