diff --git a/maven-artifact-manager/pom.xml b/maven-artifact-manager/pom.xml
index 5140baa6e0..cb4b5a7910 100644
--- a/maven-artifact-manager/pom.xml
+++ b/maven-artifact-manager/pom.xml
@@ -25,7 +25,7 @@
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
diff --git a/maven-core-it/it0013/cli-options.txt b/maven-core-it/it0013/cli-options.txt
new file mode 100644
index 0000000000..c70ad73fb2
--- /dev/null
+++ b/maven-core-it/it0013/cli-options.txt
@@ -0,0 +1 @@
+--no-plugin-registry --check-plugin-latest
diff --git a/maven-core-it/it0015/cli-options.txt b/maven-core-it/it0015/cli-options.txt
new file mode 100644
index 0000000000..c70ad73fb2
--- /dev/null
+++ b/maven-core-it/it0015/cli-options.txt
@@ -0,0 +1 @@
+--no-plugin-registry --check-plugin-latest
diff --git a/maven-core-it/it0020/cli-options.txt b/maven-core-it/it0020/cli-options.txt
new file mode 100644
index 0000000000..c70ad73fb2
--- /dev/null
+++ b/maven-core-it/it0020/cli-options.txt
@@ -0,0 +1 @@
+--no-plugin-registry --check-plugin-latest
diff --git a/maven-plugins/maven-site-plugin/pom.xml b/maven-plugins/maven-site-plugin/pom.xml
index 15080f7576..9a07fede7e 100644
--- a/maven-plugins/maven-site-plugin/pom.xml
+++ b/maven-plugins/maven-site-plugin/pom.xml
@@ -61,6 +61,11 @@
       <artifactId>wagon-ssh</artifactId>
       <version>1.0-alpha-4</version>
     </dependency>
+    <dependency>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>1.0.1</version>
+    </dependency>
   </dependencies>
   <developers>
     <developer>
diff --git a/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java b/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
index d9e42d85f1..85cf30d951 100644
--- a/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
+++ b/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
@@ -1067,7 +1067,7 @@ public class DoxiaMojo
         }
         excludePattern.deleteCharAt( excludePattern.length() - 1 );
 
-        List siteFiles = FileUtils.getFileNames( directory, null, excludePattern.toString(), false, false );
+        List siteFiles = FileUtils.getFileNames( directory, null, excludePattern.toString(), false );
         for ( Iterator it = siteFiles.iterator(); it.hasNext(); )
         {
             String currentFile = ( (String) it.next() );
@@ -1089,7 +1089,7 @@ public class DoxiaMojo
 
             String filePattern = "**/" + key + ".*";
 
-            List files = FileUtils.getFileNames( directory, filePattern, excludePattern.toString(), true, false );
+            List files = FileUtils.getFileNames( directory, filePattern, excludePattern.toString(), true );
             if ( ( files != null ) && ( files.size() > 0 ) )
             {
                 List tmp = (List) duplicate.get( key.toLowerCase() );
diff --git a/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java b/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
index 2c0cdfd5d9..8b6aabc493 100644
--- a/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
+++ b/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
@@ -48,6 +48,8 @@ public class ActiveProjectArtifact
     {
         this.artifact = artifact;
         this.project = project;
+        
+        artifact.setFile( project.getArtifact().getFile() );
     }
 
     public File getFile()
@@ -99,6 +101,9 @@ public class ActiveProjectArtifact
     public void setFile( File destination )
     {
         artifact.setFile( destination );
+        
+        // TODO: [jc; 29-jul-05] Is this appropriate? I mean, isn't the point to use the project-file instead??
+        project.getArtifact().setFile( destination );
     }
 
     public String getBaseVersion()