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 2010/08/25 15:05:21 UTC
svn commit: r989085 - in /maven/plugins/branches/maven-site-plugin-3.x: ./
src/main/java/org/apache/maven/plugins/site/
src/test/java/org/apache/maven/plugins/site/
Author: olamy
Date: Wed Aug 25 13:05:21 2010
New Revision: 989085
URL: http://svn.apache.org/viewvc?rev=989085&view=rev
Log:
[MSITE-498] Update to last maven-core 3.0-beta-3
Modified:
maven/plugins/branches/maven-site-plugin-3.x/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
maven/plugins/branches/maven-site-plugin-3.x/src/test/java/org/apache/maven/plugins/site/SiteDeployMojoTest.java
maven/plugins/branches/maven-site-plugin-3.x/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java
Modified: maven/plugins/branches/maven-site-plugin-3.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/pom.xml?rev=989085&r1=989084&r2=989085&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/pom.xml Wed Aug 25 13:05:21 2010
@@ -164,7 +164,7 @@ under the License.
<properties>
<doxiaVersion>1.1.3</doxiaVersion>
<doxiaSitetoolsVersion>1.1.3</doxiaSitetoolsVersion>
- <mavenVersion>3.0-beta-2</mavenVersion>
+ <mavenVersion>3.0-SNAPSHOT</mavenVersion>
<wagonVersion>1.0-beta-6</wagonVersion>
<plexusVersion>1.5.4</plexusVersion>
<javadocPluginVersion>2.6.1</javadocPluginVersion>
@@ -351,11 +351,7 @@ under the License.
<artifactId>plexus-archiver</artifactId>
<version>1.0-alpha-7</version>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>${plexusVersion}</version>
- </dependency>
+
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-i18n</artifactId>
@@ -386,6 +382,11 @@ under the License.
<version>2.0-alpha-1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ </dependency>
</dependencies>
<build>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=989085&r1=989084&r2=989085&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java Wed Aug 25 13:05:21 2010
@@ -262,7 +262,7 @@ public abstract class AbstractSiteRender
// Put any of the properties in directly into the Velocity context
attributes.putAll( project.getProperties() );
-
+
DecorationModel decorationModel;
try
{
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java?rev=989085&r1=989084&r2=989085&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java Wed Aug 25 13:05:21 2010
@@ -27,7 +27,7 @@ import java.util.Set;
import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
import org.apache.maven.artifact.repository.RepositoryRequest;
-import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.MavenPluginManager;
@@ -55,6 +55,7 @@ import org.codehaus.plexus.util.StringUt
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomUtils;
import org.mortbay.log.Log;
+import org.sonatype.aether.util.filter.ExclusionsDependencyFilter;
/**
* <p>
@@ -129,13 +130,14 @@ public class DefaultMavenReportExecutor
{
getLog().debug( "DefaultMavenReportExecutor.buildMavenReports()" );
}
-
- ExclusionSetFilter exclusionSetFilter = new ExclusionSetFilter( EXCLUDES );
+ ExclusionsDependencyFilter exclusionSetFilter = new ExclusionsDependencyFilter( EXCLUDES );
RepositoryRequest repositoryRequest = new DefaultRepositoryRequest();
repositoryRequest.setLocalRepository( mavenReportExecutorRequest.getLocalRepository() );
repositoryRequest.setRemoteRepositories( mavenReportExecutorRequest.getProject().getPluginArtifactRepositories() );
+ MavenSession session = mavenReportExecutorRequest.getMavenSession();
+
try
{
List<MavenReportExecution> reports = new ArrayList<MavenReportExecution>();
@@ -154,7 +156,8 @@ public class DefaultMavenReportExecutor
List<String> goals = new ArrayList<String>();
- PluginDescriptor pluginDescriptor = mavenPluginManager.getPluginDescriptor( plugin, repositoryRequest );
+
+ PluginDescriptor pluginDescriptor = mavenPluginManager.getPluginDescriptor(plugin, session.getCurrentProject().getRemotePluginRepositories(), session.getRepositorySession());
if ( reportPlugin.getReportSets().isEmpty() )
{
@@ -190,7 +193,6 @@ public class DefaultMavenReportExecutor
mavenReportExecutorRequest.getMavenSession(),
Thread.currentThread().getContextClassLoader(), IMPORTS,
exclusionSetFilter );
-
MavenReport mavenReport =
getConfiguredMavenReport( mojoExecution, pluginDescriptor, mavenReportExecutorRequest );
@@ -467,10 +469,14 @@ public class DefaultMavenReportExecutor
+ " longer support building such malformed projects." );
logger.warn( "" );
- PluginVersionRequest pluginVersionRequest = new DefaultPluginVersionRequest( repositoryRequest );
- pluginVersionRequest.setOffline( mavenReportExecutorRequest.getMavenSession().getRequest().isOffline() );
+ Plugin plugin = new Plugin();
+ plugin.setGroupId( reportPlugin.getGroupId() );
+ plugin.setArtifactId( reportPlugin.getArtifactId() );
+
+ PluginVersionRequest pluginVersionRequest = new DefaultPluginVersionRequest( plugin , mavenReportExecutorRequest.getMavenSession() );
+ //pluginVersionRequest.setOffline( mavenReportExecutorRequest.getMavenSession().getRequest().isOffline() );
- pluginVersionRequest.setForceUpdate( mavenReportExecutorRequest.getMavenSession().getRequest().isUpdateSnapshots() );
+ //pluginVersionRequest.setForceUpdate( mavenReportExecutorRequest.getMavenSession().getRequest().isUpdateSnapshots() );
pluginVersionRequest.setGroupId( reportPlugin.getGroupId() );
pluginVersionRequest.setArtifactId( reportPlugin.getArtifactId() );
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/test/java/org/apache/maven/plugins/site/SiteDeployMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/test/java/org/apache/maven/plugins/site/SiteDeployMojoTest.java?rev=989085&r1=989084&r2=989085&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/test/java/org/apache/maven/plugins/site/SiteDeployMojoTest.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/test/java/org/apache/maven/plugins/site/SiteDeployMojoTest.java Wed Aug 25 13:05:21 2010
@@ -20,21 +20,27 @@ package org.apache.maven.plugins.site;
*/
import junit.framework.TestCase;
+
import org.apache.maven.artifact.manager.DefaultWagonManager;
-import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.wagon.repository.Repository;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
/**
* @author <a href="mailto:cleclerc@xebia.fr">Cyrille Le Clerc</a>
*/
+@RunWith(JUnit4.class)
public class SiteDeployMojoTest
extends TestCase
{
- WagonManager wagonManager;
+ DefaultWagonManager wagonManager;
Repository repository;
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -42,21 +48,22 @@ public class SiteDeployMojoTest
repository = new Repository( "my-repository", "scp://repository-host/var/maven2" );
}
+ @Test
public void testFoo()
{
// should not fail ;-)
assertTrue( true );
}
- // FIXME restore this tests ??
- /*
+ /**
+ FIXME find a way to restore those tests as wagonManager.addProxy is not anymore available in maven 3.
public void testGetProxyInfoNoProxyForRepositoryProtocol()
{
wagonManager.addProxy( "http", "proxy-host", 8080, "my-user", "my-password", null );
ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
assertNull( "ProxyInfo must be null because http != scp", proxyInfo );
}
-
+
public void testGetProxyInfoForRepositoryHostExactlyMatchesNonProxyHosts()
{
wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password",
@@ -95,6 +102,8 @@ public class SiteDeployMojoTest
public void testGetProxyInfoForRepositoryHostWildcardNoMatchNonProxyHosts2()
{
+ wagonManager.
+
wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password", "*mycompany" );
ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
assertNotNull( "ProxyInfo must be found because 'repository-host' not in nonProxyHosts list", proxyInfo );
@@ -127,5 +136,5 @@ public class SiteDeployMojoTest
ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
assertNotNull( "ProxyInfo must be found because 'repository-host' not in nonProxyHosts list", proxyInfo );
}
- */
+ **/
}
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java?rev=989085&r1=989084&r2=989085&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java Wed Aug 25 13:05:21 2010
@@ -18,26 +18,39 @@ package org.apache.maven.plugins.site;
* specific language governing permissions and limitations
* under the License.
*/
-
import java.io.File;
import java.util.HashMap;
import org.apache.maven.doxia.tools.SiteTool;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.codehaus.plexus.util.FileUtils;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
/**
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
*/
+@RunWith(JUnit4.class)
public class SiteMojoTest
extends AbstractMojoTestCase
{
+
+ @Before
+ public void setup()
+ throws Exception
+ {
+ super.setUp();
+ }
+
/**
* Test method for 'org.apache.maven.plugins.site.AbstractSiteMojo.getInterpolatedSiteDescriptorContent(Map, MavenProject, String)'
*
* @throws Exception
*/
+ @Test
public void testGetInterpolatedSiteDescriptorContent()
throws Exception
{