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 2010/08/30 13:17:37 UTC
svn commit: r990771 - in /maven/maven-3/trunk:
maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
maven-core/src/main/java/org/apache/maven/RepositoryUtils.java pom.xml
Author: bentmann
Date: Mon Aug 30 11:17:36 2010
New Revision: 990771
URL: http://svn.apache.org/viewvc?rev=990771&view=rev
Log:
[MNG-4779] NullPointerException thrown during dependency resolution when dependency with range occurs more than once in the dirty tree
[MNG-4781] Can't deploy to Nexus staging repository
Modified:
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
maven/maven-3/trunk/pom.xml
Modified: maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java?rev=990771&r1=990770&r2=990771&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java (original)
+++ maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java Mon Aug 30 11:17:36 2010
@@ -19,7 +19,6 @@ package org.apache.maven.repository.inte
* under the License.
*/
-import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
@@ -366,18 +365,13 @@ public class DefaultArtifactDescriptorRe
Map<String, String> props = null;
if ( system )
{
- props = Collections.singletonMap( ArtifactProperties.LACKS_DESCRIPTOR, Boolean.TRUE.toString() );
+ props = Collections.singletonMap( ArtifactProperties.LOCAL_PATH, dependency.getSystemPath() );
}
Artifact artifact =
new DefaultArtifact( dependency.getGroupId(), dependency.getArtifactId(), dependency.getClassifier(), null,
dependency.getVersion(), props, stereotype );
- if ( system )
- {
- artifact = artifact.setFile( new File( dependency.getSystemPath() ) );
- }
-
List<Exclusion> exclusions = new ArrayList<Exclusion>( dependency.getExclusions().size() );
for ( org.apache.maven.model.Exclusion exclusion : dependency.getExclusions() )
{
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java?rev=990771&r1=990770&r2=990771&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java Mon Aug 30 11:17:36 2010
@@ -142,7 +142,8 @@ public class RepositoryUtils
Map<String, String> props = null;
if ( org.apache.maven.artifact.Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) )
{
- props = Collections.singletonMap( ArtifactProperties.LACKS_DESCRIPTOR, Boolean.TRUE.toString() );
+ String localPath = ( artifact.getFile() != null ) ? artifact.getFile().getPath() : "";
+ props = Collections.singletonMap( ArtifactProperties.LOCAL_PATH, localPath );
}
Artifact result =
@@ -270,18 +271,13 @@ public class RepositoryUtils
Map<String, String> props = null;
if ( system )
{
- props = Collections.singletonMap( ArtifactProperties.LACKS_DESCRIPTOR, Boolean.TRUE.toString() );
+ props = Collections.singletonMap( ArtifactProperties.LOCAL_PATH, dependency.getSystemPath() );
}
Artifact artifact =
new DefaultArtifact( dependency.getGroupId(), dependency.getArtifactId(), dependency.getClassifier(), null,
dependency.getVersion(), props, stereotype );
- if ( system )
- {
- artifact = artifact.setFile( new File( dependency.getSystemPath() ) );
- }
-
List<Exclusion> exclusions = new ArrayList<Exclusion>( dependency.getExclusions().size() );
for ( org.apache.maven.model.Exclusion exclusion : dependency.getExclusions() )
{
Modified: maven/maven-3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=990771&r1=990770&r2=990771&view=diff
==============================================================================
--- maven/maven-3/trunk/pom.xml (original)
+++ maven/maven-3/trunk/pom.xml Mon Aug 30 11:17:36 2010
@@ -50,7 +50,7 @@
<cipherVersion>1.4</cipherVersion>
<modelloVersion>1.4</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
- <aetherVersion>1.1.1</aetherVersion>
+ <aetherVersion>1.2</aetherVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
</properties>