From 54da5ce53e07370870f7a41fbbbffffa5d8094b0 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Wed, 25 Feb 2009 04:07:40 +0000 Subject: [PATCH] o omit the creation of deployment specific repositories, and uniqueVersion = false isn't going to matter in 3.x. everything will be unique to match an osgi versioning scheme. the dichotomy between unique sometimes, and no versions locally is a mess. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747652 13f79535-47bb-0310-9956-ffa450edef68 --- maven-model/src/main/mdo/maven.mdo | 2 +- .../org/apache/maven/project/MavenProject.java | 14 +++++++------- .../LegacyMavenRepositorySystem.java | 18 ------------------ .../repository/MavenRepositorySystem.java | 4 ---- 4 files changed, 8 insertions(+), 30 deletions(-) diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo index 2bf36d76bb..42f6391db4 100644 --- a/maven-model/src/main/mdo/maven.mdo +++ b/maven-model/src/main/mdo/maven.mdo @@ -2395,7 +2395,7 @@ DeploymentRepository - RepositoryBase + Repository 4.0.0 Repository contains the information needed for deploying to the remote repository. diff --git a/maven-project/src/main/java/org/apache/maven/project/MavenProject.java b/maven-project/src/main/java/org/apache/maven/project/MavenProject.java index 1d0e59b922..40ff54c4ae 100644 --- a/maven-project/src/main/java/org/apache/maven/project/MavenProject.java +++ b/maven-project/src/main/java/org/apache/maven/project/MavenProject.java @@ -207,12 +207,12 @@ public MavenProject( Model model ) * * @param model - may not be null * @param artifactFactory - may not be null - * @param mavenTools - may not be null + * @param repositorySystem - may not be null * @param mavenProjectBuilder * @param projectBuilderConfiguration * @throws InvalidRepositoryException */ - public MavenProject( Model model, MavenRepositorySystem mavenTools, MavenProjectBuilder mavenProjectBuilder, ProjectBuilderConfiguration projectBuilderConfiguration ) + public MavenProject( Model model, MavenRepositorySystem repositorySystem, MavenProjectBuilder mavenProjectBuilder, ProjectBuilderConfiguration projectBuilderConfiguration ) throws InvalidRepositoryException { if(model == null) @@ -220,7 +220,7 @@ public MavenProject( Model model, MavenRepositorySystem mavenTools, MavenProject throw new IllegalArgumentException("model: null"); } - if(mavenTools == null) + if(repositorySystem == null) { throw new IllegalArgumentException("mavenTools: null"); } @@ -228,18 +228,18 @@ public MavenProject( Model model, MavenRepositorySystem mavenTools, MavenProject setModel( model ); this.mavenProjectBuilder = mavenProjectBuilder; this.projectBuilderConfiguration = projectBuilderConfiguration; - this.repositorySystem = mavenTools; + this.repositorySystem = repositorySystem; originalModel = model; DistributionManagement dm = model.getDistributionManagement(); if ( dm != null ) { - ArtifactRepository repo = mavenTools.buildDeploymentArtifactRepository( dm.getRepository() ); + ArtifactRepository repo = repositorySystem.buildArtifactRepository( dm.getRepository() ); setReleaseArtifactRepository( repo ); if ( dm.getSnapshotRepository() != null ) { - repo = mavenTools.buildDeploymentArtifactRepository( dm.getSnapshotRepository() ); + repo = repositorySystem.buildArtifactRepository( dm.getSnapshotRepository() ); setSnapshotArtifactRepository( repo ); } } @@ -257,7 +257,7 @@ public MavenProject( Model model, MavenRepositorySystem mavenTools, MavenProject repoSet.addAll( model.getPluginRepositories() ); } - setRemoteArtifactRepositories( mavenTools.buildArtifactRepositories( new ArrayList( repoSet ) ) ); + setRemoteArtifactRepositories( repositorySystem.buildArtifactRepositories( new ArrayList( repoSet ) ) ); } catch ( Exception e ) { diff --git a/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java b/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java index 023316fc31..e6b01e055d 100644 --- a/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java +++ b/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java @@ -53,8 +53,6 @@ import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.model.Dependency; -import org.apache.maven.model.DeploymentRepository; -import org.apache.maven.model.Model; import org.apache.maven.model.Repository; import org.apache.maven.model.RepositoryPolicy; import org.apache.maven.project.MavenProject; @@ -203,22 +201,6 @@ public List buildArtifactRepositories( List repo return repos; } - public ArtifactRepository buildDeploymentArtifactRepository( DeploymentRepository repo ) - throws InvalidRepositoryException - { - if ( repo != null ) - { - String id = repo.getId(); - String url = repo.getUrl(); - - return artifactRepositoryFactory.createDeploymentArtifactRepository( id, url, repo.getLayout(), repo.isUniqueVersion() ); - } - else - { - return null; - } - } - public ArtifactRepository buildArtifactRepository( Repository repo ) throws InvalidRepositoryException { diff --git a/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java b/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java index 74302e803f..d25e89c618 100644 --- a/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java +++ b/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java @@ -79,10 +79,6 @@ Set createArtifacts( List dependencies, String inheritedSc List buildArtifactRepositories( List repositories ) throws InvalidRepositoryException; - // maven model - ArtifactRepository buildDeploymentArtifactRepository( DeploymentRepository repository ) - throws InvalidRepositoryException; - // maven model ArtifactRepository buildArtifactRepository( Repository repository ) throws InvalidRepositoryException;