You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2011/03/20 09:36:20 UTC
svn commit: r1083377 - in /maven/plugins/branches/MSITE-560: pom.xml src/it/MSITE-504/pom.xml src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java

Author: olamy
Date: Sun Mar 20 08:36:20 2011
New Revision: 1083377

URL: http://svn.apache.org/viewvc?rev=1083377&view=rev
Log:
don't use method not available in container used with mvn 2.x and lock shade plugin version

Modified:
    maven/plugins/branches/MSITE-560/pom.xml
    maven/plugins/branches/MSITE-560/src/it/MSITE-504/pom.xml
    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=1083377&r1=1083376&r2=1083377&view=diff
==============================================================================
--- maven/plugins/branches/MSITE-560/pom.xml (original)
+++ maven/plugins/branches/MSITE-560/pom.xml Sun Mar 20 08:36:20 2011
@@ -512,6 +512,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
+        <version>1.4</version>
         <executions>
           <execution>
             <phase>package</phase>

Modified: maven/plugins/branches/MSITE-560/src/it/MSITE-504/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MSITE-560/src/it/MSITE-504/pom.xml?rev=1083377&r1=1083376&r2=1083377&view=diff
==============================================================================
--- maven/plugins/branches/MSITE-560/src/it/MSITE-504/pom.xml (original)
+++ maven/plugins/branches/MSITE-560/src/it/MSITE-504/pom.xml Sun Mar 20 08:36:20 2011
@@ -11,9 +11,9 @@
     <module>maven-plugin-consumer</module>
   </modules>
 
-  <prerequisites>
+  <!--prerequisites>
     <maven>3.0</maven>
-  </prerequisites>
+  </prerequisites-->
 
   <build>
     <pluginManagement>
@@ -32,4 +32,4 @@
     </pluginManagement>
   </build>
 
-</project>
\ No newline at end of file
+</project>

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=1083377&r1=1083376&r2=1083377&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 08:36:20 2011
@@ -230,7 +230,9 @@ public abstract class AbstractSiteRender
             MavenReportExecutor mavenReportExecutor;
             try
             {
-                mavenReportExecutor = container.lookup( MavenReportExecutor.class );
+                // not available in container used with mvn 2.x
+                //mavenReportExecutor = container.lookup( MavenReportExecutor.class );
+                mavenReportExecutor = (MavenReportExecutor) container.lookup( MavenReportExecutor.class.getName() );
             }
             catch ( ComponentLookupException e )
             {