You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2015/12/13 20:35:50 UTC
svn commit: r1719823 - in /maven/plugins/trunk/maven-site-plugin:
dependency-reduced-pom.xml
src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
Author: hboutemy
Date: Sun Dec 13 19:35:50 2015
New Revision: 1719823
URL: http://svn.apache.org/viewvc?rev=1719823&view=rev
Log:
[DOXIASITETOOLS-125] changed siteDirectory from String to File in getDecorationModel()
Added:
maven/plugins/trunk/maven-site-plugin/dependency-reduced-pom.xml (with props)
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
Added: maven/plugins/trunk/maven-site-plugin/dependency-reduced-pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/dependency-reduced-pom.xml?rev=1719823&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/dependency-reduced-pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/dependency-reduced-pom.xml Sun Dec 13 19:35:50 2015
@@ -0,0 +1,582 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>maven-plugins</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <version>28</version>
+ <relativePath>../../pom/maven/maven-plugins/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>maven-site-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <name>Apache Maven Site Plugin</name>
+ <version>3.4.1-SNAPSHOT</version>
+ <description>The Maven Site Plugin is a plugin that generates a site for the current project.</description>
+ <prerequisites>
+ <maven>${prerequisiteMavenVersion}</maven>
+ </prerequisites>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/MSITE</url>
+ </issueManagement>
+ <contributors>
+ <contributor>
+ <name>Naoki Nose</name>
+ <email>ikkoan@mail.goo.ne.jp</email>
+ <roles>
+ <role>Japanese translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Michael Wechner</name>
+ <email>michael.wechner@wyona.com</email>
+ <roles>
+ <role>German translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Christian Schulte</name>
+ <email>cs@schulte.it</email>
+ <roles>
+ <role>German translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Piotr Bzdyl</name>
+ <email>piotr@bzdyl.net</email>
+ <roles>
+ <role>Polish translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Domingos Creado</name>
+ <email>dcreado@users.sf.net</email>
+ <roles>
+ <role>Brazilian Portuguese translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>John Allen</name>
+ <email>john_h_allen@hotmail.com</email>
+ </contributor>
+ <contributor>
+ <name>Laszlo Hornyak Kocka</name>
+ <email>laszlo.hornyak@gmail.com</email>
+ <roles>
+ <role>Hungarian translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Hermod Opstvedt</name>
+ <email>hermod.opstvedt@dnbnor.no</email>
+ <roles>
+ <role>Norwegian translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Yue Ni</name>
+ <email>ni2yue4@gmail.com</email>
+ <roles>
+ <role>Chinese translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Arturo Vazquez</name>
+ <email>vaz@root.com.mx</email>
+ <roles>
+ <role>Spanish translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Woonsan Ko</name>
+ <email>woon_san@yahoo.com</email>
+ <roles>
+ <role>Korean translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Martin Vysny</name>
+ <email>mvy@whitestein.com</email>
+ <roles>
+ <role>Slovak translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Petr Ferschmann</name>
+ <email>pferschmann@softeu.com</email>
+ <roles>
+ <role>Czech translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Kristian Mandrup</name>
+ <email>kristian@mandrup.dk</email>
+ <roles>
+ <role>Danish translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Samuel Santos</name>
+ <email>samaxes@gmail.com</email>
+ <roles>
+ <role>Portuguese translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Mindaugas Greibus</name>
+ <email>spantus@gmail.com</email>
+ <roles>
+ <role>Lithuanian translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Marvin Froeder</name>
+ <email>velo.br@gmail.com</email>
+ <roles>
+ <role>msite-504</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Yevgeny Nyden</name>
+ <email>yev@curre.net</email>
+ <roles>
+ <role>Russian translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Daniel Fernández</name>
+ <email>daniel.fernandez.garrido@gmail.com</email>
+ <roles>
+ <role>Galician translator</role>
+ </roles>
+ </contributor>
+ </contributors>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin/</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/</url>
+ </scm>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>dependency-reduced-pom.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>org.apache.maven.reporting:maven-reporting-api</include>
+ <include>org.apache.maven:maven-artifact</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>org.apache.maven.reporting:maven-reporting-api</artifact>
+ <includes>
+ <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>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>run-its</id>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>2.0.0</version>
+ <configuration>
+ <goals>
+ <goal>clean</goal>
+ <goal>org.apache.maven.plugins:maven-site-plugin:3.4.1-SNAPSHOT:site</goal>
+ </goals>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ <profile>
+ <id>reporting</id>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>l10n-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <configuration>
+ <locales>
+ <locale>ca</locale>
+ <locale>cs</locale>
+ <locale>da</locale>
+ <locale>de</locale>
+ <locale>es</locale>
+ <locale>fr</locale>
+ <locale>gl</locale>
+ <locale>hu</locale>
+ <locale>it</locale>
+ <locale>ja</locale>
+ <locale>ko</locale>
+ <locale>lt</locale>
+ <locale>nl</locale>
+ <locale>no</locale>
+ <locale>pl</locale>
+ <locale>pt</locale>
+ <locale>pt_BR</locale>
+ <locale>ru</locale>
+ <locale>sk</locale>
+ <locale>sv</locale>
+ <locale>tr</locale>
+ <locale>zh_CN</locale>
+ <locale>zh_TW</locale>
+ </locales>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ <profile>
+ <id>dev</id>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>${project.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-exec</artifactId>
+ <version>1.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>3.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>3.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>3.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <version>3.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings-builder</artifactId>
+ <version>3.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>2.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sink-api</artifactId>
+ <version>1.7-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-logging-api</artifactId>
+ <version>1.7-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-core</artifactId>
+ <version>1.7-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-xhtml</artifactId>
+ <version>1.7-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-apt</artifactId>
+ <version>1.7-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-xdoc</artifactId>
+ <version>1.7-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-fml</artifactId>
+ <version>1.7-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.7-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-decoration-model</artifactId>
+ <version>1.7-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-site-renderer</artifactId>
+ <version>1.7-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-integration-tools</artifactId>
+ <version>1.7-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav-jackrabbit</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-nop</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>wagon-http-shared</artifactId>
+ <groupId>org.apache.maven.wagon</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jackrabbit-webdav</artifactId>
+ <groupId>org.apache.jackrabbit</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>2.9</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-i18n</artifactId>
+ <version>1.0-beta-7</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>plexus-component-api</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-velocity</artifactId>
+ <version>1.1.8</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>velocity</artifactId>
+ <groupId>velocity</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>3.0.20</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.25</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>6.1.25</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ <version>6.1.25</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>jetty-sslengine</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jetty-util5</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.6.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-testing</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ <version>2.0-alpha-1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</url>
+ </site>
+ </distributionManagement>
+ <properties>
+ <plexusVersion>1.5.4</plexusVersion>
+ <pmdPluginVersion>3.0.1</pmdPluginVersion>
+ <doxiaSitetoolsVersion>1.7-SNAPSHOT</doxiaSitetoolsVersion>
+ <mavenVersion>3.0</mavenVersion>
+ <scmVersion>1.4</scmVersion>
+ <wagonVersion>1.0</wagonVersion>
+ <prerequisiteMavenVersion>2.2.1</prerequisiteMavenVersion>
+ <checkstylePluginVersion>2.9.1</checkstylePluginVersion>
+ <projectInfoReportsPluginVersion>2.7</projectInfoReportsPluginVersion>
+ <javadocPluginVersion>2.9.1</javadocPluginVersion>
+ <doxiaVersion>1.7-SNAPSHOT</doxiaVersion>
+ </properties>
+</project>
+
Propchange: maven/plugins/trunk/maven-site-plugin/dependency-reduced-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/dependency-reduced-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-site-plugin/dependency-reduced-pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java?rev=1719823&r1=1719822&r2=1719823&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java Sun Dec 13 19:35:50 2015
@@ -277,10 +277,8 @@ public abstract class AbstractSiteRender
DecorationModel decorationModel;
try
{
- decorationModel = siteTool.getDecorationModel( project, reactorProjects, localRepository, repositories,
- siteTool.getRelativePath( siteDirectory.getAbsolutePath(),
- project.getBasedir().getAbsolutePath() ),
- locale );
+ decorationModel = siteTool.getDecorationModel( siteDirectory, locale, project, reactorProjects,
+ localRepository, repositories );
}
catch ( SiteToolException e )
{