svn commit: r808844 - in /maven/shared/trunk/maven-artifact-resolver: pom.xml src/main/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolver.java

[bentmann]

Author: bentmann
Date: Fri Aug 28 10:42:17 2009
New Revision: 808844

URL: http://svn.apache.org/viewvc?rev=808844&view=rev
Log:
o Ensured compat with Maven 2.0.8+

Modified:
    maven/shared/trunk/maven-artifact-resolver/pom.xml
    
maven/shared/trunk/maven-artifact-resolver/src/main/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolver.java

Modified: maven/shared/trunk/maven-artifact-resolver/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-resolver/pom.xml?rev=808844&r1=808843&r2=808844&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-resolver/pom.xml (original)
+++ maven/shared/trunk/maven-artifact-resolver/pom.xml Fri Aug 28 10:42:17 2009
@@ -39,22 +39,22 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact-manager</artifactId>
-      <version>2.2.1</version>
+      <version>2.1.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>2.2.1</version>
+      <version>2.1.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
-      <version>2.2.1</version>
+      <version>2.1.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>2.2.1</version>
+      <version>2.1.0</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

Modified: 
maven/shared/trunk/maven-artifact-resolver/src/main/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolver.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-resolver/src/main/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolver.java?rev=808844&r1=808843&r2=808844&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-artifact-resolver/src/main/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolver.java
 (original)
+++ 
maven/shared/trunk/maven-artifact-resolver/src/main/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolver.java
 Fri Aug 28 10:42:17 2009
@@ -19,8 +19,6 @@
  * under the License.
  */
 
-import static org.apache.maven.project.MavenProject.getProjectReferenceId;
-
 import org.apache.maven.ProjectDependenciesResolver;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -108,7 +106,7 @@
         
         for ( MavenProject project : projects )
         {
-            Set<Artifact> depArtifacts = (Set<Artifact>) 
project.getDependencyArtifacts();
+            Set<Artifact> depArtifacts = project.getDependencyArtifacts();
             if ( depArtifacts == null )
             {
                 try
@@ -210,4 +208,9 @@
         return ids;
     }
 
+    private static String getProjectReferenceId( String groupId, String 
artifactId, String version )
+    {
+        return groupId + ":" + artifactId + ":" + version;
+    }
+
 }