Repository: maven Updated Branches: refs/heads/MNG-6150 ac8b25eb0 -> b3848d5b5 (forced update)
http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java index 77206bd..cc35a57 100644 --- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java +++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java @@ -221,7 +221,7 @@ public class MavenProject this.artifact = artifact; } - // @todo I would like to get rid of this. jvz. + // TODO I would like to get rid of this. jvz. public Model getModel() { return model; @@ -352,7 +352,7 @@ public class MavenProject { if ( a.getArtifactHandler().isAddedToClasspath() ) { - // TODO: let the scope handler deal with this + // TODO let the scope handler deal with this if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() ) || Artifact.SCOPE_SYSTEM.equals( a.getScope() ) ) { @@ -364,7 +364,7 @@ public class MavenProject return list; } - // TODO: this checking for file == null happens because the resolver has been confused about the root + // TODO this checking for file == null happens because the resolver has been confused about the root // artifact or not. things like the stupid dummy artifact coming from surefire. public List<String> getTestClasspathElements() throws DependencyResolutionRequiredException @@ -408,7 +408,7 @@ public class MavenProject for ( Artifact a : getArtifacts() ) { if ( a.getArtifactHandler().isAddedToClasspath() - // TODO: let the scope handler deal with this + // TODO let the scope handler deal with this && ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_RUNTIME.equals( a.getScope() ) ) ) { addArtifactPath( a, list ); @@ -470,7 +470,7 @@ public class MavenProject public String getName() { - // TODO: this should not be allowed to be null. + // TODO this should not be allowed to be null. if ( getModel().getName() != null ) { return getModel().getName(); @@ -1575,10 +1575,10 @@ public class MavenProject for ( Artifact a : getArtifacts() ) { - // TODO: classpath check doesn't belong here - that's the other method + // TODO classpath check doesn't belong here - that's the other method if ( a.getArtifactHandler().isAddedToClasspath() ) { - // TODO: let the scope handler deal with this + // TODO let the scope handler deal with this if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() ) || Artifact.SCOPE_SYSTEM.equals( a.getScope() ) ) { @@ -1603,7 +1603,7 @@ public class MavenProject for ( Artifact a : getArtifacts() ) { - // TODO: let the scope handler deal with this + // TODO let the scope handler deal with this if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() ) || Artifact.SCOPE_SYSTEM.equals( a.getScope() ) ) { @@ -1629,7 +1629,7 @@ public class MavenProject for ( Artifact a : getArtifacts() ) { - // TODO: classpath check doesn't belong here - that's the other method + // TODO classpath check doesn't belong here - that's the other method if ( a.getArtifactHandler().isAddedToClasspath() ) { list.add( a ); @@ -1680,7 +1680,7 @@ public class MavenProject for ( Artifact a : getArtifacts() ) { - // TODO: let the scope handler deal with this + // TODO let the scope handler deal with this if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_RUNTIME.equals( a.getScope() ) ) { Dependency dependency = new Dependency(); @@ -1705,9 +1705,9 @@ public class MavenProject for ( Artifact a : getArtifacts() ) { - // TODO: classpath check doesn't belong here - that's the other method + // TODO classpath check doesn't belong here - that's the other method if ( a.getArtifactHandler().isAddedToClasspath() - // TODO: let the scope handler deal with this + // TODO let the scope handler deal with this && ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_RUNTIME.equals( a.getScope() ) ) ) { list.add( a ); @@ -1732,7 +1732,7 @@ public class MavenProject { if ( a.getArtifactHandler().isAddedToClasspath() ) { - // TODO: let the scope handler deal with this + // TODO let the scope handler deal with this if ( Artifact.SCOPE_SYSTEM.equals( a.getScope() ) ) { addArtifactPath( a, list ); @@ -1749,10 +1749,10 @@ public class MavenProject for ( Artifact a : getArtifacts() ) { - // TODO: classpath check doesn't belong here - that's the other method + // TODO classpath check doesn't belong here - that's the other method if ( a.getArtifactHandler().isAddedToClasspath() ) { - // TODO: let the scope handler deal with this + // TODO let the scope handler deal with this if ( Artifact.SCOPE_SYSTEM.equals( a.getScope() ) ) { list.add( a ); @@ -1776,7 +1776,7 @@ public class MavenProject for ( Artifact a : getArtifacts() ) { - // TODO: let the scope handler deal with this + // TODO let the scope handler deal with this if ( Artifact.SCOPE_SYSTEM.equals( a.getScope() ) ) { Dependency dependency = new Dependency(); http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java b/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java index 504097f..1ca35d8 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java @@ -233,7 +233,7 @@ public class ProjectSorter return !( StringUtils.isEmpty( version ) || version.startsWith( "[" ) || version.startsWith( "(" ) ); } - // TODO: !![jc; 28-jul-2005] check this; if we're using '-r' and there are aggregator tasks, this will result in weirdness. + // TODO !![jc; 28-jul-2005] check this; if we're using '-r' and there are aggregator tasks, this will result in weirdness. public MavenProject getTopLevelProject() { if ( topLevelProject == null ) http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-core/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java index 6e13d33..a1187c3 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java @@ -38,7 +38,7 @@ import java.util.List; * attributes of this artifact. * * @author <a href="mailto:br...@apache.org";>Brett Porter</a> - * @todo I think this exposes a design flaw in that the immutable and mutable parts of an artifact are in one class and + * TODO I think this exposes a design flaw in that the immutable and mutable parts of an artifact are in one class and * should be split. ie scope, file, etc depend on the context of use, whereas everything else is immutable. */ @Deprecated http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java index 9c1e9e3..42bbe45 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java @@ -93,7 +93,7 @@ public class MavenMetadataSource @Requirement private ArtifactFactory repositorySystem; - //TODO: This prevents a cycle in the composition which shows us another problem we need to deal with. + //TODO This prevents a cycle in the composition which shows us another problem we need to deal with. //@Requirement private ProjectBuilder projectBuilder; @@ -175,7 +175,7 @@ public class MavenMetadataSource Artifact relocatedArtifact = null; - //TODO: Not even sure this is really required as the project will be cached in the builder, we'll see this + //TODO Not even sure this is really required as the project will be cached in the builder, we'll see this // is currently the biggest hotspot if ( artifact instanceof ArtifactWithDependencies ) { @@ -658,7 +658,7 @@ public class MavenMetadataSource // MNG-2861: the artifact data has changed. If the available versions where previously // retrieved, we need to update it. - // TODO: shouldn't the versions be merged across relocations? + // TODO shouldn't the versions be merged across relocations? List<ArtifactVersion> available = artifact.getAvailableVersions(); if ( available != null && !available.isEmpty() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java b/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java index 3d6a969..c7ab086 100644 --- a/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java +++ b/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java @@ -28,8 +28,6 @@ public class SystemProperties { /** * Thread-safe System.properties copy implementation. - * - * @see https://issues.apache.org/jira/browse/MNG-5670 */ public static void addSystemProperties( Properties props ) { @@ -38,8 +36,8 @@ public class SystemProperties /** * Returns a copy of {@link System#getProperties()} in a thread-safe manner. - * - * @return {@link System#getProperties()} obtained in a thread-safe manner. + * + * @return {@link System#getProperties()} obtained in a thread-safe manner. */ public static Properties getSystemProperties() { http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java index 207b9aa..d3ffd92 100644 --- a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java @@ -127,7 +127,7 @@ public class DefaultMavenSettingsBuilder if ( StringUtils.isEmpty( path ) ) { - // TODO: This replacing shouldn't be necessary as user.home should be in the + // TODO This replacing shouldn't be necessary as user.home should be in the // context of the container and thus the value would be interpolated by Plexus String basedir = System.getProperty( basedirSysProp ); if ( basedir == null ) http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java index 9f7a26b..0bdee11 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java @@ -124,7 +124,7 @@ public class DefaultToolchainManager if ( current != null ) { - //TODO: why is this using the context + //TODO why is this using the context context = session.getPluginContext( desc, current ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java index 8eddac5..134c24d 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java @@ -44,16 +44,16 @@ public interface ToolchainManager * <code>maven-toolchains-plugin</code> contains the configuration to select the appropriate * toolchain and is executed at the beginning of the build. * - * @param session the Maven session, must not be {@code null} * @param type the type, must not be {@code null} + * @param context the Maven session, must not be {@code null} * @return the toolchain selected by <code>maven-toolchains-plugin</code> */ Toolchain getToolchainFromBuildContext( String type, MavenSession context ); - + /** * Select all toolchains available in user settings matching the type and requirements, * independently from <code>maven-toolchains-plugin</code>. - * + * * @param session the Maven session, must not be {@code null} * @param type the type, must not be {@code null} * @param requirements the requirements, may be {@code null} http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java index 047ef9f..fd1baf7 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java @@ -36,7 +36,7 @@ public class ProjectBuildListTest final ProjectBuildList byTaskSegment = projectBuildList.getByTaskSegment( taskSegment ); assertEquals( projectBuildList.size(), - byTaskSegment.size() ); // Todo: Make multiple segments on projectBuildList + byTaskSegment.size() ); // TODO Make multiple segments on projectBuildList } } http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java index f976601..ad9a192 100644 --- a/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java +++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java @@ -103,7 +103,7 @@ public class PluginManagerTest // Tests which exercise the lifecycle executor when it is dealing with individual goals. // ----------------------------------------------------------------------------------------------- - //TODO: These two tests display a lack of symmetry with respect to the input which is a free form string and the + //TODO These two tests display a lack of symmetry with respect to the input which is a free form string and the // mojo descriptor which comes back. All the free form parsing needs to be done somewhere else, this is // really the function of the CLI, and then the pre-processing of that output still needs to be fed into // a hinting process which helps flesh out the full specification of the plugin. The plugin manager should @@ -113,7 +113,7 @@ public class PluginManagerTest public void testRemoteResourcesPlugin() throws Exception { - //TODO: turn an equivalent back on when the RR plugin is released. + //TODO turn an equivalent back on when the RR plugin is released. /* @@ -138,7 +138,7 @@ public class PluginManagerTest */ } - //TODO: this will be the basis of the customizable lifecycle execution so need to figure this out quickly. + //TODO this will be the basis of the customizable lifecycle execution so need to figure this out quickly. public void testSurefirePlugin() throws Exception { http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java b/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java index 9c770da..5486e96 100644 --- a/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java @@ -90,7 +90,7 @@ public class MavenMetadataSourceTest */ } - //TODO: restore these if it makes sense + //TODO restore these if it makes sense /* public void testShouldUseCompileScopeIfDependencyScopeEmpty() throws Exception http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java b/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java index 192ed3b..03ef00c 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java @@ -64,7 +64,7 @@ public class CleanArgument // otherwise, we trim the trailing " and append to the buffer. else { - // TODO: introducing a space here...not sure what else to do but collapse whitespace + // TODO introducing a space here...not sure what else to do but collapse whitespace currentArg.append( ' ' ).append( cleanArgPart ); } http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index 1cdbd23..4e10b05 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -115,7 +115,7 @@ import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; -// TODO: push all common bits back to plexus cli and prepare for transition to Guice. We don't need 50 ways to make CLIs +// TODO push all common bits back to plexus cli and prepare for transition to Guice. We don't need 50 ways to make CLIs /** * @author Jason van Zyl @@ -211,7 +211,7 @@ public class MavenCli return result; } - // TODO: need to externalize CliRequest + // TODO need to externalize CliRequest public static int doMain( String[] args, ClassWorld classWorld ) { MavenCli cli = new MavenCli(); @@ -283,7 +283,7 @@ public class MavenCli } } - // TODO: need to externalize CliRequest + // TODO need to externalize CliRequest public int doMain( CliRequest cliRequest ) { PlexusContainer localContainer = null; @@ -1510,7 +1510,7 @@ public class MavenCli final String threadConfiguration = commandLine.hasOption( CLIManager.THREADS ) ? commandLine.getOptionValue( CLIManager.THREADS ) : request.getSystemProperties().getProperty( - MavenCli.THREADS_DEPRECATED ); // TODO: Remove this setting. Note that the int-tests use it + MavenCli.THREADS_DEPRECATED ); // TODO Remove this setting. Note that the int-tests use it if ( threadConfiguration != null ) { http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java index 189651b..4ebb033 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java @@ -888,7 +888,7 @@ public class DefaultModelBuilder } // - // TODO:jvz Why isn't all this checking the job of the duty of the workspace resolver, we know that we + // TODO jvz Why isn't all this checking the job of the duty of the workspace resolver, we know that we // have a model that is suitable, yet more checks are done here and the one for the version is problematic // before because with parents as ranges it will never work in this scenario. // http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java index 2a49a21..e42469a 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java @@ -57,10 +57,6 @@ public interface ModelBuilder /** * Performs only the part of {@link ModelBuilder#build(ModelBuildingRequest)} that loads the raw model - * - * @param request - * @return - * @throws ModelBuildingException */ Result<? extends Model> buildRawModel( File pomFile, int validationLevel, boolean locationTracking ); http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java index d20f244..bc6e71b 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java @@ -66,7 +66,7 @@ public interface ModelBuildingRequest /** * Gets the raw model to build. If not set, model source will be used to load raw model. - * + * * @return The raw model to build or {@code null} if not set. */ Model getRawModel(); @@ -74,7 +74,7 @@ public interface ModelBuildingRequest /** * Set raw model. * - * @param model + * @param rawModel */ ModelBuildingRequest setRawModel( Model rawModel ); http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java index 2828874..c9d5f68 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java @@ -46,7 +46,7 @@ import com.google.common.collect.Iterables; * <li>error - (partial) model and diagnostics * </ol> * Could encode these variants as subclasses, but kept in one for now - * + * * @author bbusjaeger * @param <T> */ @@ -55,9 +55,8 @@ public class Result<T> /** * Success without warnings - * + * * @param model - * @return */ public static <T> Result<T> success( T model ) { @@ -66,10 +65,9 @@ public class Result<T> /** * Success with warnings - * + * * @param model * @param problems - * @return */ public static <T> Result<T> success( T model, Iterable<? extends ModelProblem> problems ) { @@ -79,10 +77,9 @@ public class Result<T> /** * Success with warnings - * + * * @param model * @param results - * @return */ public static <T> Result<T> success( T model, Result<?>... results ) { @@ -93,7 +90,6 @@ public class Result<T> * Error with problems describing the cause * * @param problems - * @return */ public static <T> Result<T> error( Iterable<? extends ModelProblem> problems ) { @@ -120,7 +116,6 @@ public class Result<T> * * @param model * @param problems - * @return */ public static <T> Result<T> error( T model, Iterable<? extends ModelProblem> problems ) { @@ -129,10 +124,9 @@ public class Result<T> /** * New result - determine whether error or success by checking problems for errors - * + * * @param model * @param problems - * @return */ public static <T> Result<T> newResult( T model, Iterable<? extends ModelProblem> problems ) { @@ -142,10 +136,9 @@ public class Result<T> /** * New result consisting of given result and new problem. Convenience for newResult(result.get(), * concat(result.getProblems(),problems)). - * + * * @param result * @param problem - * @return */ public static <T> Result<T> addProblem( Result<T> result, ModelProblem problem ) { @@ -157,7 +150,6 @@ public class Result<T> * * @param result * @param problems - * @return */ public static <T> Result<T> addProblems( Result<T> result, Iterable<? extends ModelProblem> problems ) { @@ -172,9 +164,8 @@ public class Result<T> /** * Turns the given results into a single result by combining problems and models into single collection. - * + * * @param results - * @return */ public static <T> Result<Iterable<T>> newResultSet( Iterable<? extends Result<? extends T>> results ) { http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java index a790580..ba077b2 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java @@ -306,7 +306,7 @@ public class StringSearchModelInterpolator new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).setMessage( "Failed to interpolate field3: " + field + " on class: " + field.getType().getName() ).setException( - e ) ); // todo: Not entirely the same message + e ) ); // TODO Not entirely the same message } catch ( IllegalAccessException e ) { http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java b/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java index 0007af5..e96425d 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java @@ -109,7 +109,7 @@ public class MavenModelMerger } /* - * TODO: Whether the merge continues recursively into an existing node or not could be an option for the generated + * TODO Whether the merge continues recursively into an existing node or not could be an option for the generated * merger */ @Override @@ -266,7 +266,7 @@ public class MavenModelMerger } /* - * TODO: The order of the merged list could be controlled by an attribute in the model association: target-first, + * TODO The order of the merged list could be controlled by an attribute in the model association: target-first, * source-first, dominant-first, recessive-first */ @Override @@ -352,7 +352,7 @@ public class MavenModelMerger } /* - * TODO: Whether duplicates should be removed looks like an option for the generated merger. + * TODO Whether duplicates should be removed looks like an option for the generated merger. */ @Override protected void mergeBuildBase_Filters( BuildBase target, BuildBase source, boolean sourceDominant, http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java index 9af30c1..59b0532 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java @@ -532,7 +532,7 @@ public class DefaultModelValidator d.getManagementKey(), d ); /* - * TODO: Extensions like Flex Mojos use custom scopes like "merged", "internal", "external", etc. In + * TODO Extensions like Flex Mojos use custom scopes like "merged", "internal", "external", etc. In * order to don't break backward-compat with those, only warn but don't error out. */ validateEnum( prefix + "scope", problems, Severity.WARNING, Version.V20, d.getScope(), http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java ---------------------------------------------------------------------- diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java index 76a2aad..73e46fc 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java @@ -58,7 +58,7 @@ public interface Mojo * * @param log a new logger */ - // TODO: not sure about this here, and may want a getLog on here as well/instead + // TODO not sure about this here, and may want a getLog on here as well/instead void setLog( Log log ); /** http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java ---------------------------------------------------------------------- diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java index 3f7eccc..e89abed 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java @@ -36,7 +36,7 @@ import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; * <a href="https://maven.apache.org/developers/mojo-api-specification.html";> * https://maven.apache.org/developers/mojo-api-specification.html</a> * - * @todo is there a need for the delegation of MavenMojoDescriptor to this? + * TODO is there a need for the delegation of MavenMojoDescriptor to this? * Why not just extend ComponentDescriptor here? */ public class MojoDescriptor @@ -269,7 +269,7 @@ public class MojoDescriptor /** * @return the required dependencies in a specified scope - * @TODO the name is not intelligible + * TODO the name is not intelligible */ @Deprecated public String isDependencyResolutionRequired() http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java ---------------------------------------------------------------------- diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java index f65f824..e05d86a 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java @@ -176,7 +176,7 @@ public class PluginDescriptor /** * Parse maven-...-plugin. * - * @todo move to plugin-tools-api as a default only + * TODO move to plugin-tools-api as a default only */ public static String getGoalPrefixFromArtifactId( String artifactId ) { @@ -287,7 +287,7 @@ public class PluginDescriptor return null; // no mojo in this POM } - // TODO: could we use a map? Maybe if the parent did that for components too, as this is too vulnerable to + // TODO could we use a map? Maybe if the parent did that for components too, as this is too vulnerable to // changes above not being propagated to the map for ( MojoDescriptor desc : getMojos() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java ---------------------------------------------------------------------- diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java index 9508c51..865e66b 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java @@ -313,7 +313,7 @@ public class PluginDescriptorBuilder mojo.setParameters( parameters ); - // TODO: this should not need to be handed off... + // TODO this should not need to be handed off... // ---------------------------------------------------------------------- // Requirements http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/SystemStreamLog.java ---------------------------------------------------------------------- diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/SystemStreamLog.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/SystemStreamLog.java index 90475bf..38c1316 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/SystemStreamLog.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/SystemStreamLog.java @@ -141,7 +141,7 @@ public class SystemStreamLog */ public boolean isDebugEnabled() { - // TODO: Not sure how best to set these for this implementation... + // TODO Not sure how best to set these for this implementation... return false; } http://git-wip-us.apache.org/repos/asf/maven/blob/b3848d5b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d4d371b..f5e5a4e 100644 --- a/pom.xml +++ b/pom.xml @@ -640,14 +640,15 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> - <linksource>true</linksource> - <notimestamp>true</notimestamp> - <quiet>true</quiet> - <links combine.children="append"> - <!-- TODO link to Maven Resolver Javadoc --> - <link>http://download.eclipse.org/aether/aether-core/${aetherVersion}/apidocs/</link> - <link>https://codehaus-plexus.github.io/plexus-containers/plexus-container-default/apidocs/</link> - </links> + <!-- TODO Remove when we upgrade to maven-parent 31 --> + <locale>en</locale> + <tags> + <tag> + <name>provisional</name> + <placement>tf</placement> + <head>Provisional:</head> + </tag> + </tags> </configuration> <reportSets> <reportSet>
