You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2013/04/18 22:51:46 UTC
svn commit: r1469561 - in /maven/shared/trunk/maven-dependency-tree/src:
it/maven-version/
main/java/org/apache/maven/shared/dependency/graph/internal/
Author: hboutemy
Date: Thu Apr 18 20:51:45 2013
New Revision: 1469561
URL: http://svn.apache.org/r1469561
Log:
fixed unwanted difference between M3 and M2 output
Added:
maven/shared/trunk/maven-dependency-tree/src/it/maven-version/expected.txt
- copied unchanged from r1469555, maven/shared/trunk/maven-dependency-tree/src/it/maven-version/expected-M2.txt
Removed:
maven/shared/trunk/maven-dependency-tree/src/it/maven-version/expected-M2.txt
maven/shared/trunk/maven-dependency-tree/src/it/maven-version/expected-M3.txt
Modified:
maven/shared/trunk/maven-dependency-tree/src/it/maven-version/pom.xml
maven/shared/trunk/maven-dependency-tree/src/it/maven-version/verify.bsh
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java
Modified: maven/shared/trunk/maven-dependency-tree/src/it/maven-version/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/it/maven-version/pom.xml?rev=1469561&r1=1469560&r2=1469561&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/it/maven-version/pom.xml (original)
+++ maven/shared/trunk/maven-dependency-tree/src/it/maven-version/pom.xml Thu Apr 18 20:51:45 2013
@@ -34,7 +34,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <outputFile>target/tree-M2.txt</outputFile>
</properties>
<dependencyManagement>
@@ -74,7 +73,7 @@
<artifactId>maven-dependency-plugin</artifactId>
<version>2.6</version>
<configuration>
- <outputFile>${outputFile}</outputFile>
+ <outputFile>target/tree.txt</outputFile>
</configuration>
<dependencies>
<dependency>
@@ -87,19 +86,4 @@
</plugins>
</pluginManagement>
</build>
-
- <profiles>
- <profile>
- <id>maven-3</id>
- <activation>
- <file>
- <!-- This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
- <exists>${basedir}</exists>
- </file>
- </activation>
- <properties>
- <outputFile>target/tree-M3.txt</outputFile>
- </properties>
- </profile>
- </profiles>
</project>
Modified: maven/shared/trunk/maven-dependency-tree/src/it/maven-version/verify.bsh
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/it/maven-version/verify.bsh?rev=1469561&r1=1469560&r2=1469561&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/it/maven-version/verify.bsh (original)
+++ maven/shared/trunk/maven-dependency-tree/src/it/maven-version/verify.bsh Thu Apr 18 20:51:45 2013
@@ -2,16 +2,8 @@ import java.io.*;
import org.codehaus.plexus.util.*;
-File outputFile = new File( basedir, "target/tree-M2.txt" );
-File expectedFile = new File( basedir, "expected-M2.txt" );
-if ( ! outputFile.exists() )
-{
- outputFile = new File( basedir, "target/tree-M3.txt" );
- expectedFile = new File( basedir, "expected-M3.txt" );
-}
-
-String actual = FileUtils.fileRead( outputFile );
-String expected = FileUtils.fileRead( expectedFile );
+String actual = FileUtils.fileRead( new File( basedir, "target/tree.txt" ) );
+String expected = FileUtils.fileRead( new File( basedir, "expected.txt" ) );
actual = actual.replaceAll( "[\n\r]+", "\n" );
expected = expected.replaceAll( "[\n\r]+", "\n" );
Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java?rev=1469561&r1=1469560&r2=1469561&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java (original)
+++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java Thu Apr 18 20:51:45 2013
@@ -75,12 +75,12 @@ public class Maven31DependencyGraphBuild
(RepositorySystemSession) invoke( ProjectBuildingRequest.class, projectBuildingRequest,
"getRepositorySession" );
- if ( Boolean.TRUE != ( (Boolean) session.getConfigProperties().get( DependencyManagerUtils.NODE_DATA_PREMANAGED_VERSION ) ) )
+ /*if ( Boolean.TRUE != ( (Boolean) session.getConfigProperties().get( DependencyManagerUtils.NODE_DATA_PREMANAGED_VERSION ) ) )
{
DefaultRepositorySystemSession newSession = new DefaultRepositorySystemSession( session );
newSession.setConfigProperty( DependencyManagerUtils.NODE_DATA_PREMANAGED_VERSION, true );
session = newSession;
- }
+ }*/
DependencyResolutionRequest request =
new DefaultDependencyResolutionRequest();
@@ -138,8 +138,8 @@ public class Maven31DependencyGraphBuild
private DependencyNode buildDependencyNode( DependencyNode parent, org.eclipse.aether.graph.DependencyNode node,
Artifact artifact, ArtifactFilter filter )
{
- String premanagedVersion = DependencyManagerUtils.getPremanagedVersion( node );
- String premanagedScope = DependencyManagerUtils.getPremanagedScope( node );
+ String premanagedVersion = null; //DependencyManagerUtils.getPremanagedVersion( node );
+ String premanagedScope = null; //DependencyManagerUtils.getPremanagedScope( node );
DefaultDependencyNode current =
new DefaultDependencyNode( parent, artifact, premanagedVersion, premanagedScope,
Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java?rev=1469561&r1=1469560&r2=1469561&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java (original)
+++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java Thu Apr 18 20:51:45 2013
@@ -113,7 +113,7 @@ public class Maven3DependencyGraphBuilde
Artifact artifact, ArtifactFilter filter )
{
DefaultDependencyNode current =
- new DefaultDependencyNode( parent, artifact, node.getPremanagedVersion(), node.getPremanagedScope(),
+ new DefaultDependencyNode( parent, artifact, null /*node.getPremanagedVersion()*/, null /*node.getPremanagedScope()*/,
getVersionSelectedFromRange( node.getVersionConstraint() ) );
List<DependencyNode> nodes = new ArrayList<DependencyNode>( node.getChildren().size() );