http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java index 54de061..0b5fff3 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java @@ -23,7 +23,7 @@ package org.apache.maven.lifecycle.internal; * A task that is a lifecycle * <p/> * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. - * + * * @since 3.0 * @author Benjamin Bentmann */
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java index 6fe7e58..a721355 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java @@ -34,7 +34,7 @@ import java.util.List; /** * Calculates the task segments in the build - * + * * @since 3.0 * @author Benjamin Bentmann * @author Jason van Zyl http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java index 4347b3c..da04b23 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java @@ -51,7 +51,7 @@ import java.util.StringTokenizer; /** * Resolves dependencies for the artifacts in context of the lifecycle build - * + * * @since 3.0 * @author Benjamin Bentmann * @author Jason van Zyl http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java index 2e71199..fedb462 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java @@ -51,7 +51,7 @@ import java.util.TreeSet; /** * Executes an individual mojo - * + * * @since 3.0 * @author Jason van Zyl * @author Benjamin Bentmann http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java index ee335db..6c8fd50 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java @@ -35,7 +35,7 @@ import org.apache.maven.project.MavenProject; /** * A list of project segments, ordered so that all ProjectSegments from first TaskSegment come before any * subsequent TaskSegments. - * + * * @since 3.0 * @author Kristian Rosenvold * <p/> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java index 3f78baf..b1b1d18 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java @@ -28,7 +28,7 @@ import java.util.Map; /** * Provides the positional index of the project - * + * * @since 3.0 * @author Benjamin Bentmann * @author Kristian Rosenvold (extracted class only) http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java index e7104b1..5ef7745 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java @@ -43,7 +43,7 @@ import java.util.List; * <p/> * Additionally this class contains a clone of the MavenSession, which is *only* needed * because it has as notion of a "current" project. - * + * * @since 3.0 * @author Jason van Zyl * @author Benjamin Bentmann http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java index eff4e92..2e2c3fd 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java @@ -29,7 +29,7 @@ import java.util.HashSet; /** * Contains status information that is global to an entire reactor build. - * + * * @since 3.0 * @author <a href="mailto:[email protected]";>Kristian Rosenvold</a> */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorContext.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorContext.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorContext.java index 5bba9a6..a6adc95 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorContext.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorContext.java @@ -23,7 +23,7 @@ import org.apache.maven.execution.MavenExecutionResult; /** * Context that is fixed for the entire reactor build. - * + * * @since 3.0 * @author Jason van Zyl * @author Kristian Rosenvold http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java index 39487a3..9551887 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java @@ -25,7 +25,7 @@ import java.util.List; /** * Describes the required task segment as provided on the maven command line; i.e. "clean jetty:run install" - * + * * @since 3.0 * @author Benjamin Bentmann * @author Kristian Rosenvold (extracted class only) http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java index 6d5a6ab..84f9431 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java @@ -29,21 +29,21 @@ import org.apache.maven.lifecycle.internal.ReactorContext; import org.apache.maven.lifecycle.internal.TaskSegment; /** - * + * * A {@link Builder} encapsulates a strategy for building a set of Maven projects. The default strategy in Maven builds the * the projects serially, but a {@link Builder} can employ any type of concurrency model to build the projects. - * + * * @author jvanzyl - * @provisional + * @provisional * */ public interface Builder { // - // Be nice to whittle this down to Session, maybe add task segments to the session. The session really is the + // Be nice to whittle this down to Session, maybe add task segments to the session. The session really is the // the place to store reactor related information. // void build( MavenSession session, ReactorContext reactorContext, ProjectBuildList projectBuilds, List<TaskSegment> taskSegments, ReactorBuildStatus reactorBuildStatus ) throws ExecutionException, InterruptedException; -} +} http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java index 53be344..de6a5a3 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java @@ -31,7 +31,7 @@ import java.util.Set; /** * Presents a view of the Dependency Graph that is suited for concurrent building. - * + * * @since 3.0 * @author Kristian Rosenvold * <p/> @@ -59,7 +59,7 @@ public class ConcurrencyDependencyGraph /** * Gets all the builds that have no reactor-dependencies - * + * * @return A list of all the initial builds */ @@ -78,7 +78,7 @@ public class ConcurrencyDependencyGraph /** * Marks the provided project as finished. Returns a list of - * + * * @param mavenProject The project * @return The list of builds that are eligible for starting now that the provided project is done */ @@ -129,7 +129,7 @@ public class ConcurrencyDependencyGraph /** * For the given {@link MavenProject} {@code p}, return all of {@code p}'s dependencies. - * + * * @param p * @return List of prerequisite projects */ @@ -140,7 +140,7 @@ public class ConcurrencyDependencyGraph /** * For the given {@link MavenProject} {@code p} return {@code p}'s uncompleted dependencies. - * + * * @param p * @return List of uncompleted prerequisite projects */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java index 15499ef..88fa81b 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java @@ -45,7 +45,7 @@ import org.codehaus.plexus.logging.Logger; /** * Builds the full lifecycle in weave-mode (phase by phase as opposed to project-by-project) - * + * * @since 3.0 * @author Kristian Rosenvold * Builds one or more lifecycles for a full module @@ -79,7 +79,7 @@ public class MultiThreadedBuilder CompletionService<ProjectSegment> service = new ExecutorCompletionService<ProjectSegment>( executor ); ConcurrencyDependencyGraph analyzer = new ConcurrencyDependencyGraph( projectBuilds, session.getProjectDependencyGraph() ); - + // Currently disabled ThreadOutputMuxer muxer = null; // new ThreadOutputMuxer( analyzer.getProjectBuilds(), System.out ); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java index 20c61eb..e656cc9 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; public interface LifecycleMapping -{ +{ @Deprecated String ROLE = LifecycleMapping.class.getName(); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java index f120b49..1702aa1 100644 --- a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java +++ b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java @@ -44,7 +44,7 @@ import org.codehaus.plexus.component.annotations.Requirement; /** * Handles injection of plugin executions induced by the lifecycle bindings for a packaging. - * + * * @author Benjamin Bentmann */ @Component( role = LifecycleBindingsInjector.class ) http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java b/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java index 8ea89e4..3e72674 100644 --- a/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java +++ b/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java @@ -27,9 +27,9 @@ public interface EventMonitor { void startEvent( String eventName, String target, long timestamp ); - + void endEvent( String eventName, String target, long timestamp ); - - void errorEvent( String eventName, String target, long timestamp, Throwable cause ); + + void errorEvent( String eventName, String target, long timestamp, Throwable cause ); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java b/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java index cbe1cb0..a73e1ef 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java @@ -137,7 +137,7 @@ class CacheUtils { return eq( a.getArtifactId(), b.getArtifactId() ) // && eq( a.getGroupId(), b.getGroupId() ) // - && eq( a.getVersion(), b.getVersion() ) // + && eq( a.getVersion(), b.getVersion() ) // && a.isExtensions() == b.isExtensions() // && dependenciesEquals( a.getDependencies(), b.getDependencies() ); } @@ -159,7 +159,7 @@ class CacheUtils boolean r = eq( aD.getGroupId(), bD.getGroupId() ) // && eq( aD.getArtifactId(), bD.getArtifactId() ) // - && eq( aD.getVersion(), bD.getVersion() ) // + && eq( aD.getVersion(), bD.getVersion() ) // && eq( aD.getType(), bD.getType() ) // && eq( aD.getClassifier(), bD.getClassifier() ) // && eq( aD.getScope(), bD.getScope() ); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/CycleDetectedInPluginGraphException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/CycleDetectedInPluginGraphException.java b/maven-core/src/main/java/org/apache/maven/plugin/CycleDetectedInPluginGraphException.java index 537307c..f77461f 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/CycleDetectedInPluginGraphException.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/CycleDetectedInPluginGraphException.java @@ -34,7 +34,7 @@ public class CycleDetectedInPluginGraphException public CycleDetectedInPluginGraphException( Plugin plugin, CycleDetectedInComponentGraphException e ) { - super( "A cycle was detected in the component graph of the plugin: " + plugin.getArtifactId() ); + super( "A cycle was detected in the component graph of the plugin: " + plugin.getArtifactId() ); this.plugin = plugin; } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java b/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java index 5fd16f6..57084ce 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java @@ -58,7 +58,7 @@ public class DebugConfigurationListener /** * Creates a human-friendly string represenation of the specified object. - * + * * @param obj The object to create a string representation for, may be <code>null</code>. * @return The string representation, never <code>null</code>. */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java index c61c9fb..97b69be 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java @@ -73,7 +73,7 @@ public class DefaultBuildPluginManager * @return PluginDescriptor The component descriptor for the Maven plugin. * @throws PluginNotFoundException The plugin could not be found in any repositories. * @throws PluginResolutionException The plugin could be found but could not be resolved. - * @throws InvalidPluginDescriptorException + * @throws InvalidPluginDescriptorException */ public PluginDescriptor loadPlugin( Plugin plugin, List<RemoteRepository> repositories, RepositorySystemSession session ) throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, InvalidPluginDescriptorException @@ -215,9 +215,9 @@ public class DefaultBuildPluginManager /** * TODO pluginDescriptor classRealm and artifacts are set as a side effect of this * call, which is not nice. - * @throws PluginResolutionException + * @throws PluginResolutionException */ - public ClassRealm getPluginRealm( MavenSession session, PluginDescriptor pluginDescriptor ) + public ClassRealm getPluginRealm( MavenSession session, PluginDescriptor pluginDescriptor ) throws PluginResolutionException, PluginManagerException { ClassRealm pluginRealm = pluginDescriptor.getClassRealm(); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java index 4242a32..4927726 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java @@ -41,7 +41,7 @@ import org.eclipse.aether.repository.WorkspaceRepository; * data like the plugin realm. <strong>Warning:</strong> This is an internal utility interface that is only public for * technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted without * prior notice. - * + * * @since 3.0 * @author Benjamin Bentmann */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java index 61d3058..3dfb5fd 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java @@ -30,7 +30,7 @@ import org.eclipse.aether.artifact.Artifact; * Caches extension class realms. <strong>Warning:</strong> This is an internal utility interface that is only public * for technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted * without prior notice. - * + * * @author Igor Fedorenko * @author Benjamin Bentmann */ @@ -71,7 +71,7 @@ public interface ExtensionRealmCache * Registers the specified cache record for usage with the given project. Integrators can use the information * collected from this method in combination with a custom cache implementation to dispose unused records from the * cache. - * + * * @param project The project that employs the plugin realm, must not be {@code null}. * @param record The cache record being used for the project, must not be {@code null}. */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java b/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java index 30f4d0f..223ccd8 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java @@ -24,7 +24,7 @@ import java.util.List; public class InvalidPluginDescriptorException extends Exception { - + public InvalidPluginDescriptorException( String message, List<String> errors ) { super( toMessage( message, errors ) ); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/LegacySupport.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/LegacySupport.java b/maven-core/src/main/java/org/apache/maven/plugin/LegacySupport.java index eef9b4f..b246ed1 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/LegacySupport.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/LegacySupport.java @@ -26,7 +26,7 @@ import org.eclipse.aether.RepositorySystemSession; * Helps to provide backward-compatibility with plugins that use legacy components. <strong>Warning:</strong> This is an * internal utility interface that is only public for technical reasons, it is not part of the public API. In * particular, this interface can be changed or deleted without prior notice. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -37,21 +37,21 @@ public interface LegacySupport * Sets the currently active session. Some legacy components are basically stateful and their API is missing * parameters that would be required to delegate to a stateless component. Saving the session (in a thread-local * variable) is our best effort to record any state that is required to enable proper delegation. - * + * * @param session The currently active session, may be {@code null}. */ void setSession( MavenSession session ); /** * Gets the currently active session. - * + * * @return The currently active session or {@code null} if none. */ MavenSession getSession(); /** * Gets the currently active repository session. - * + * * @return The currently active repository session or {@code null} if none. */ RepositorySystemSession getRepositorySession(); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java index e62cb9b..8f6c3a8 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java @@ -33,7 +33,7 @@ import org.eclipse.aether.repository.RemoteRepository; * Provides basic services to manage Maven plugins and their mojos. This component is kept general in its design such * that the plugins/mojos can be used in arbitrary contexts. In particular, the mojos can be used for ordinary build * plugins as well as special purpose plugins like reports. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -42,7 +42,7 @@ public interface MavenPluginManager /** * Retrieves the descriptor for the specified plugin from its main artifact. - * + * * @param plugin The plugin whose descriptor should be retrieved, must not be {@code null}. * @param repositories The plugin repositories to use for resolving the plugin's main artifact, must not be {@code * null}. @@ -54,7 +54,7 @@ public interface MavenPluginManager /** * Retrieves the descriptor for the specified plugin goal from the plugin's main artifact. - * + * * @param plugin The plugin whose mojo descriptor should be retrieved, must not be {@code null}. * @param goal The simple name of the mojo whose descriptor should be retrieved, must not be {@code null}. * @param repositories The plugin repositories to use for resolving the plugin's main artifact, must not be {@code @@ -69,7 +69,7 @@ public interface MavenPluginManager /** * Verifies the specified plugin is compatible with the current Maven runtime. - * + * * @param pluginDescriptor The descriptor of the plugin to check, must not be {@code null}. */ void checkRequiredMavenVersion( PluginDescriptor pluginDescriptor ) @@ -78,7 +78,7 @@ public interface MavenPluginManager /** * Sets up the class realm for the specified plugin. Both the class realm and the plugin artifacts that constitute * it will be stored in the plugin descriptor. - * + * * @param pluginDescriptor The plugin descriptor in which to save the class realm and the plugin artifacts, must not * be {@code null}. * @param session The build session from which to pick the current project and repository settings, must not be @@ -97,7 +97,7 @@ public interface MavenPluginManager * lookup the mojo from. <strong>Warning:</strong> The returned mojo instance must be released via * {@link #releaseMojo(Object, MojoExecution)} when the mojo is no longer needed to free any resources allocated for * it. - * + * * @param mojoInterface The component role of the mojo, must not be {@code null}. * @param session The build session in whose context the mojo will be used, must not be {@code null}. * @param mojoExecution The mojo execution to retrieve the mojo for, must not be {@code null}. @@ -108,7 +108,7 @@ public interface MavenPluginManager /** * Releases the specified mojo back to the container. - * + * * @param mojo The mojo to release, may be {@code null}. * @param mojoExecution The mojo execution the mojo was originally retrieved for, must not be {@code null}. */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java b/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java index 9417e8d..a417219 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java @@ -31,11 +31,11 @@ public class MojoExecution { private Plugin plugin; - + private String goal; - + private String executionId; - + private MojoDescriptor mojoDescriptor; private Xpp3Dom configuration; @@ -77,7 +77,7 @@ public class MojoExecution this.goal = goal; this.executionId = executionId; } - + public MojoExecution( MojoDescriptor mojoDescriptor ) { this.mojoDescriptor = mojoDescriptor; @@ -109,7 +109,7 @@ public class MojoExecution /** * Gets the source of this execution. - * + * * @return The source of this execution or {@code null} if unknown. */ public Source getSource() @@ -146,14 +146,14 @@ public class MojoExecution { this.configuration = configuration; } - + public String identify() { StringBuilder sb = new StringBuilder( 256 ); - + sb.append( executionId ); sb.append( configuration.toString() ); - + return sb.toString(); } @@ -165,7 +165,7 @@ public class MojoExecution public void setLifecyclePhase( String lifecyclePhase ) { this.lifecyclePhase = lifecyclePhase; - } + } @Override public String toString() @@ -185,7 +185,7 @@ public class MojoExecution { return mojoDescriptor.getPluginDescriptor().getGroupId(); } - + return plugin.getGroupId(); } @@ -195,7 +195,7 @@ public class MojoExecution { return mojoDescriptor.getPluginDescriptor().getArtifactId(); } - + return plugin.getArtifactId(); } @@ -204,8 +204,8 @@ public class MojoExecution if ( mojoDescriptor != null ) { return mojoDescriptor.getPluginDescriptor().getVersion(); - } - + } + return plugin.getVersion(); } @@ -215,7 +215,7 @@ public class MojoExecution { return mojoDescriptor.getGoal(); } - + return goal; } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java index e4d256f..1232052 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java @@ -32,7 +32,7 @@ import org.eclipse.aether.repository.RemoteRepository; * Caches plugin artifacts. <strong>Warning:</strong> This is an internal utility interface that is only public for * technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted without * prior notice. - * + * * @author Igor Fedorenko * @author Benjamin Bentmann */ @@ -52,7 +52,7 @@ public interface PluginArtifactsCache public final List<Artifact> artifacts; - public final PluginResolutionException exception; + public final PluginResolutionException exception; public CacheRecord( List<Artifact> artifacts ) { @@ -82,7 +82,7 @@ public interface PluginArtifactsCache * Registers the specified cache record for usage with the given project. Integrators can use the information * collected from this method in combination with a custom cache implementation to dispose unused records from the * cache. - * + * * @param project The project that employs the plugin realm, must not be {@code null}. * @param record The cache record being used for the project, must not be {@code null}. */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorCache.java index 4b4f368..08b4f1b 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorCache.java @@ -32,7 +32,7 @@ import org.eclipse.aether.repository.RemoteRepository; * data like the plugin realm. <strong>Warning:</strong> This is an internal utility interface that is only public for * technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted without * prior notice. - * + * * @since 3.0 * @author Benjamin Bentmann */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java index 283c349..1a3100e 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java @@ -62,7 +62,7 @@ public interface PluginManager Map getPluginComponents( Plugin plugin, String role ) throws ComponentLookupException, PluginManagerException; - + /** * @since 2.2.1 */ @@ -70,7 +70,7 @@ public interface PluginManager throws ArtifactResolutionException, PluginVersionResolutionException, ArtifactNotFoundException, InvalidVersionSpecificationException, InvalidPluginException, PluginManagerException, PluginNotFoundException, PluginVersionNotFoundException; - + /** * @since 2.2.1 */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java index dfdd432..dcf459e 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java @@ -78,7 +78,7 @@ public class PluginParameterException StringBuilder messageBuffer ) { String expression = param.getExpression(); - + if ( param.isEditable() ) { boolean isArray = param.getType().endsWith( "[]" ); @@ -99,7 +99,7 @@ public class PluginParameterException // assume it is not assignable from Collection or Map } } - + messageBuffer.append( "Inside the definition for plugin \'" ); messageBuffer.append( mojo.getPluginDescriptor().getArtifactId() ); messageBuffer.append( "\', specify the following:\n\n<configuration>\n ...\n" ); @@ -137,7 +137,7 @@ public class PluginParameterException { messageBuffer.append( "</KEY>\n" ); messageBuffer.append( " " ); - } + } messageBuffer.append( "</" ).append( param.getName() ).append( ">\n" ); messageBuffer.append( "</configuration>" ); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java index 593cd87..df47fa4 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java @@ -57,7 +57,7 @@ import org.codehaus.plexus.util.introspection.ReflectionValueExtractor; * <tr><td><code>*</code></td> <td></td> <td>project properties</td></tr> * </table> * <i>Notice:</i> <code>reports</code> was supported in Maven 2.x but was removed in Maven 3 - * + * * @author Jason van Zyl * @see MavenSession * @see MojoExecution http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java index 4eea338..1ffa157 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java @@ -34,7 +34,7 @@ import org.eclipse.aether.repository.RemoteRepository; * Caches plugin class realms. <strong>Warning:</strong> This is an internal utility interface that is only public for * technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted without * prior notice. - * + * * @author Igor Fedorenko * @author Benjamin Bentmann */ @@ -76,7 +76,7 @@ public interface PluginRealmCache * Registers the specified cache record for usage with the given project. Integrators can use the information * collected from this method in combination with a custom cache implementation to dispose unused records from the * cache. - * + * * @param project The project that employs the plugin realm, must not be {@code null}. * @param record The cache record being used for the project, must not be {@code null}. */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java index 59047eb..bafbcb3 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java @@ -29,7 +29,7 @@ import org.eclipse.aether.RepositorySystemSession; * Helps to provide backward-compatibility with plugins that use legacy components. <strong>Warning:</strong> This is an * internal utility component that is only public for technical reasons, it is not part of the public API. In * particular, this component can be changed or deleted without prior notice. - * + * * @since 3.0 * @author Benjamin Bentmann */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java index 020d6b1..842987b 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java @@ -102,7 +102,7 @@ import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator; * Provides basic services to manage Maven plugins and their mojos. This component is kept general in its design such * that the plugins/mojos can be used in arbitrary contexts. In particular, the mojos can be used for ordinary build * plugins as well as special purpose plugins like reports. - * + * * @since 3.0 * @author Benjamin Bentmann */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java index a1b735e..5a0edf5 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java @@ -64,7 +64,7 @@ import org.eclipse.aether.util.repository.SimpleArtifactDescriptorPolicy; * Assists in resolving the dependencies of a plugin. <strong>Warning:</strong> This is an internal utility class that * is only public for technical reasons, it is not part of the public API. In particular, this class can be changed or * deleted without prior notice. - * + * * @since 3.0 * @author Benjamin Bentmann */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java index 2112748..16a0b63 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java @@ -32,7 +32,7 @@ import org.eclipse.aether.util.artifact.JavaScopes; /** * Injects plexus-utils:1.1 into a plugin's class path if it doesn't already declare a dependency on plexus-utils. This * is another legacy bit to provide backward-compat with Maven 2.x. - * + * * @author Benjamin Bentmann */ class PlexusUtilsInjector http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java index 632d1d5..4194297 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java @@ -33,7 +33,7 @@ import org.eclipse.aether.repository.RemoteRepository; * Assists in resolving the dependencies of a plugin. <strong>Warning:</strong> This is an internal utility interface * that is only public for technical reasons, it is not part of the public API. In particular, this interface can be * changed or deleted without prior notice. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -42,7 +42,7 @@ public interface PluginDependenciesResolver /** * Resolves the main artifact of the specified plugin. - * + * * @param plugin The plugin for which to resolve the main artifact, must not be {@code null}. * @param repositories The plugin repositories to use for resolving the plugin's main artifact, must not be {@code * null}. @@ -55,7 +55,7 @@ public interface PluginDependenciesResolver /** * Resolves the runtime dependencies of the specified plugin. - * + * * @param plugin The plugin for which to resolve the dependencies, must not be {@code null}. * @param pluginArtifact The plugin's main artifact, may be {@code null}. * @param dependencyFilter A filter to exclude artifacts from resolution (but not collection), may be {@code null}. http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java index 038fa00..533920a 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java @@ -36,7 +36,7 @@ import org.apache.maven.artifact.versioning.VersionRange; * for its use. However, the (old) wagons pulled in transitively via legacy Maven core artifacts are usually not * intended as dependencies and more importantly screw up artifact resolution because they would get preferred over the * core wagon versions. This is a hack to provide backward-compat with Maven 2 (MNG-4528, MNG-4561). - * + * * @since 3.0 * @author Benjamin Bentmann */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java index 3c59fb4..706694b 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java @@ -30,7 +30,7 @@ import org.codehaus.plexus.component.configurator.ConfigurationListener; /** * A configuration listener to help validate the plugin configuration. For instance, check for required but missing * parameters. - * + * * @author Benjamin Bentmann */ class ValidatingConfigurationListener http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java index f0e2107..43e8cfc 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java @@ -30,7 +30,7 @@ import org.eclipse.aether.graph.Dependency; * for its use. However, the (old) wagons pulled in transitively via legacy Maven core artifacts are usually not * intended as dependencies and more importantly screw up artifact resolution because they would get preferred over the * core wagon versions. This is a hack to provide backward-compat with Maven 2 (MNG-4528, MNG-4561). - * + * * @author Benjamin Bentmann */ class WagonExcluder http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java index 27c5f5b..7ab86cf 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java @@ -30,7 +30,7 @@ import org.eclipse.aether.repository.RemoteRepository; /** * Collects settings required to resolve a plugin prefix. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -59,7 +59,7 @@ public class DefaultPluginPrefixRequest * Creates a request for the specified plugin prefix and build session. The provided build session will be used to * configure repository settings. If the session has a current project, its plugin repositories and model will be * used as well. - * + * * @param prefix The plugin prefix to resolve, must not be {@code null}. * @param session The build session from which to derive further settings, must not be {@code null}. */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java index c23368e..23df66e 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java @@ -27,7 +27,7 @@ import org.eclipse.aether.repository.RemoteRepository; /** * Collects settings required to resolve a plugin prefix. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -36,14 +36,14 @@ public interface PluginPrefixRequest /** * Gets the prefix of the plugin. - * + * * @return The prefix of the plugin. */ String getPrefix(); /** * Sets the prefix of the plugin. - * + * * @param prefix The prefix of the plugin. * @return This request, never {@code null}. */ @@ -51,14 +51,14 @@ public interface PluginPrefixRequest /** * Gets the list of group ids to scan for the plugin prefix. - * + * * @return The list of group ids to scan for the plugin prefix, never {@code null}. */ List<String> getPluginGroups(); /** * Sets the list of group ids to scan for the plugin prefix. - * + * * @param pluginGroups The list of group ids to scan for the plugin prefix, may be {@code null}. * @return This request, never {@code null}. */ @@ -66,7 +66,7 @@ public interface PluginPrefixRequest /** * Gets the POM whose build plugins are to be scanned for the prefix. - * + * * @return The POM whose build plugins are to be scanned for the prefix or {@code null} to only search the plugin * repositories. */ @@ -74,7 +74,7 @@ public interface PluginPrefixRequest /** * Sets the POM whose build plugins are to be scanned for the prefix. - * + * * @param pom The POM whose build plugins are to be scanned for the prefix, may be {@code null} to only search the * plugin repositories. * @return This request, never {@code null}. @@ -83,7 +83,7 @@ public interface PluginPrefixRequest /** * Gets the remote repositories to use. - * + * * @return The remote repositories to use, never {@code null}. */ List<RemoteRepository> getRepositories(); @@ -91,7 +91,7 @@ public interface PluginPrefixRequest /** * Sets the remote repositories to use. <em>Note:</em> When creating a request from a project, be sure to use the * plugin repositories and not the regular project repositories. - * + * * @param repositories The remote repositories to use. * @return This request, never {@code null}. */ @@ -99,14 +99,14 @@ public interface PluginPrefixRequest /** * Gets the session to use for repository access. - * + * * @return The repository session or {@code null} if not set. */ RepositorySystemSession getRepositorySession(); /** * Sets the session to use for repository access. - * + * * @param repositorySession The repository session to use. * @return This request, never {@code null}. */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResolver.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResolver.java index 6f11bcd..943e683 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResolver.java @@ -21,7 +21,7 @@ package org.apache.maven.plugin.prefix; /** * Resolves a plugin prefix. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -30,7 +30,7 @@ public interface PluginPrefixResolver /** * Resolves the plugin prefix for the specified request. - * + * * @param request The request that holds the details about the plugin and the repositories to consult, must not be * {@code null}. * @return The result of the prefix resolution, never {@code null}. http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java index 6fe1f72..8fe1a71 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java @@ -23,7 +23,7 @@ import org.eclipse.aether.repository.ArtifactRepository; /** * Describes the result of a plugin prefix resolution request. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -32,21 +32,21 @@ public interface PluginPrefixResult /** * The resolved group id for the plugin. - * + * * @return The resolved group id for the plugin, never {@code null}. */ String getGroupId(); /** * The resolved artifact id for the plugin. - * + * * @return The resolved artifact id for the plugin, never {@code null}. */ String getArtifactId(); /** * The repository from which the plugin prefix was resolved. - * + * * @return The repository from which the plugin prefix was resolved or {@code null} if the prefix was resolved from * the supplied POM. */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java index 76814fd..8d2ad0f 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java @@ -54,7 +54,7 @@ import org.eclipse.aether.resolution.MetadataResult; /** * Resolves a plugin prefix. - * + * * @since 3.0 * @author Benjamin Bentmann */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java index 9917387..6a248bf 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java @@ -25,7 +25,7 @@ import org.eclipse.aether.repository.ArtifactRepository; /** * Describes the result of a plugin prefix resolution request. - * + * * @since 3.0 * @author Benjamin Bentmann */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java b/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java index b672090..f88dba5 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java @@ -31,7 +31,7 @@ import org.eclipse.aether.repository.RemoteRepository; /** * Collects settings required to resolve the version for a plugin. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -59,7 +59,7 @@ public class DefaultPluginVersionRequest /** * Creates a request for the specified plugin by copying settings from the specified build session. If the session * has a current project, its plugin repositories will be used as well. - * + * * @param plugin The plugin for which to resolve a version, must not be {@code null}. * @param session The Maven session to use, must not be {@code null}. */ @@ -79,7 +79,7 @@ public class DefaultPluginVersionRequest /** * Creates a request for the specified plugin using the given repository session and plugin repositories. - * + * * @param plugin The plugin for which to resolve a version, must not be {@code null}. * @param session The repository session to use, must not be {@code null}. * @param repositories The plugin repositories to query, may be {@code null}. http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java index 5d2b63d..b22f9e1 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java @@ -27,7 +27,7 @@ import org.eclipse.aether.repository.RemoteRepository; /** * Collects settings required to resolve the version for a plugin. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -36,14 +36,14 @@ public interface PluginVersionRequest /** * Gets the group id of the plugin. - * + * * @return The group id of the plugin. */ String getGroupId(); /** * Sets the group id of the plugin. - * + * * @param groupId The group id of the plugin. * @return This request, never {@code null}. */ @@ -51,14 +51,14 @@ public interface PluginVersionRequest /** * Gets the artifact id of the plugin. - * + * * @return The artifact id of the plugin. */ String getArtifactId(); /** * Sets the artifact id of the plugin. - * + * * @param artifactId The artifact id of the plugin. * @return This request, never {@code null}. */ @@ -66,7 +66,7 @@ public interface PluginVersionRequest /** * Gets the POM whose build plugins are to be scanned for the version. - * + * * @return The POM whose build plugins are to be scanned for the verion or {@code null} to only search the plugin * repositories. */ @@ -74,7 +74,7 @@ public interface PluginVersionRequest /** * Sets the POM whose build plugins are to be scanned for the version. - * + * * @param pom The POM whose build plugins are to be scanned for the version, may be {@code null} to only search the * plugin repositories. * @return This request, never {@code null}. @@ -83,7 +83,7 @@ public interface PluginVersionRequest /** * Gets the remote repositories to use. - * + * * @return The remote repositories to use, never {@code null}. */ List<RemoteRepository> getRepositories(); @@ -91,7 +91,7 @@ public interface PluginVersionRequest /** * Sets the remote repositories to use. <em>Note:</em> When creating a request from a project, be sure to use the * plugin repositories and not the regular project repositories. - * + * * @param repositories The remote repositories to use. * @return This request, never {@code null}. */ @@ -99,14 +99,14 @@ public interface PluginVersionRequest /** * Gets the session to use for repository access. - * + * * @return The repository session or {@code null} if not set. */ RepositorySystemSession getRepositorySession(); /** * Sets the session to use for repository access. - * + * * @param repositorySession The repository session to use. * @return This request, never {@code null}. */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolver.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolver.java index b5c3c10..935fdfc 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolver.java @@ -21,7 +21,7 @@ package org.apache.maven.plugin.version; /** * Resolves a version for a plugin. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -30,7 +30,7 @@ public interface PluginVersionResolver /** * Resolves the version for the specified request. - * + * * @param request The request that holds the details about the plugin and the repositories to consult, must not be * {@code null}. * @return The result of the version resolution, never {@code null}. http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResult.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResult.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResult.java index bc3a2d2..09a69e9 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResult.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResult.java @@ -23,7 +23,7 @@ import org.eclipse.aether.repository.ArtifactRepository; /** * Describes the result of a plugin version resolution request. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -32,14 +32,14 @@ public interface PluginVersionResult /** * The resolved plugin version. - * + * * @return The resolved plugin version, never {@code null}. */ String getVersion(); /** * The repository from which the plugin version was resolved. - * + * * @return The repository from which the plugin version was resolved, never {@code null}. */ ArtifactRepository getRepository(); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java index de007b3..76b6bfd 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java @@ -61,7 +61,7 @@ import org.eclipse.aether.version.VersionScheme; /** * Resolves a version for a plugin. - * + * * @since 3.0 * @author Benjamin Bentmann */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java index c67516c..9027a53 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java @@ -24,7 +24,7 @@ import org.eclipse.aether.repository.ArtifactRepository; /** * Describes the result of a plugin version resolution request. - * + * * @since 3.0 * @author Benjamin Bentmann */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java index 6f26ec4..596f853 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java @@ -92,7 +92,7 @@ public class DefaultMavenProjectHelper /** * Add an attached artifact or replace the file for an existing artifact. - * + * * @see MavenProject#addAttachedArtifact(org.apache.maven.artifact.Artifact) * @param project project reference. * @param artifact artifact to add or replace. http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java b/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java index 3aebe9b..5d97cfc 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java @@ -33,7 +33,7 @@ import org.apache.maven.plugin.version.PluginVersionResolutionException; /** * Processes events from the model builder while building the effective model for a {@link MavenProject} instance. - * + * * @author Benjamin Bentmann */ class DefaultModelBuildingListener @@ -76,7 +76,7 @@ class DefaultModelBuildingListener /** * Gets the project whose model is being built. - * + * * @return The project, never {@code null}. */ public MavenProject getProject() http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java index 4d77049..e359bcf 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java @@ -131,7 +131,7 @@ public class DefaultProjectBuilder try { - ProjectBuildingRequest projectBuildingRequest = config.request; + ProjectBuildingRequest projectBuildingRequest = config.request; MavenProject project = projectBuildingRequest.getProject(); @@ -731,9 +731,9 @@ public class DefaultProjectBuilder // // All the parts that were taken out of MavenProject for Maven 4.0.0 // - + project.setProjectBuildingRequest( projectBuildingRequest ); - + // pluginArtifacts Set<Artifact> pluginArtifacts = new HashSet<Artifact>(); for ( Plugin plugin : project.getBuildPlugins() ) http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java index 3d04637..035b42b 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java @@ -66,7 +66,7 @@ import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator; * Assists the project builder. <strong>Warning:</strong> This is an internal utility class that is only public for * technical reasons, it is not part of the public API. In particular, this class can be changed or deleted without * prior notice. - * + * * @author Benjamin Bentmann */ @Component( role = ProjectBuildingHelper.class ) @@ -255,7 +255,7 @@ public class DefaultProjectBuildingHelper ClassRealm extensionRealm; ExtensionDescriptor extensionDescriptor = null; - + final ExtensionRealmCache.Key extensionKey = extensionRealmCache.createKey( artifacts ); ExtensionRealmCache.CacheRecord recordRealm = extensionRealmCache.get( extensionKey ); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java index f3cafdb..185e4ca 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java @@ -208,7 +208,7 @@ public class DefaultProjectBuildingRequest this.processPlugins = processPlugins; return this; } - + public ProjectBuildingRequest setResolveDependencies( boolean resolveDependencies ) { this.resolveDependencies = resolveDependencies; http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java index 3a3c37f..b64a395 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java @@ -27,7 +27,7 @@ import org.apache.maven.model.building.ModelProblem; /** * Collects the output of the project builder. - * + * * @author Benjamin Bentmann */ class DefaultProjectBuildingResult @@ -46,7 +46,7 @@ class DefaultProjectBuildingResult /** * Creates a new result with the specified contents. - * + * * @param project The project that was built, may be {@code null}. * @param problems The problems that were encouterned, may be {@code null}. * @param dependencyResolutionResult The result of the resolution for the project dependencies, may be {@code null}. @@ -65,7 +65,7 @@ class DefaultProjectBuildingResult /** * Creates a new result with the specified contents. - * + * * @param projectId The identifier of the project, may be {@code null}. * @param pomFile The POM file from which the project was built, may be {@code null}. * @param problems The problems that were encouterned, may be {@code null}. http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionRequest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionRequest.java b/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionRequest.java index 758c491..c120a13 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionRequest.java @@ -24,7 +24,7 @@ import org.eclipse.aether.graph.DependencyFilter; /** * A request to resolve the dependencies of a project. - * + * * @author Benjamin Bentmann */ public interface DependencyResolutionRequest @@ -32,14 +32,14 @@ public interface DependencyResolutionRequest /** * Gets the project to resolve dependencies for. - * + * * @return The project to resolve dependencies for or {@code null} if not set. */ MavenProject getMavenProject(); /** * Sets the project to resolve dependencies for. - * + * * @param project The project to resolve dependencies for, may be {@code null}. * @return This request for chaining, never {@code null}. */ @@ -47,7 +47,7 @@ public interface DependencyResolutionRequest /** * Gets the filter used to exclude some dependencies from resolution. - * + * * @return The filter to exclude dependencies from resolution or {@code null} to resolve all dependencies. */ DependencyFilter getResolutionFilter(); @@ -56,7 +56,7 @@ public interface DependencyResolutionRequest * Sets the filter used to exclude some dependencies from resolution. Note that this filter only controls the * resolution/download of dependency artifacts, not the inclusion of dependency nodes in the resolved dependency * graph. - * + * * @param filter The filter to exclude dependencies from resolution, may be {@code null} to resolve all * dependencies. * @return This request for chaining, never {@code null}. @@ -65,14 +65,14 @@ public interface DependencyResolutionRequest /** * Gets the session to use for repository access. - * + * * @return The repository session or {@code null} if not set. */ RepositorySystemSession getRepositorySession(); /** * Sets the session to use for repository access. - * + * * @param repositorySession The repository session to use. * @return This request for chaining, never {@code null}. */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java b/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java index 2f62d80..6ad55fa 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java +++ b/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java @@ -26,7 +26,7 @@ import org.eclipse.aether.graph.DependencyNode; /** * The result of a project dependency resolution. - * + * * @author Benjamin Bentmann */ public interface DependencyResolutionResult @@ -34,7 +34,7 @@ public interface DependencyResolutionResult /** * Gets the dependency graph of the project. - * + * * @return The dependency graph or {@code null} if not available. */ DependencyNode getDependencyGraph(); @@ -43,35 +43,35 @@ public interface DependencyResolutionResult * Gets the transitive dependencies of the project that were not excluded by * {@link DependencyResolutionRequest#getResolutionFilter()}. This list is a union of the results from * {@link #getResolvedDependencies()} and {@link #getUnresolvedDependencies()}. - * + * * @return The transitive dependencies, never {@code null}. */ List<Dependency> getDependencies(); /** * Gets the dependencies that were successfully resolved. - * + * * @return The resolved dependencies, never {@code null}. */ List<Dependency> getResolvedDependencies(); /** * Gets the dependencies that could not be resolved. - * + * * @return The unresolved dependencies, never {@code null}. */ List<Dependency> getUnresolvedDependencies(); /** * Gets the errors that occurred while building the dependency graph. - * + * * @return The errors that occurred while building the dependency graph, never {@code null}. */ List<Exception> getCollectionErrors(); /** * Gets the errors that occurred while resolving the specified dependency. - * + * * @param dependency The dependency for which to retrieve the errors, must not be {@code null}. * @return The resolution errors for the specified dependency, never {@code null}. */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java index 9750e65..062b8b7 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java +++ b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java @@ -26,7 +26,7 @@ import java.util.List; * Provides metadata about a build extension. <strong>Warning:</strong> This is an internal utility class that is only * public for technical reasons, it is not part of the public API. In particular, this class can be changed or deleted * without prior notice. - * + * * @author Benjamin Bentmann */ public class ExtensionDescriptor http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java index 89f394f..c18f87f 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java @@ -37,7 +37,7 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException; /** * Creates an extension descriptor from some XML stream. - * + * * @author Benjamin Bentmann */ class ExtensionDescriptorBuilder @@ -50,7 +50,7 @@ class ExtensionDescriptorBuilder /** * Extracts the extension descriptor (if any) from the specified JAR file. - * + * * @param extensionJar The JAR file or directory to extract the descriptor from, must not be {@code null}. * @return The extracted descriptor or {@code null} if no descriptor was found. * @throws IOException If the descriptor is present but could not be parsed.
