Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
John Dennis Casey 2005-07-29 23:26:42 +00:00
parent 5051bf630b
commit dad9ebc577
7 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-artifact-manager/pom.xml
View File

@ -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>

1
maven-core-it/it0013/cli-options.txt Normal file
View File

@ -0,0 +1 @@
--no-plugin-registry --check-plugin-latest

1
maven-core-it/it0015/cli-options.txt Normal file
View File

@ -0,0 +1 @@
--no-plugin-registry --check-plugin-latest

1
maven-core-it/it0020/cli-options.txt Normal file
View File

@ -0,0 +1 @@
--no-plugin-registry --check-plugin-latest

5
maven-plugins/maven-site-plugin/pom.xml
View File

@ -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>

4
maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
View File

@ -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() );

5
maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
View File

@ -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()