Author: hboutemy
Date: Sun Nov 16 22:40:59 2014
New Revision: 1640046
URL: http://svn.apache.org/r1640046
Log:
updated parent pom and fixed errors reported by Checkstyle
Added:
maven/plugins/trunk/maven-site-plugin/dependency-reduced-pom.xml (with
props)
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/BugFixedRepository.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/PathUtils.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
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
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=1640046&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/dependency-reduced-pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/dependency-reduced-pom.xml Sun Nov 16
22:40:59 2014
@@ -0,0 +1,575 @@
+<?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>26</version>
+ <relativePath>../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>http://jira.codehaus.org/browse/MSITE</url>
+ </issueManagement>
+ <contributors>
+ <contributor>
+ <name>Naoki Nose</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>Japanese translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Michael Wechner</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>German translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Christian Schulte</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>German translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Piotr Bzdyl</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>Polish translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Domingos Creado</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>Brazilian Portuguese translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>John Allen</name>
+ <email>[email protected]</email>
+ </contributor>
+ <contributor>
+ <name>Laszlo Hornyak Kocka</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>Hungarian translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Hermod Opstvedt</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>Norwegian translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Yue Ni</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>Chinese translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Arturo Vazquez</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>Spanish translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Woonsan Ko</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>Korean translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Martin Vysny</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>Slovak translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Petr Ferschmann</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>Czech translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Kristian Mandrup</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>Danish translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Samuel Santos</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>Portuguese translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Mindaugas Greibus</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>Lithuanian translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Marvin Froeder</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>msite-504</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Yevgeny Nyden</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>Russian translator</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Daniel Fernández</name>
+ <email>[email protected]</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>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <releaseProfiles>apache-release,rat,run-its</releaseProfiles>
+ </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>1.9</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.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sink-api</artifactId>
+ <version>1.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-logging-api</artifactId>
+ <version>1.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-core</artifactId>
+ <version>1.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-xhtml</artifactId>
+ <version>1.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-apt</artifactId>
+ <version>1.6</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-xdoc</artifactId>
+ <version>1.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-fml</artifactId>
+ <version>1.6</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.6</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.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-site-renderer</artifactId>
+ <version>1.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-integration-tools</artifactId>
+ <version>1.6</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>jackrabbit-webdav</artifactId>
+ <groupId>org.apache.jackrabbit</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>2.6.4</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/content/${maven.site.path}</url>
+ </site>
+ </distributionManagement>
+ <properties>
+ <plexusVersion>1.5.4</plexusVersion>
+ <pmdPluginVersion>3.0.1</pmdPluginVersion>
+ <doxiaSitetoolsVersion>1.6</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.6</doxiaVersion>
+ </properties>
+</project>
+
Propchange: maven/plugins/trunk/maven-site-plugin/dependency-reduced-pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1640046&r1=1640045&r2=1640046&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Sun Nov 16 22:40:59 2014
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>25</version>
+ <version>26</version>
<relativePath>../maven-plugins/pom.xml</relativePath>
</parent>
@@ -197,7 +197,6 @@ under the License.
<wagonVersion>1.0</wagonVersion>
<plexusVersion>1.5.4</plexusVersion>
<scmVersion>1.4</scmVersion>
- <mavenPluginPluginVersion>3.3</mavenPluginPluginVersion>
<!-- for ITs -->
<javadocPluginVersion>2.9.1</javadocPluginVersion>
<projectInfoReportsPluginVersion>2.7</projectInfoReportsPluginVersion>
@@ -265,7 +264,6 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <scope>provided</scope>
</dependency>
<!-- Doxia -->
@@ -473,11 +471,6 @@ under the License.
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>${mavenPluginPluginVersion}</version>
- </plugin>
- <plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<releaseProfiles>apache-release,rat,run-its</releaseProfiles><!--
TODO add to parent pom -->
@@ -502,25 +495,6 @@ under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <executions>
- <execution>
- <id>default-descriptor</id>
- <phase>process-classes</phase>
- </execution>
- <execution>
- <id>generated-helpmojo</id>
- <goals>
- <goal>helpmojo</goal>
- </goals>
- <configuration>
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>1.4</version>
<executions>
@@ -568,15 +542,10 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
-
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <showVersion>true</showVersion>
- <postBuildHookScript>verify</postBuildHookScript>
-
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<goals>
<goal>clean</goal>
<goal>${project.groupId}:${project.artifactId}:${project.version}:site</goal>
</goals>
- <settingsFile>src/it/settings.xml</settingsFile>
</configuration>
</plugin>
</plugins>
@@ -638,34 +607,5 @@ under the License.
</pluginManagement>
</build>
</profile>
- <profile>
- <id>maven-2</id>
- <activation>
- <file>
- <!-- This employs that the basedir expression is only recognized by
Maven 3.x (see MNG-2363) -->
- <missing>${basedir}</missing>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <configuration>
- <!-- see http://jira.codehaus.org/browse/MNG-5346 -->
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
- <executions>
- <execution>
- <id>mojo-descriptor</id>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?rev=1640046&r1=1640045&r2=1640046&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
Sun Nov 16 22:40:59 2014
@@ -22,7 +22,6 @@ package org.apache.maven.plugins.site;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-
import java.util.List;
import java.util.Properties;
@@ -33,7 +32,6 @@ import org.apache.maven.plugin.AbstractM
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
-
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
@@ -144,9 +142,9 @@ public abstract class AbstractSiteMojo
// and that should have a pom.properties file
// if this ever changes, we will have to revisit this code.
final Properties properties = new Properties();
- final InputStream in =
- MavenProject.class.getClassLoader().getResourceAsStream(
"META-INF/maven/org.apache.maven/maven-core/pom.properties" );
- try
+ final String corePomProperties =
"META-INF/maven/org.apache.maven/maven-core/pom.properties";
+ final InputStream in =
MavenProject.class.getClassLoader().getResourceAsStream( corePomProperties );
+ try
{
properties.load( in );
}
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java?rev=1640046&r1=1640045&r2=1640046&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
Sun Nov 16 22:40:59 2014
@@ -249,7 +249,8 @@ public abstract class AbstractDeployMojo
protected String getDeployModuleDirectory()
throws MojoExecutionException
{
- String relative = siteTool.getRelativePath( getSite( project
).getUrl(), getTopDistributionManagementSiteUrl() );
+ String relative = siteTool.getRelativePath( getSite( project
).getUrl(),
+
getTopDistributionManagementSiteUrl() );
// SiteTool.getRelativePath() uses File.separatorChar,
// so we need to convert '\' to '/' in order for the URL to be valid
for Windows users
@@ -616,7 +617,8 @@ public abstract class AbstractDeployMojo
ProxyInfo proxyInfo = new ProxyInfo();
proxyInfo.setHost( proxy.getHost() );
- // so hackish for wagon the protocol is https for
site dav : dav:https://dav.codehaus.org/mojo/
+ // so hackish for wagon the protocol is https for
site dav:
+ // dav:https://dav.codehaus.org/mojo/
proxyInfo.setType( protocol );
//proxy.getProtocol() );
proxyInfo.setPort( proxy.getPort() );
proxyInfo.setNonProxyHosts(
proxy.getNonProxyHosts() );
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java?rev=1640046&r1=1640045&r2=1640046&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
Sun Nov 16 22:40:59 2014
@@ -141,12 +141,14 @@ public class SiteStageDeployMojo
MavenProject current = project;
MavenProject parent;
+ // CHECKSTYLE_OFF: InnerAssignment
while ( // MSITE-585, MNG-1943
( parent = siteTool.getParentProject( current,
reactorProjects, localRepository ) ) != null
&& stagingSiteURL.equals( getStagingSiteURL( parent ) ) )
{
current = parent;
}
+ // CHECKSTYLE_ON: InnerAssignment
return current;
}
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java?rev=1640046&r1=1640045&r2=1640046&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java
Sun Nov 16 22:40:59 2014
@@ -121,7 +121,8 @@ public class SiteStageMojo
// The user didn't specify a URL: calculate default in the execution
root target dir
File defaultStagingDirectory = new File(
getExecutionRootBuildDirectory(), DEFAULT_STAGING_DIRECTORY );
- getLog().debug( "stagingDirectory NOT specified, using the execution
root project: " + defaultStagingDirectory );
+ getLog().debug( "stagingDirectory NOT specified, using the execution
root project: "
+ + defaultStagingDirectory );
return defaultStagingDirectory;
}
@@ -147,7 +148,8 @@ public class SiteStageMojo
}
else
{
- getLog().debug( "Using the execution root project found in the
reactor: " + executionRootProject.getArtifactId() );
+ getLog().debug( "Using the execution root project found in the
reactor: "
+ + executionRootProject.getArtifactId() );
buildDirectory = new File(
executionRootProject.getBuild().getDirectory() );
}
@@ -158,7 +160,8 @@ public class SiteStageMojo
/**
* Find the execution root in the reactor.
*
- * @param reactorProjects The projects in the reactor. May be
<code>null</code> in which case <code>null</code> is returned.
+ * @param reactorProjects The projects in the reactor. May be
<code>null</code> in which case <code>null</code> is
+ * returned.
* @return The execution root project in the reactor, or <code>null</code>
if none can be found
*/
private static MavenProject getExecutionRootProject( List<MavenProject>
reactorProjects )
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/BugFixedRepository.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/BugFixedRepository.java?rev=1640046&r1=1640045&r2=1640046&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/BugFixedRepository.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/BugFixedRepository.java
Sun Nov 16 22:40:59 2014
@@ -30,7 +30,8 @@ import java.util.Properties;
* can be transfered.
*
* <strong>Note: </strong> This is a copy of a file from Wagon. It was copied
here to be able to work around WAGON-307.
- * This class can be removed when the prerequisite Maven version uses
wagon-provider-api:1.0-beta-7, ie Maven >= 3.0.1.
+ * This class can be removed when the prerequisite Maven version uses
wagon-provider-api:1.0-beta-7,
+ * ie Maven >= 3.0.1.
*
* @author <a href="[email protected]">Michal Maczka</a>
* @version $Id$
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/PathUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/PathUtils.java?rev=1640046&r1=1640045&r2=1640046&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/PathUtils.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/wagon/PathUtils.java
Sun Nov 16 22:40:59 2014
@@ -28,7 +28,8 @@ import java.util.StringTokenizer;
* Various path (URL) manipulation routines.
*
* <strong>Note: </strong> This is a copy of a file from Wagon. It was copied
here to be able to work around WAGON-307.
- * This class can be removed when the prerequisite Maven version uses
wagon-provider-api:1.0-beta-7, ie Maven >= 3.0.1.
+ * This class can be removed when the prerequisite Maven version uses
wagon-provider-api:1.0-beta-7,
+ * ie Maven >= 3.0.1.
*
* @author <a href="[email protected]">Michal Maczka</a>
* @version $Id$
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=1640046&r1=1640045&r2=1640046&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 Nov 16 22:40:59 2014
@@ -430,7 +430,8 @@ public abstract class AbstractSiteRender
else
{
RenderingContext renderingContext = new RenderingContext(
siteDirectory, outputName );
- DocumentRenderer renderer = new ReportDocumentRenderer(
mavenReportExecution, renderingContext, getLog() );
+ DocumentRenderer renderer =
+ new ReportDocumentRenderer( mavenReportExecution,
renderingContext, getLog() );
documents.put( outputName, renderer );
}
}
@@ -467,8 +468,8 @@ public abstract class AbstractSiteRender
* <li>"Project Information" and "Project Reports" category summaries.</li>
* </ul>
*/
- protected Map<String, DocumentRenderer> locateDocuments(
SiteRenderingContext context, List<MavenReportExecution> reports,
- Locale locale )
+ protected Map<String, DocumentRenderer> locateDocuments(
SiteRenderingContext context,
+
List<MavenReportExecution> reports, Locale locale )
throws IOException, RendererException
{
Map<String, DocumentRenderer> documents =
siteRenderer.locateDocumentFiles( context );
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java?rev=1640046&r1=1640045&r2=1640046&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
Sun Nov 16 22:40:59 2014
@@ -66,7 +66,8 @@ public class ReportDocumentRenderer
private final Log log;
- public ReportDocumentRenderer( MavenReportExecution mavenReportExecution,
RenderingContext renderingContext, Log log )
+ public ReportDocumentRenderer( MavenReportExecution mavenReportExecution,
RenderingContext renderingContext,
+ Log log )
{
this.report = mavenReportExecution.getMavenReport();
@@ -202,8 +203,10 @@ public class ReportDocumentRenderer
String localReportName = report.getName( locale );
String msg = "Generating \"" + localReportName + "\" report";
+ // CHECKSTYLE_OFF: MagicNumber
log.info( reportMojoInfo == null ? ( msg + '.' )
: ( StringUtils.rightPad( msg, 40 ) + " --- " +
reportMojoInfo ) );
+ // CHECKSTYLE_ON: MagicNumber
// main sink
SiteRendererSink mainSink = new SiteRendererSink( renderingContext );
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=1640046&r1=1640045&r2=1640046&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
Sun Nov 16 22:40:59 2014
@@ -46,7 +46,8 @@ import org.codehaus.plexus.archiver.jar.
* @since 2.0-beta-6
*/
// MSITE-665: requiresDependencyResolution workaround for MPLUGIN-253
-@Mojo( name = "jar", defaultPhase = LifecyclePhase.PACKAGE,
requiresDependencyResolution = ResolutionScope.TEST, requiresReports = true )
+@Mojo( name = "jar", defaultPhase = LifecyclePhase.PACKAGE,
requiresDependencyResolution = ResolutionScope.TEST,
+ requiresReports = true )
public class SiteJarMojo
extends SiteMojo
{
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=1640046&r1=1640045&r2=1640046&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
Sun Nov 16 22:40:59 2014
@@ -204,7 +204,8 @@ public class SiteMojo
* @return the sublist of documents that are not Doxia parsed
*/
private List<DocumentRenderer> renderDoxiaDocuments( Map<String,
DocumentRenderer> documents,
- SiteRenderingContext
context, File outputDir, boolean generated )
+ SiteRenderingContext
context, File outputDir,
+ boolean generated )
throws RendererException, IOException
{
Map<String, DocumentRenderer> doxiaDocuments = new TreeMap<String,
DocumentRenderer>();
