Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 53439 invoked from network); 4 Mar 2009 13:18:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Mar 2009 13:18:09 -0000 Received: (qmail 25256 invoked by uid 500); 4 Mar 2009 13:18:09 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 25193 invoked by uid 500); 4 Mar 2009 13:18:09 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 25183 invoked by uid 99); 4 Mar 2009 13:18:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Mar 2009 05:18:09 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Mar 2009 13:18:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C27972388962; Wed, 4 Mar 2009 13:17:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r749999 - in /maven/components/trunk: maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java Date: Wed, 04 Mar 2009 13:17:45 -0000 To: commits@maven.apache.org From: bentmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090304131745.C27972388962@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bentmann Date: Wed Mar 4 13:17:45 2009 New Revision: 749999 URL: http://svn.apache.org/viewvc?rev=749999&view=rev Log: o Restored backward-compat with maven-assembly-plugin Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=749999&r1=749998&r2=749999&view=diff ============================================================================== --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original) +++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Wed Mar 4 13:17:45 2009 @@ -36,9 +36,11 @@ import org.apache.maven.artifact.repository.metadata.RepositoryMetadata; import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager; import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException; +import org.apache.maven.artifact.resolver.filter.ArtifactFilter; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.artifact.versioning.VersionRange; +import org.apache.maven.model.Dependency; import org.apache.maven.model.DistributionManagement; import org.apache.maven.model.Relocation; import org.apache.maven.project.DefaultProjectBuilderConfiguration; @@ -47,6 +49,8 @@ import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.project.ProjectBuildingException; import org.apache.maven.project.validation.ModelValidationResult; +import org.apache.maven.repository.LegacyMavenRepositorySystem; +import org.apache.maven.repository.VersionNotFoundException; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; @@ -504,4 +508,23 @@ private Artifact pomArtifact; } + // USED BY MAVEN ASSEMBLY PLUGIN + @Deprecated + public static Set createArtifacts( ArtifactFactory artifactFactory, List dependencies, + String inheritedScope, ArtifactFilter dependencyFilter, + MavenProject project ) + throws InvalidDependencyVersionException + { + try + { + return LegacyMavenRepositorySystem.createArtifacts( artifactFactory, dependencies, inheritedScope, + dependencyFilter, project ); + } + catch ( VersionNotFoundException e ) + { + throw new InvalidDependencyVersionException( e.getProjectId(), e.getDependency(), e.getPomFile(), + e.getCauseException() ); + } + } + } Modified: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java?rev=749999&r1=749998&r2=749999&view=diff ============================================================================== --- maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java (original) +++ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java Wed Mar 4 13:17:45 2009 @@ -191,7 +191,15 @@ * @return {@link Set} < {@link Artifact} > * @todo desperately needs refactoring. It's just here because it's implementation is maven-project specific */ - public Set createArtifacts( List dependencies, String inheritedScope, ArtifactFilter dependencyFilter, MavenRepositoryWrapper reactor ) + public Set createArtifacts( List dependencies, String inheritedScope, + ArtifactFilter dependencyFilter, MavenRepositoryWrapper reactor ) + throws VersionNotFoundException + { + return createArtifacts( artifactFactory, dependencies, inheritedScope, dependencyFilter, reactor ); + } + + @Deprecated + public static Set createArtifacts( ArtifactFactory artifactFactory,List dependencies, String inheritedScope, ArtifactFilter dependencyFilter, MavenRepositoryWrapper reactor ) throws VersionNotFoundException { Set projectArtifacts = new LinkedHashSet( dependencies.size() );