You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2005/10/11 23:20:23 UTC

svn commit: r312958 - in /maven/components/trunk: maven-artifact/src/main/java/org/apache/maven/artifact/factory/ maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ maven-plugins/maven-surefire-plugin/src/main/java/or...

Author: jdcasey
Date: Tue Oct 11 14:20:13 2005
New Revision: 312958

URL: http://svn.apache.org/viewcvs?rev=312958&view=rev
Log:
Removing restrictions on adding pluginArtifacts to the test classpath in surefire, since they should go behind the classpath elements from the project...also adding system scope handling to the artifact facotry, so transitive dependencies on system-scoped deps are handled correctly.

Modified:
    maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
    maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
    maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java

Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java?rev=312958&r1=312957&r2=312958&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java Tue Oct 11 14:20:13 2005
@@ -127,6 +127,11 @@
             // added to retain compile scope. Remove if you want compile inherited as runtime
             desiredScope = Artifact.SCOPE_COMPILE;
         }
+        else if ( Artifact.SCOPE_SYSTEM.equals( scope ) )
+        {
+            // system scopes come through unchanged...
+            desiredScope = Artifact.SCOPE_SYSTEM;
+        }
 
         if ( Artifact.SCOPE_TEST.equals( inheritedScope ) )
         {

Modified: maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java?rev=312958&r1=312957&r2=312958&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java Tue Oct 11 14:20:13 2005
@@ -163,7 +163,7 @@
     private void initializeFiltering()
         throws MojoExecutionException
     {
-        filterProperties = new Properties();
+        filterProperties = new Properties( System.getProperties() );
         for ( Iterator i = filters.iterator(); i.hasNext(); )
         {
             String filtersfile = (String) i.next();

Modified: maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java?rev=312958&r1=312957&r2=312958&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java (original)
+++ maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java Tue Oct 11 14:20:13 2005
@@ -272,12 +272,12 @@
         {
             Artifact artifact = (Artifact) i.next();
 
-            if ( "junit".equals( artifact.getArtifactId() ) || "surefire".equals( artifact.getArtifactId() ) )
-            {
-                getLog().debug( artifact.getFile().getAbsolutePath() );
+//            if ( "junit".equals( artifact.getArtifactId() ) || "surefire".equals( artifact.getArtifactId() ) )
+//            {
+                getLog().debug( "Adding to surefire test classpath: " + artifact.getFile().getAbsolutePath() );
 
                 surefireBooter.addClassPathUrl( artifact.getFile().getAbsolutePath() );
-            }
+//            }
         }
 
         addReporters(surefireBooter);