You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/10/03 15:21:02 UTC
svn commit: r293335 - in /maven/components/trunk:
maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/
maven-model/ maven-project/src/main/java/org/apache/maven/project/
Author: brett
Date: Mon Oct 3 06:20:49 2005
New Revision: 293335
URL: http://svn.apache.org/viewcvs?rev=293335&view=rev
Log:
PR: MNG-644
remove deprecated repository settings
Modified:
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
maven/components/trunk/maven-model/maven.mdo
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectUtils.java
Modified: maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?rev=293335&r1=293334&r2=293335&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java (original)
+++ maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Mon Oct 3 06:20:49 2005
@@ -221,8 +221,6 @@
{
RemoteRepository r = createAntRemoteRepositoryBase( pomRepository );
- r.setSnapshotPolicy( pomRepository.getSnapshotPolicy() );
-
if ( pomRepository.getSnapshots() != null )
{
r.addSnapshots( convertRepositoryPolicy( pomRepository.getSnapshots() ) );
Modified: maven/components/trunk/maven-model/maven.mdo
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-model/maven.mdo?rev=293335&r1=293334&r2=293335&view=diff
==============================================================================
--- maven/components/trunk/maven-model/maven.mdo (original)
+++ maven/components/trunk/maven-model/maven.mdo Mon Oct 3 06:20:49 2005
@@ -2211,24 +2211,6 @@
Repository contains the information needed for establishing connections with remote repoistory
</description>
<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>
<name>releases</name>
<version>4.0.0</version>
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java?rev=293335&r1=293334&r2=293335&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java Mon Oct 3 06:20:49 2005
@@ -579,11 +579,9 @@
Repository newRepo = new Repository();
- newRepo.setChecksumPolicy( repo.getChecksumPolicy() );
newRepo.setId( repo.getId() );
newRepo.setLayout( repo.getLayout() );
newRepo.setName( repo.getName() );
- newRepo.setSnapshotPolicy( repo.getSnapshotPolicy() );
RepositoryPolicy releasePolicy = repo.getReleases();
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectUtils.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectUtils.java?rev=293335&r1=293334&r2=293335&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectUtils.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectUtils.java Mon Oct 3 06:20:49 2005
@@ -93,12 +93,8 @@
// TODO: make this a map inside the factory instead, so no lookup needed
ArtifactRepositoryLayout layout = getRepositoryLayout( repo, container );
- ArtifactRepositoryPolicy snapshots = buildArtifactRepositoryPolicy( repo.getSnapshots(),
- repo.getSnapshotPolicy(),
- repo.getChecksumPolicy() );
- ArtifactRepositoryPolicy releases = buildArtifactRepositoryPolicy( repo.getReleases(),
- repo.getSnapshotPolicy(),
- repo.getChecksumPolicy() );
+ ArtifactRepositoryPolicy snapshots = buildArtifactRepositoryPolicy( repo.getSnapshots() );
+ ArtifactRepositoryPolicy releases = buildArtifactRepositoryPolicy( repo.getReleases() );
return artifactRepositoryFactory.createArtifactRepository( id, url, layout, snapshots, releases );
}
@@ -108,13 +104,11 @@
}
}
- 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 )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org