You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jd...@apache.org on 2005/07/30 01:26:52 UTC
svn commit: r226426 - in /maven/components/trunk: maven-artifact-manager/
maven-core-it/it0013/ maven-core-it/it0015/ maven-core-it/it0020/
maven-plugins/maven-site-plugin/
maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/
maven-pro...
Author: jdcasey
Date: Fri Jul 29 16:26:42 2005
New Revision: 226426
URL: http://svn.apache.org/viewcvs?rev=226426&view=rev
Log:
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...
Added:
maven/components/trunk/maven-core-it/it0013/cli-options.txt (with props)
maven/components/trunk/maven-core-it/it0015/cli-options.txt (with props)
maven/components/trunk/maven-core-it/it0020/cli-options.txt (with props)
Modified:
maven/components/trunk/maven-artifact-manager/pom.xml
maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
Modified: maven/components/trunk/maven-artifact-manager/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/pom.xml?rev=226426&r1=226425&r2=226426&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/pom.xml (original)
+++ maven/components/trunk/maven-artifact-manager/pom.xml Fri Jul 29 16:26:42 2005
@@ -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>
Added: maven/components/trunk/maven-core-it/it0013/cli-options.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0013/cli-options.txt?rev=226426&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0013/cli-options.txt (added)
+++ maven/components/trunk/maven-core-it/it0013/cli-options.txt Fri Jul 29 16:26:42 2005
@@ -0,0 +1 @@
+--no-plugin-registry --check-plugin-latest
Propchange: maven/components/trunk/maven-core-it/it0013/cli-options.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0013/cli-options.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0015/cli-options.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0015/cli-options.txt?rev=226426&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0015/cli-options.txt (added)
+++ maven/components/trunk/maven-core-it/it0015/cli-options.txt Fri Jul 29 16:26:42 2005
@@ -0,0 +1 @@
+--no-plugin-registry --check-plugin-latest
Propchange: maven/components/trunk/maven-core-it/it0015/cli-options.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0015/cli-options.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0020/cli-options.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0020/cli-options.txt?rev=226426&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0020/cli-options.txt (added)
+++ maven/components/trunk/maven-core-it/it0020/cli-options.txt Fri Jul 29 16:26:42 2005
@@ -0,0 +1 @@
+--no-plugin-registry --check-plugin-latest
Propchange: maven/components/trunk/maven-core-it/it0020/cli-options.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0020/cli-options.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml?rev=226426&r1=226425&r2=226426&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml Fri Jul 29 16:26:42 2005
@@ -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>
Modified: maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java?rev=226426&r1=226425&r2=226426&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java Fri Jul 29 16:26:42 2005
@@ -1067,7 +1067,7 @@
}
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 @@
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() );
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java?rev=226426&r1=226425&r2=226426&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java Fri Jul 29 16:26:42 2005
@@ -48,6 +48,8 @@
{
this.artifact = artifact;
this.project = project;
+
+ artifact.setFile( project.getArtifact().getFile() );
}
public File getFile()
@@ -99,6 +101,9 @@
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()
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org