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/07/31 20:45:19 UTC
svn commit: r799692 - in /maven/components/trunk:
maven-compat/src/main/java/org/apache/maven/artifact/
maven-compat/src/main/java/org/apache/maven/artifact/resolver/
maven-core/src/main/java/org/apache/maven/
maven-core/src/test/java/org/apache/maven/...
Author: bentmann
Date: Fri Jul 31 18:45:18 2009
New Revision: 799692
URL: http://svn.apache.org/viewvc?rev=799692&view=rev
Log:
o Removed authorative flag from artifact, we can just use the resolved flag to stop the resolution process
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/TestIdeWorkspaceRepository.java
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java?rev=799692&r1=799691&r2=799692&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java Fri Jul 31 18:45:18 2009
@@ -150,8 +150,5 @@
boolean isSelectedVersionKnown()
throws OverConstrainedVersionException;
-
- void setFromAuthoritativeRepository( boolean fromAuthoritativeRepository );
-
- boolean isFromAuthoritativeRepository();
-}
\ No newline at end of file
+
+}
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=799692&r1=799691&r2=799692&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java Fri Jul 31 18:45:18 2009
@@ -593,18 +593,5 @@
{
this.optional = optional;
}
-
- //
-
- private boolean fromAuthoritativeRepository;
-
- public void setFromAuthoritativeRepository( boolean fromAuthoritativeRepository )
- {
- this.fromAuthoritativeRepository = fromAuthoritativeRepository;
- }
-
- public boolean isFromAuthoritativeRepository()
- {
- return fromAuthoritativeRepository;
- }
+
}
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=799692&r1=799691&r2=799692&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Fri Jul 31 18:45:18 2009
@@ -136,7 +136,7 @@
artifact = localRepository.find( artifact );
- if ( artifact.isFromAuthoritativeRepository() )
+ if ( artifact.isResolved() )
{
return;
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java?rev=799692&r1=799691&r2=799692&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java Fri Jul 31 18:45:18 2009
@@ -42,8 +42,6 @@
{
artifact.setFile( project.getFile() );
- artifact.setFromAuthoritativeRepository( true );
-
artifact.setResolved( true );
}
else
@@ -60,8 +58,6 @@
artifact.setFile( projectArtifact.getFile() );
- artifact.setFromAuthoritativeRepository( true );
-
artifact.setResolved( true );
}
// TODO: The code below supports MNG-3043 & MNG-2871 but in its current form causes MNG-4269.
@@ -83,8 +79,6 @@
// {
// artifact.setFile( classesDir );
//
-// artifact.setFromAuthoritativeRepository( true );
-//
// artifact.setResolved( true );
// }
// }
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/TestIdeWorkspaceRepository.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/TestIdeWorkspaceRepository.java?rev=799692&r1=799691&r2=799692&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/TestIdeWorkspaceRepository.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/TestIdeWorkspaceRepository.java Fri Jul 31 18:45:18 2009
@@ -27,7 +27,6 @@
{
artifact.setFile( ARTIFACT_FILE );
artifact.setResolved( true );
- artifact.setFromAuthoritativeRepository( true );
}
return artifact;
}