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/09/13 18:49:16 UTC
svn commit: r814342 -
/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
Author: bentmann
Date: Sun Sep 13 16:49:16 2009
New Revision: 814342
URL: http://svn.apache.org/viewvc?rev=814342&view=rev
Log:
[MNG-4204] Remove support for legacy style repositories
o Made validator output a deprecation warning
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java?rev=814342&r1=814341&r2=814342&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java Sun Sep 13 16:49:16 2009
@@ -28,6 +28,7 @@
import org.apache.maven.model.Build;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.model.DistributionManagement;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Plugin;
@@ -278,6 +279,25 @@
}
forcePluginExecutionIdCollision( model, problems );
+
+ for ( Repository repository : model.getRepositories() )
+ {
+ validateRepositoryLayout( problems, repository, "repositories.repository", request );
+ }
+
+ for ( Repository repository : model.getPluginRepositories() )
+ {
+ validateRepositoryLayout( problems, repository, "pluginRepositories.pluginRepository", request );
+ }
+
+ DistributionManagement distMgmt = model.getDistributionManagement();
+ if ( distMgmt != null )
+ {
+ validateRepositoryLayout( problems, distMgmt.getRepository(), "distributionManagement.repository",
+ request );
+ validateRepositoryLayout( problems, distMgmt.getSnapshotRepository(),
+ "distributionManagement.snapshotRepository", request );
+ }
}
}
@@ -358,6 +378,15 @@
}
}
+ private void validateRepositoryLayout( ModelProblemCollector problems, Repository repository, String prefix,
+ ModelBuildingRequest request )
+ {
+ if ( repository != null && "legacy".equals( repository.getLayout() ) )
+ {
+ addViolation( problems, true, "'" + prefix + ".layout = legacy' is deprecated: " + repository.getId() );
+ }
+ }
+
private void validateResources( ModelProblemCollector problems, List<Resource> resources, String prefix, ModelBuildingRequest request )
{
boolean warnOnBadBoolean = request.getValidationLevel() < ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_0;