svn commit: r1635386 - in /maven/shared/trunk/maven-reporting-exec: ./ src/main/java/org/apache/maven/reporting/exec/

[hb...@apache.org]

Author: hboutemy
Date: Thu Oct 30 05:46:57 2014
New Revision: 1635386

URL: http://svn.apache.org/r1635386
Log:
upgraded parent pom

Modified:
    maven/shared/trunk/maven-reporting-exec/pom.xml
    maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java
    maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
    maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/MavenPluginManagerHelper.java
    maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/MavenReportExecutor.java
    maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/ReportPlugin.java

Modified: maven/shared/trunk/maven-reporting-exec/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/pom.xml?rev=1635386&r1=1635385&r2=1635386&view=diff
==============================================================================
--- maven/shared/trunk/maven-reporting-exec/pom.xml (original)
+++ maven/shared/trunk/maven-reporting-exec/pom.xml Thu Oct 30 05:46:57 2014
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.shared</groupId>
     <artifactId>maven-shared-components</artifactId>
-    <version>20</version>
+    <version>21</version>
     <relativePath>../maven-shared-components/pom.xml</relativePath>
   </parent>
 

Modified: maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java?rev=1635386&r1=1635385&r2=1635386&view=diff
==============================================================================
--- maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java (original)
+++ maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java Thu Oct 30 05:46:57 2014
@@ -35,6 +35,9 @@ import org.codehaus.plexus.component.ann
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.Logger;
 
+/**
+ * 
+ */
 @Component( role = MavenPluginManagerHelper.class )
 public class DefaultMavenPluginManagerHelper
     implements MavenPluginManagerHelper
