From dad9ebc5774d5a29f5bba362361cf65809db5c18 Mon Sep 17 00:00:00 2001 From: John Dennis Casey Date: Fri, 29 Jul 2005 23:26:42 +0000 Subject: [PATCH] o Fixing DoxiaMojo (there was an API incompatibility there, having to do with FileUtils...not sure if there is something that didn't get deployed, or what) o Adding cli-options.txt for three ITs that failed when I cleaned out the local repo o Fixing the setFile(..) method of ActiveProjectArtifact (hopefully) for Emmanuel's continuum build problem... git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226426 13f79535-47bb-0310-9956-ffa450edef68 --- maven-artifact-manager/pom.xml | 2 +- maven-core-it/it0013/cli-options.txt | 1 + maven-core-it/it0015/cli-options.txt | 1 + maven-core-it/it0020/cli-options.txt | 1 + maven-plugins/maven-site-plugin/pom.xml | 5 +++++ .../src/main/java/org/apache/maven/doxia/DoxiaMojo.java | 4 ++-- .../apache/maven/project/artifact/ActiveProjectArtifact.java | 5 +++++ 7 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 maven-core-it/it0013/cli-options.txt create mode 100644 maven-core-it/it0015/cli-options.txt create mode 100644 maven-core-it/it0020/cli-options.txt 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 @@ plexus plexus-utils - 1.0.2-SNAPSHOT + 1.0.1 org.apache.maven.wagon 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 @@ wagon-ssh 1.0-alpha-4 + + plexus + plexus-utils + 1.0.1 + 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()