Author: jdcasey Date: Wed Sep 3 15:45:14 2008 New Revision: 691813 URL: http://svn.apache.org/viewvc?rev=691813&view=rev Log: Fixing for MNG-3741.
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3475-baseAlignedDir/plugin/src/main/java/test/Mojo3475.java maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/CheckReport.java Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3475-baseAlignedDir/plugin/src/main/java/test/Mojo3475.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3475-baseAlignedDir/plugin/src/main/java/test/Mojo3475.java?rev=691813&r1=691812&r2=691813&view=diff ============================================================================== --- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3475-baseAlignedDir/plugin/src/main/java/test/Mojo3475.java (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3475-baseAlignedDir/plugin/src/main/java/test/Mojo3475.java Wed Sep 3 15:45:14 2008 @@ -34,7 +34,10 @@ testDirectoryAbsolutePath( build.getTestOutputDirectory(), failed ); testDirectoryAbsolutePath( build.getSourceDirectory(), failed ); testDirectoryAbsolutePath( build.getTestSourceDirectory(), failed ); - testDirectoryAbsolutePath( build.getScriptSourceDirectory(), failed ); + + // MNG-3741: Don't worry about relative script source directory. + // testDirectoryAbsolutePath( build.getScriptSourceDirectory(), failed ); + testDirectoryAbsolutePath( project.getReporting().getOutputDirectory(), failed ); if ( !failed.isEmpty() ) Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java?rev=691813&r1=691812&r2=691813&view=diff ============================================================================== --- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java Wed Sep 3 15:45:14 2008 @@ -64,7 +64,9 @@ checkListOfPaths( getTestProject().getCompileSourceRoots(), executionBasedir, "compileSourceRoots", failedPaths ); checkListOfPaths( getTestProject().getTestCompileSourceRoots(), executionBasedir, "testCompileSourceRoots", failedPaths ); - checkListOfPaths( getTestProject().getScriptSourceRoots(), executionBasedir, "scriptSourceRoots", failedPaths ); + + // MNG-3741: Don't worry about relative paths in scriptSourceRoots. + // checkListOfPaths( getTestProject().getScriptSourceRoots(), executionBasedir, "scriptSourceRoots", failedPaths ); if ( !failedPaths.isEmpty() ) Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/CheckReport.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/CheckReport.java?rev=691813&r1=691812&r2=691813&view=diff ============================================================================== --- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/CheckReport.java (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/CheckReport.java Wed Sep 3 15:45:14 2008 @@ -77,7 +77,9 @@ checkListOfPaths( executionProject.getCompileSourceRoots(), executionBasedir, "compileSourceRoots", failedPaths ); checkListOfPaths( executionProject.getTestCompileSourceRoots(), executionBasedir, "testCompileSourceRoots", failedPaths ); - checkListOfPaths( executionProject.getScriptSourceRoots(), executionBasedir, "scriptSourceRoots", failedPaths ); + + // MNG-3741: Don't worry about relative paths in scriptSourceRoots. + // checkListOfPaths( executionProject.getScriptSourceRoots(), executionBasedir, "scriptSourceRoots", failedPaths ); if ( !failedPaths.isEmpty() ) {