You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2007/10/17 03:30:13 UTC
svn commit: r585316 -
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Author: brianf
Date: Tue Oct 16 18:30:12 2007
New Revision: 585316
URL: http://svn.apache.org/viewvc?rev=585316&view=rev
Log:
MNG2045 applying patch from Paul Gier to fix test jar dependencies from sibling projects.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=585316&r1=585315&r2=585316&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Tue Oct 16 18:30:12 2007
@@ -1707,15 +1707,30 @@
return pluginArtifact;
}
- private void addArtifactPath(Artifact a, List list) throws DependencyResolutionRequiredException
+ private void addArtifactPath(Artifact a, List list) throws DependencyResolutionRequiredException
{
String refId = getProjectReferenceId( a.getGroupId(), a.getArtifactId(), a.getVersion() );
MavenProject project = (MavenProject) projectReferences.get( refId );
+
+ boolean projectDirFound = false;
if ( project != null )
{
- list.add( project.getBuild().getOutputDirectory() );
+ if (a.getType().equals("test-jar"))
+ {
+ File testOutputDir = new File( project.getBuild().getTestOutputDirectory() );
+ if ( testOutputDir.exists() )
+ {
+ list.add( testOutputDir.getAbsolutePath() );
+ projectDirFound = true;
+ }
+ }
+ else
+ {
+ list.add( project.getBuild().getOutputDirectory() );
+ projectDirFound = true;
+ }
}
- else
+ if ( ! projectDirFound )
{
File file = a.getFile();
if ( file == null )
@@ -1725,7 +1740,7 @@
list.add( file.getPath() );
}
}
-
+
public void clearExecutionProject()
{
if ( !previousExecutionProjects.isEmpty() )