You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2016/06/08 19:41:39 UTC
svn commit: r1747441 - in /maven/plugins/trunk/maven-site-plugin: pom.xml
src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java
src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
Author: khmarbaise
Date: Wed Jun 8 19:41:38 2016
New Revision: 1747441
URL: http://svn.apache.org/viewvc?rev=1747441&view=rev
Log:
[MSITE-778] Upgrade maven-archiver to 3.1.0
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1747441&r1=1747440&r2=1747441&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Wed Jun 8 19:41:38 2016
@@ -257,7 +257,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>2.5</version>
+ <version>3.1.0</version>
</dependency>
<!-- dependencies to annotations -->
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java?rev=1747441&r1=1747440&r2=1747441&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java Wed Jun 8 19:41:38 2016
@@ -205,7 +205,7 @@ public class SiteJarMojo
archiver.getArchiver().addDirectory( siteDirectory, getArchiveIncludes(), getArchiveExcludes() );
}
- archiver.createArchive( project, archive );
+ archiver.createArchive( getSession(), getProject(), archive );
return siteJar;
}
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java?rev=1747441&r1=1747440&r2=1747441&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java Wed Jun 8 19:41:38 2016
@@ -32,6 +32,7 @@ import org.apache.maven.doxia.siterender
import org.apache.maven.doxia.siterenderer.DoxiaDocumentRenderer;
import org.apache.maven.doxia.siterenderer.RendererException;
import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Mojo;
@@ -44,8 +45,8 @@ import org.apache.maven.reporting.exec.M
/**
* Generates the site for a single project.
* <p>
- * Note that links between module sites in a multi module build will <b>not</b>
- * work, since local build directory structure doesn't match deployed site.
+ * Note that links between module sites in a multi module build will <b>not</b> work, since local build directory
+ * structure doesn't match deployed site.
* </p>
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -77,10 +78,8 @@ public class SiteMojo
private boolean generateSitemap;
/**
- * Whether to validate xml input documents.
- * If set to true, <strong>all</strong> input documents in xml format
- * (in particular xdoc and fml) will be validated and any error will
- * lead to a build failure.
+ * Whether to validate xml input documents. If set to true, <strong>all</strong> input documents in xml format (in
+ * particular xdoc and fml) will be validated and any error will lead to a build failure.
*
* @since 2.1.1
*/
@@ -88,9 +87,7 @@ public class SiteMojo
private boolean validate;
/**
- * {@inheritDoc}
- *
- * Generate the project site
+ * {@inheritDoc} Generate the project site
* <p/>
* throws MojoExecutionException if any
*
@@ -184,8 +181,8 @@ public class SiteMojo
{
getLog().info( "Generating Sitemap." );
- new SiteMap( getOutputEncoding(), i18n )
- .generate( context.getDecoration(), generatedSiteDirectory, locale );
+ new SiteMap( getOutputEncoding(), i18n ).generate( context.getDecoration(), generatedSiteDirectory,
+ locale );
}
// 3. Generated docs must be (re-)done afterwards as they are often generated by reports
@@ -202,20 +199,21 @@ public class SiteMojo
/**
* Render Doxia documents from the list given, but not reports.
+ *
* @param documents a collection of documents containing both Doxia source files and reports
* @return the sublist of documents that are not Doxia source files
*/
private List<DocumentRenderer> renderDoxiaDocuments( Map<String, DocumentRenderer> documents,
SiteRenderingContext context, File outputDir,
boolean generated )
- throws RendererException, IOException
+ throws RendererException, IOException
{
Map<String, DocumentRenderer> doxiaDocuments = new TreeMap<String, DocumentRenderer>();
List<DocumentRenderer> nonDoxiaDocuments = new ArrayList<DocumentRenderer>();
Map<String, Integer> counts = new TreeMap<String, Integer>();
- for ( Map.Entry<String, DocumentRenderer> entry: documents.entrySet() )
+ for ( Map.Entry<String, DocumentRenderer> entry : documents.entrySet() )
{
DocumentRenderer doc = entry.getValue();
@@ -247,7 +245,7 @@ public class SiteMojo
if ( doxiaDocuments.size() > 0 )
{
StringBuilder sb = new StringBuilder( 15 * counts.size() );
- for ( Map.Entry<String, Integer> entry: counts.entrySet() )
+ for ( Map.Entry<String, Integer> entry : counts.entrySet() )
{
if ( sb.length() > 0 )
{
@@ -258,8 +256,8 @@ public class SiteMojo
sb.append( entry.getKey() );
}
- getLog().info( "Rendering " + doxiaDocuments.size() + ( generated ? " generated" : "" )
- + " Doxia document" + ( doxiaDocuments.size() > 1 ? "s" : "" ) + ": " + sb.toString() );
+ getLog().info( "Rendering " + doxiaDocuments.size() + ( generated ? " generated" : "" ) + " Doxia document"
+ + ( doxiaDocuments.size() > 1 ? "s" : "" ) + ": " + sb.toString() );
siteRenderer.render( doxiaDocuments.values(), context, outputDir );
}
@@ -292,4 +290,9 @@ public class SiteMojo
{
return project;
}
+
+ public MavenSession getSession()
+ {
+ return mavenSession;
+ }
}