Author: olamy
Date: Sun Mar 20 21:32:38 2011
New Revision: 1083577
URL: http://svn.apache.org/viewvc?rev=1083577&view=rev
Log:
take care about maven version before using maven3 code
Added:
maven/plugins/branches/MSITE-560/src/it/MSITE-484/invoker.properties
(with props)
maven/plugins/branches/MSITE-560/src/it/new-configuration/invoker.properties
(with props)
Modified:
maven/plugins/branches/MSITE-560/pom.xml
maven/plugins/branches/MSITE-560/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
maven/plugins/branches/MSITE-560/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Modified: maven/plugins/branches/MSITE-560/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MSITE-560/pom.xml?rev=1083577&r1=1083576&r2=1083577&view=diff
==============================================================================
--- maven/plugins/branches/MSITE-560/pom.xml (original)
+++ maven/plugins/branches/MSITE-560/pom.xml Sun Mar 20 21:32:38 2011
@@ -523,6 +523,7 @@ under the License.
<artifactSet>
<includes>
<include>org.apache.maven.reporting:maven-reporting-api</include>
+ <include>org.apache.maven:maven-artifact</include>
</includes>
</artifactSet>
<filters>
@@ -532,6 +533,13 @@ under the License.
<include>**/MavenMultiPageReport.class</include>
</includes>
</filter>
+ <filter>
+ <artifact>org.apache.maven:maven-artifact</artifact>
+ <includes>
+ <include>**/ComparableVersion.class</include>
+ <include>**/ComparableVersion$*.class</include>
+ </includes>
+ </filter>
</filters>
</configuration>
</execution>
Added: maven/plugins/branches/MSITE-560/src/it/MSITE-484/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MSITE-560/src/it/MSITE-484/invoker.properties?rev=1083577&view=auto
==============================================================================
--- maven/plugins/branches/MSITE-560/src/it/MSITE-484/invoker.properties (added)
+++ maven/plugins/branches/MSITE-560/src/it/MSITE-484/invoker.properties Sun
Mar 20 21:32:38 2011
@@ -0,0 +1 @@
+invoker.maven.version = 3.0+
Propchange: maven/plugins/branches/MSITE-560/src/it/MSITE-484/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MSITE-560/src/it/MSITE-484/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/branches/MSITE-560/src/it/new-configuration/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MSITE-560/src/it/new-configuration/invoker.properties?rev=1083577&view=auto
==============================================================================
---
maven/plugins/branches/MSITE-560/src/it/new-configuration/invoker.properties
(added)
+++
maven/plugins/branches/MSITE-560/src/it/new-configuration/invoker.properties
Sun Mar 20 21:32:38 2011
@@ -0,0 +1 @@
+invoker.maven.version = 3.0+
Propchange:
maven/plugins/branches/MSITE-560/src/it/new-configuration/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/branches/MSITE-560/src/it/new-configuration/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/plugins/branches/MSITE-560/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MSITE-560/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?rev=1083577&r1=1083576&r2=1083577&view=diff
==============================================================================
---
maven/plugins/branches/MSITE-560/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
(original)
+++
maven/plugins/branches/MSITE-560/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
Sun Mar 20 21:32:38 2011
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Properties;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.versioning.ComparableVersion;
import org.apache.maven.doxia.tools.SiteTool;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.project.MavenProject;
@@ -131,6 +132,11 @@ public abstract class AbstractSiteMojo
{
return ( outputEncoding == null ) ? ReaderFactory.UTF_8 :
outputEncoding;
}
+
+ protected boolean isMaven3OrMore()
+ {
+ return new ComparableVersion( getMavenVersion() ).compareTo( new
ComparableVersion( "3.0" ) ) >= 0;
+ }
protected String getMavenVersion()
{
Modified:
maven/plugins/branches/MSITE-560/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MSITE-560/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=1083577&r1=1083576&r2=1083577&view=diff
==============================================================================
---
maven/plugins/branches/MSITE-560/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
(original)
+++
maven/plugins/branches/MSITE-560/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Sun Mar 20 21:32:38 2011
@@ -21,10 +21,8 @@ package org.apache.maven.plugins.site;
import java.io.File;
import java.io.IOException;
-
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -216,10 +214,11 @@ public abstract class AbstractSiteRender
*/
private boolean generateProjectInfo;
+
protected List<MavenReportExecution> getReports()
throws MojoExecutionException
{
- if ( reportPlugins != null && reportPlugins.length > 0 )
+ if ( isMaven3OrMore() )// reportPlugins != null &&
reportPlugins.length > 0 )
{ // to be reviewed : is this the right test to detect Maven 3?
MavenReportExecutorRequest mavenReportExecutorRequest = new
MavenReportExecutorRequest();
mavenReportExecutorRequest.setLocalRepository( localRepository );
