maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
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 GMT
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<Artifact> createArtifacts( ArtifactFactory artifactFactory, List<Dependency>
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} &lt; {@link Artifact} >
      * @todo desperately needs refactoring. It's just here because it's implementation is
maven-project specific
      */
-    public Set<Artifact> createArtifacts( List<Dependency> dependencies, String
inheritedScope, ArtifactFilter dependencyFilter, MavenRepositoryWrapper reactor )
+    public Set<Artifact> createArtifacts( List<Dependency> dependencies, String
inheritedScope,
+                                          ArtifactFilter dependencyFilter, MavenRepositoryWrapper
reactor )
+        throws VersionNotFoundException
+    {
+        return createArtifacts( artifactFactory, dependencies, inheritedScope, dependencyFilter,
reactor );
+    }
+
+    @Deprecated
+    public static Set<Artifact> createArtifacts( ArtifactFactory artifactFactory,List<Dependency>
dependencies, String inheritedScope, ArtifactFilter dependencyFilter, MavenRepositoryWrapper
reactor )
         throws VersionNotFoundException
     {
         Set<Artifact> projectArtifacts = new LinkedHashSet<Artifact>( dependencies.size()
);



Mime
View raw message