@@ -97,7 +100,8 @@ public class DefaultMavenPluginManagerHe
         {
             try
             {
-                Thread.currentThread().getContextClassLoader().loadClass( "org.sonatype.aether.graph.DependencyFilter" );
+                ClassLoader cl = Thread.currentThread().getContextClassLoader();
+                cl.loadClass( "org.sonatype.aether.graph.DependencyFilter" );
                 isEclipseAether = false;
             }
             catch ( ClassNotFoundException e )

Modified: maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java?rev=1635386&r1=1635385&r2=1635386&view=diff
==============================================================================
--- maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java (original)
+++ maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java Thu Oct 30 05:46:57 2014
@@ -66,7 +66,8 @@ import org.codehaus.plexus.util.xml.Xpp3
  * <li>use the one defined in the reportPlugin configuration,</li>
  * <li>search similar (same groupId and artifactId) plugin in the build/plugins section of the pom,</li>
  * <li>search similar (same groupId and artifactId) plugin in the build/pluginManagement section of the pom,</li>
- * <li>ask {@link PluginVersionResolver} to get a fallback version (display a warning as it's not a recommended use).</li>
+ * <li>ask {@link PluginVersionResolver} to get a fallback version (display a warning as it's not a recommended use).
+ * </li>
  * </ol>
  * </p>
  * <p>

Modified: maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/MavenPluginManagerHelper.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/MavenPluginManagerHelper.java?rev=1635386&r1=1635385&r2=1635386&view=diff
==============================================================================
--- maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/MavenPluginManagerHelper.java (original)
+++ maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/MavenPluginManagerHelper.java Thu Oct 30 05:46:57 2014
@@ -24,16 +24,15 @@ import java.util.List;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.plugin.InvalidPluginDescriptorException;
-import org.apache.maven.plugin.MavenPluginManager;
 import org.apache.maven.plugin.PluginContainerException;
 import org.apache.maven.plugin.PluginDescriptorParsingException;
 import org.apache.maven.plugin.PluginResolutionException;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
 
 /**
- * {@link MavenPluginManager} helper to deal with API changes between Maven 3.0.x and 3.1.x, ie switch from Sonatype Aether
- * (in <code>org.sonatype.aether</code> package) to Eclipse Aether (in <code>org.eclipse.aether</code> package) for
- * some parameters.
+ * {@link org.apache.maven.plugin.MavenPluginManager} helper to deal with API changes between Maven 3.0.x and 3.1.x, ie
+ * switch from Sonatype Aether (in <code>org.sonatype.aether</code> package) to Eclipse Aether (in
+ * <code>org.eclipse.aether</code> package) for some parameters.
  * 
  * @author Hervé Boutemy
  * @since 1.1
@@ -41,7 +40,8 @@ import org.apache.maven.plugin.descripto
 public interface MavenPluginManagerHelper
 {
     /**
-     * Helper for {@link MavenPluginManager#getPluginDescriptor(Plugin, List, org.eclipse.aether.RepositorySystemSession)}
+     * Helper for {@link org.apache.maven.plugin.MavenPluginManager#getPluginDescriptor
+     * MavenPluginManager#getPluginDescriptor(Plugin, List, xxx.aether.RepositorySystemSession)}
      * 
      * @param plugin
      * @param session
@@ -54,7 +54,8 @@ public interface MavenPluginManagerHelpe
         throws PluginResolutionException, PluginDescriptorParsingException, InvalidPluginDescriptorException;
 
     /**
-     * Helper for {@link MavenPluginManager#setupPluginRealm(PluginDescriptor, MavenSession, ClassLoader, List, org.eclipse.aether.graph.DependencyFilter)
+     * Helper for {@link org.apache.maven.plugin.MavenPluginManager#setupPluginRealm
+     * MavenPluginManager#setupPluginRealm(PluginDescriptor, ..., List, xxx.aether.graph.DependencyFilter)}
      * 
      * @param pluginDescriptor
      * @param session

Modified: maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/MavenReportExecutor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/MavenReportExecutor.java?rev=1635386&r1=1635385&r2=1635386&view=diff
==============================================================================
--- maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/MavenReportExecutor.java (original)
+++ maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/MavenReportExecutor.java Thu Oct 30 05:46:57 2014
@@ -22,21 +22,22 @@ package org.apache.maven.reporting.exec;
 import java.util.List;
 
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.reporting.MavenReport;
 
 /**
- * This component will prepare {@link MavenReport}s for later generation.
- * If a {@link MavenReport} needs to fork a goal or a lifecycle phase, this fork is executed.
- * <p>Notice that Maven Reports are classical {@link org.apache.maven.plugin.Mojo Mojos} implementing
- * the {@link MavenReport} interface: when used as reports, their <code>Mojo.execute()</code> method is
- * not to be used but <code>MavenReport.generate()</code>.</p> 
+ * This component will prepare {@link org.apache.maven.reporting.MavenReport}s for later generation. If a
+ * {@link org.apache.maven.reporting.MavenReport} needs to fork a goal or a lifecycle phase, this fork is executed.
+ * <p>
+ * Notice that Maven Reports are classical {@link org.apache.maven.plugin.Mojo Mojos} implementing the
+ * {@link org.apache.maven.reporting.MavenReport} interface: when used as reports, their <code>Mojo.execute()</code>
+ * method is not to be used but <code>MavenReport.generate()</code>.
+ * </p>
  *
  * @author Olivier Lamy
  */
 public interface MavenReportExecutor
 {
     /**
-     * Build the {@link MavenReport}s, with associated forked executions if necessary. 
+     * Build the {@link org.apache.maven.reporting.MavenReport}s, with associated forked executions if necessary. 
      * 
      * @param mavenReportExecutorRequest
      * @return a list or prepared Maven report executions

Modified: maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/ReportPlugin.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/ReportPlugin.java?rev=1635386&r1=1635385&r2=1635386&view=diff
==============================================================================
--- maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/ReportPlugin.java (original)
+++ maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/ReportPlugin.java Thu Oct 30 05:46:57 2014
@@ -23,12 +23,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.maven.model.Plugin;
 import org.codehaus.plexus.configuration.PlexusConfiguration;
 
 /**
- * Represents a reporting plugin and its execution configuration. It basically contains similar informations
- * as a {@link Plugin}, but in order to decouple reporting stuff from core, some values are copied.
+ * Represents a reporting plugin and its execution configuration. It basically contains similar informations as a
+ * {@link org.apache.maven.model.Plugin}, but in order to decouple reporting stuff from core, some values are copied.
  */
 public class ReportPlugin
 {