You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2017/03/08 16:56:49 UTC
[04/36] maven git commit: [MNG-6150] Javadoc improvements for 3.5.0
[MNG-6150] Javadoc improvements for 3.5.0
* Remove duplicate plugin configuration
* Add workaround for Javadoc locale
* Clean up errors reported by Javadoc 7
Note: Javadoc 8 fails immediately because Modello generates invalid
Javadoc
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b66bdb9c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b66bdb9c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b66bdb9c
Branch: refs/heads/DEPMGMT
Commit: b66bdb9cbc383fd4cc875006afe9fe6d4de26397
Parents: f8ab2a6
Author: Michael Osipov <mi...@apache.org>
Authored: Sun Feb 12 01:10:50 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Wed Feb 15 17:30:46 2017 +0100
----------------------------------------------------------------------
.../org/apache/maven/artifact/Artifact.java | 2 +-
.../artifact/repository/ArtifactRepository.java | 1 -
.../maven/artifact/versioning/VersionRange.java | 4 +--
.../java/org/apache/maven/repository/Proxy.java | 6 ++--
.../legacy/metadata/ArtifactMetadata.java | 8 ++---
.../artifact/versioning/VersionRangeTest.java | 4 +--
.../maven/artifact/ArtifactScopeEnum.java | 2 --
.../artifact/manager/DefaultWagonManager.java | 2 +-
.../DefaultRepositoryMetadataManager.java | 10 +++---
.../SnapshotArtifactRepositoryMetadata.java | 2 +-
.../resolver/DebugResolutionListener.java | 2 +-
.../resolver/DefaultArtifactResolver.java | 2 +-
.../maven/project/MavenProjectBuilder.java | 2 +-
.../DefaultModelInheritanceAssembler.java | 10 +++---
.../AbstractStringBasedModelInterpolator.java | 6 ++--
.../RegexBasedModelInterpolator.java | 2 +-
.../apache/maven/repository/MetadataGraph.java | 5 ---
.../repository/MetadataResolutionRequest.java | 2 +-
.../repository/MetadataResolutionResult.java | 2 +-
.../repository/legacy/DefaultWagonManager.java | 12 ++++----
.../DefaultArtifactRepositoryFactory.java | 2 +-
.../DefaultLegacyArtifactCollector.java | 14 ++++-----
.../DefaultConflictResolverFactory.java | 2 +-
.../conflict/NewestConflictResolver.java | 2 +-
.../conflict/OldestConflictResolver.java | 2 +-
.../AbstractVersionTransformation.java | 6 ++--
.../resolver/DefaultArtifactCollectorTest.java | 4 +--
.../AbstractMavenLifecycleParticipant.java | 2 +-
.../maven/DefaultArtifactFilterManager.java | 2 +-
.../DependencyResolutionRequiredException.java | 2 +-
.../repository/MavenArtifactRepository.java | 4 +--
.../metadata/AbstractRepositoryMetadata.java | 4 +--
.../repository/metadata/RepositoryMetadata.java | 2 +-
.../resolver/ArtifactResolutionResult.java | 4 +--
.../maven/artifact/resolver/ResolutionNode.java | 2 +-
.../resolver/filter/ExcludesArtifactFilter.java | 2 +-
.../resolver/filter/IncludesArtifactFilter.java | 2 +-
.../execution/DefaultMavenExecutionRequest.java | 2 +-
.../maven/execution/MavenExecutionRequest.java | 26 ++++++++--------
.../scope/WeakMojoExecutionListener.java | 5 +--
.../lifecycle/DefaultLifecycleExecutor.java | 4 +--
.../maven/lifecycle/DefaultLifecycles.java | 2 +-
.../maven/lifecycle/MavenExecutionPlan.java | 12 ++++----
...DefaultLifecycleExecutionPlanCalculator.java | 4 +--
.../lifecycle/internal/DependencyContext.java | 2 +-
.../maven/lifecycle/internal/GoalTask.java | 2 +-
.../internal/MojoDescriptorCreator.java | 4 +--
.../lifecycle/internal/ProjectBuildList.java | 2 +-
.../maven/lifecycle/internal/ProjectIndex.java | 2 +-
.../maven/lifecycle/internal/TaskSegment.java | 2 +-
.../internal/builder/BuilderCommon.java | 2 +-
.../maven/lifecycle/mapping/Lifecycle.java | 8 ++---
.../maven/plugin/DefaultBuildPluginManager.java | 4 +--
.../PluginParameterExpressionEvaluator.java | 14 ++++-----
.../internal/DefaultMavenPluginManager.java | 4 +--
.../DuplicateArtifactAttachmentException.java | 2 +-
.../org/apache/maven/project/MavenProject.java | 32 ++++++++++----------
.../org/apache/maven/project/ProjectSorter.java | 2 +-
.../project/artifact/ActiveProjectArtifact.java | 2 +-
.../project/artifact/MavenMetadataSource.java | 6 ++--
.../properties/internal/SystemProperties.java | 6 ++--
.../settings/DefaultMavenSettingsBuilder.java | 2 +-
.../toolchain/DefaultToolchainManager.java | 2 +-
.../maven/toolchain/ToolchainManager.java | 6 ++--
.../internal/ProjectBuildListTest.java | 2 +-
.../apache/maven/plugin/PluginManagerTest.java | 6 ++--
.../artifact/MavenMetadataSourceTest.java | 2 +-
.../org/apache/maven/cli/CleanArgument.java | 2 +-
.../java/org/apache/maven/cli/MavenCli.java | 8 ++---
.../model/building/DefaultModelBuilder.java | 2 +-
.../maven/model/building/ModelBuilder.java | 4 ---
.../model/building/ModelBuildingRequest.java | 4 +--
.../org/apache/maven/model/building/Result.java | 23 +++++---------
.../StringSearchModelInterpolator.java | 2 +-
.../maven/model/merge/MavenModelMerger.java | 6 ++--
.../model/validation/DefaultModelValidator.java | 2 +-
.../main/java/org/apache/maven/plugin/Mojo.java | 2 +-
.../maven/plugin/descriptor/MojoDescriptor.java | 4 +--
.../plugin/descriptor/PluginDescriptor.java | 4 +--
.../descriptor/PluginDescriptorBuilder.java | 2 +-
.../maven/plugin/logging/SystemStreamLog.java | 2 +-
pom.xml | 17 ++++++-----
82 files changed, 189 insertions(+), 210 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java b/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
index 6cc0022..9546433 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
@@ -48,7 +48,7 @@ public interface Artifact
Pattern VERSION_FILE_PATTERN = Pattern.compile( "^(.*)-([0-9]{8}.[0-9]{6})-([0-9]+)$" );
- // TODO: into artifactScope handler
+ // TODO into artifactScope handler
String SCOPE_COMPILE = "compile";
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
index 9ef3038..0b33345 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
@@ -79,7 +79,6 @@ public interface ArtifactRepository
/**
*
* @param artifact
- * @return
* @since 3.0-alpha-3
*/
Artifact find( Artifact artifact );
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
index 7181db0..502b0e7 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
@@ -295,7 +295,7 @@ public class VersionRange
// original recommended version
version = restriction.recommendedVersion;
}
-/* TODO: should throw this immediately, but need artifact
+/* TODO should throw this immediately, but need artifact
else
{
throw new OverConstrainedVersionException( "Restricting incompatible version ranges" );
@@ -518,7 +518,7 @@ public class VersionRange
public ArtifactVersion matchVersion( List<ArtifactVersion> versions )
{
- // TODO: could be more efficient by sorting the list and then moving along the restrictions in order?
+ // TODO could be more efficient by sorting the list and then moving along the restrictions in order?
ArtifactVersion matched = null;
for ( ArtifactVersion version : versions )
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java b/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java
index ea2c023..e42f1ed 100644
--- a/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java
+++ b/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java
@@ -148,9 +148,9 @@ public class Proxy
}
/**
- * Get the type of the proxy server.
+ * Get the protocol of the proxy server.
*
- * @return the type of the proxy server
+ * @return the protocol of the proxy server
*/
public String getProtocol()
{
@@ -158,7 +158,7 @@ public class Proxy
}
/**
- * @param type the type of the proxy server like <i>SOCKSv4</i>
+ * @param protocol the protocol of the proxy server like <i>SOCKSv4</i>
*/
public void setProtocol( String protocol )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-artifact/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java b/maven-artifact/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java
index e66a84a..7abdfbb 100644
--- a/maven-artifact/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java
+++ b/maven-artifact/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java
@@ -26,8 +26,8 @@ import org.apache.maven.artifact.repository.metadata.RepositoryMetadataStoreExce
* Contains metadata about an artifact, and methods to retrieve/store it from an artifact repository.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @todo merge with artifactmetadatasource
- * @todo retrieval exception not appropriate for store
+ * TODO merge with artifactmetadatasource
+ * TODO retrieval exception not appropriate for store
*/
public interface ArtifactMetadata
{
@@ -64,7 +64,7 @@ public interface ArtifactMetadata
* Merge a new metadata set into this piece of metadata.
*
* @param metadata the new metadata
- * @todo this should only be needed on the repository metadata
+ * TODO this should only be needed on the repository metadata
*/
void merge( ArtifactMetadata metadata );
@@ -73,7 +73,7 @@ public interface ArtifactMetadata
*
* @param localRepository the local repository
* @param remoteRepository the remote repository it came from
- * @todo this should only be needed on the repository metadata
+ * TODO this should only be needed on the repository metadata
*/
void storeInLocalRepository( ArtifactRepository localRepository,
ArtifactRepository remoteRepository )
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
index 14b16cb..dc8d3d5 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
@@ -178,7 +178,7 @@ public class VersionRangeTest
VersionRange range1 = VersionRange.createFromVersionSpec( "1.0" );
VersionRange range2 = VersionRange.createFromVersionSpec( "1.1" );
VersionRange mergedRange = range1.restrict( range2 );
- // TODO: current policy is to retain the original version - is this correct, do we need strategies or is that handled elsewhere?
+ // TODO current policy is to retain the original version - is this correct, do we need strategies or is that handled elsewhere?
// assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
assertEquals( CHECK_VERSION_RECOMMENDATION, "1.0", mergedRange.getRecommendedVersion().toString() );
List<Restriction> restrictions = mergedRange.getRestrictions();
@@ -199,7 +199,7 @@ public class VersionRangeTest
assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- // TODO: test reversed restrictions on all below
+ // TODO test reversed restrictions on all below
range1 = VersionRange.createFromVersionSpec( "[1.0,)" );
range2 = VersionRange.createFromVersionSpec( "1.1" );
mergedRange = range1.restrict( range2 );
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java b/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
index 7051e3b..4460a07 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
@@ -49,8 +49,6 @@ public enum ArtifactScopeEnum
/**
* Helper method to simplify null processing
- *
- * @return
*/
public static final ArtifactScopeEnum checkScope( ArtifactScopeEnum scope )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java b/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
index 29876e2..fe89d1e 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
@@ -166,7 +166,7 @@ public class DefaultWagonManager
String id = mirror.getId();
if ( id == null )
{
- // TODO: this should be illegal in settings.xml
+ // TODO this should be illegal in settings.xml
id = repository.getId();
}
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
index d01a290..28ba94d 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
@@ -165,7 +165,7 @@ public class DefaultRepositoryMetadataManager
}
}
- // TODO: should this be inside the above check?
+ // TODO should this be inside the above check?
// touch file so that this is not checked again until interval has passed
if ( file.exists() )
{
@@ -196,9 +196,9 @@ public class DefaultRepositoryMetadataManager
ArtifactRepository localRepository )
throws RepositoryMetadataStoreException
{
- // TODO: currently this is first wins, but really we should take the latest by comparing either the
+ // TODO currently this is first wins, but really we should take the latest by comparing either the
// snapshot timestamp, or some other timestamp later encoded into the metadata.
- // TODO: this needs to be repeated here so the merging doesn't interfere with the written metadata
+ // TODO this needs to be repeated here so the merging doesn't interfere with the written metadata
// - we'd be much better having a pristine input, and an ongoing metadata for merging instead
Map<ArtifactRepository, Metadata> previousMetadata = new HashMap<>();
@@ -227,7 +227,7 @@ public class DefaultRepositoryMetadataManager
ArtifactRepository selected, ArtifactRepository localRepository )
throws RepositoryMetadataStoreException
{
- // TODO: this could be a lot nicer... should really be in the snapshot transformation?
+ // TODO this could be a lot nicer... should really be in the snapshot transformation?
if ( metadata.isSnapshot() )
{
Metadata prevMetadata = metadata.getMetadata();
@@ -312,7 +312,7 @@ public class DefaultRepositoryMetadataManager
}
/**
- * @todo share with DefaultPluginMappingManager.
+ * TODO share with DefaultPluginMappingManager.
*/
protected Metadata readMetadata( File mappingFile )
throws RepositoryMetadataReadException
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java
index 359ab2c..5120199 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java
@@ -26,7 +26,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
* Metadata for the artifact version directory of the repository.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @todo split instantiation (versioning, plugin mappings) from definition
+ * TODO split instantiation (versioning, plugin mappings) from definition
*/
public class SnapshotArtifactRepositoryMetadata
extends AbstractRepositoryMetadata
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
index bd1ed9a..01aa80f 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
@@ -85,7 +85,7 @@ public class DebugResolutionListener
logger.debug( indent + artifact + " (not setting artifactScope to: " + ignoredScope + "; local artifactScope "
+ artifact.getScope() + " wins)" );
- // TODO: better way than static? this might hide messages in a reactor
+ // TODO better way than static? this might hide messages in a reactor
if ( !ignoredArtifacts.contains( artifact ) )
{
logger.warn( "\n\tArtifact " + artifact + " retains local artifactScope '" + artifact.getScope()
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index 6a5f330..b78846b 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -376,7 +376,7 @@ public class DefaultArtifactResolver
ArtifactFilter resolutionFilter = request.getResolutionFilter();
RepositorySystemSession session = getSession( request.getLocalRepository() );
- // TODO: hack because metadata isn't generated in m2e correctly and i want to run the maven i have in the
+ // TODO hack because metadata isn't generated in m2e correctly and i want to run the maven i have in the
// workspace
if ( source == null )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java b/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
index 816b4a9..df97948 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
@@ -54,7 +54,7 @@ public interface MavenProjectBuilder
ArtifactRepository localRepository, boolean allowStubModel )
throws ProjectBuildingException;
- // TODO: this is only to provide a project for plugins that don't need a project to execute but need some
+ // TODO this is only to provide a project for plugins that don't need a project to execute but need some
// of the values from a MavenProject. Ideally this should be something internal and nothing outside Maven
// would ever need this so it should not be exposed in a public API
MavenProject buildStandaloneSuperProject( ProjectBuilderConfiguration configuration )
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
index eab3660..07e9473 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
@@ -51,7 +51,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
public class DefaultModelInheritanceAssembler
implements ModelInheritanceAssembler
{
- // TODO: Remove this!
+ // TODO Remove this!
@SuppressWarnings( "unchecked" )
public void assembleBuildInheritance( Build childBuild, Build parentBuild, boolean handleAsInheritance )
{
@@ -303,7 +303,7 @@ public class DefaultModelInheritanceAssembler
child.setProperties( props );
}
- // TODO: Remove this!
+ // TODO Remove this!
@SuppressWarnings( "unchecked" )
private void assembleDependencyManagementInheritance( Model child, Model parent )
{
@@ -523,7 +523,7 @@ public class DefaultModelInheritanceAssembler
}
- // TODO: Remove this!
+ // TODO Remove this!
@SuppressWarnings( "unchecked" )
private void assembleDependencyInheritance( Model child, Model parent )
{
@@ -653,7 +653,7 @@ public class DefaultModelInheritanceAssembler
return repository;
}
- // TODO: This should eventually be migrated to DefaultPathTranslator.
+ // TODO This should eventually be migrated to DefaultPathTranslator.
protected String appendPath( String parentPath, String childPath, String pathAdjustment, boolean appendPaths )
{
String uncleanPath = parentPath;
@@ -689,7 +689,7 @@ public class DefaultModelInheritanceAssembler
return cleanedPath + resolvePath( uncleanPath );
}
- // TODO: Move this to plexus-utils' PathTool.
+ // TODO Move this to plexus-utils' PathTool.
private static String resolvePath( String uncleanPath )
{
LinkedList<String> pathElements = new LinkedList<>();
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
index c40b164..b3e94fc 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
@@ -58,7 +58,7 @@ import java.util.Properties;
* Use a regular expression search to find and resolve expressions within the POM.
*
* @author jdcasey Created on Feb 3, 2005
- * @todo Consolidate this logic with the PluginParameterExpressionEvaluator, minus deprecations/bans.
+ * TODO Consolidate this logic with the PluginParameterExpressionEvaluator, minus deprecations/bans.
*/
@Deprecated
public abstract class AbstractStringBasedModelInterpolator
@@ -104,7 +104,7 @@ public abstract class AbstractStringBasedModelInterpolator
}
/**
- * @todo: Remove the throws clause.
+ * TODO Remove the throws clause.
* @throws IOException This exception is not thrown any more, and needs to be removed.
*/
protected AbstractStringBasedModelInterpolator()
@@ -190,8 +190,6 @@ public abstract class AbstractStringBasedModelInterpolator
* with the value, and continue to find other expressions.</li>
* <li>If the value is null, get it from the model properties.</li>
* <li>
- * @param overrideContext
- * @param outputDebugMessages
*/
public String interpolate( String src,
Model model,
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
index 4e251ae..78990ea 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
@@ -30,7 +30,7 @@ import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
* Use a regular expression search to find and resolve expressions within the POM.
*
* @author jdcasey Created on Feb 3, 2005
- * @todo Consolidate this logic with the PluginParameterExpressionEvaluator, minus deprecations/bans.
+ * TODO Consolidate this logic with the PluginParameterExpressionEvaluator, minus deprecations/bans.
*/
@Deprecated
public class RegexBasedModelInterpolator
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java
index e994856..3568ff0 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java
@@ -57,7 +57,6 @@ public class MetadataGraph
* find a node by the GAV (metadata)
*
* @param md
- * @return
*/
public MetadataGraphNode findNode( MavenArtifactMetadata md )
{
@@ -76,8 +75,6 @@ public class MetadataGraph
/**
* getter
- *
- * @return
*/
public MetadataGraphNode getEntry()
{
@@ -86,8 +83,6 @@ public class MetadataGraph
/**
* getter
- *
- * @return
*/
public Collection<MetadataGraphNode> getNodes()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
index 7593351..75d9ddc 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
@@ -123,7 +123,7 @@ public class MetadataResolutionRequest
}
/**
- * @deprecated instead use {@link #setRemoteRepositories()}
+ * @deprecated instead use {@link #setRemoteRepositories(List)}
*/
@Deprecated
public MetadataResolutionRequest setRemoteRepostories( List<ArtifactRepository> remoteRepostories )
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
index 906d0f6..0071ea4 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
@@ -161,7 +161,7 @@ public class MetadataResolutionResult
}
/**
- * @TODO this needs to accept a {@link OverConstrainedVersionException} as returned by
+ * TODO this needs to accept a {@link OverConstrainedVersionException} as returned by
* {@link #getVersionRangeViolation(int)} but it's not used like that in
* {@link DefaultLegacyArtifactCollector}
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
index b8835b5..8dd6b36 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
@@ -56,9 +56,9 @@ import org.codehaus.plexus.util.FileUtils;
import org.eclipse.aether.ConfigurationProperties;
import org.eclipse.aether.util.ConfigUtils;
-//TODO: remove the update check manager
-//TODO: separate into retriever and publisher
-//TODO: remove hardcoding of checksum logic
+//TODO remove the update check manager
+//TODO separate into retriever and publisher
+//TODO remove hardcoding of checksum logic
@Component( role = WagonManager.class )
public class DefaultWagonManager
implements WagonManager
@@ -378,7 +378,7 @@ public class DefaultWagonManager
ChecksumObserver sha1ChecksumObserver = null;
try
{
- // TODO: configure on repository
+ // TODO configure on repository
int i = 0;
md5ChecksumObserver = addChecksumObserver( wagon, CHECKSUM_ALGORITHMS[i++] );
@@ -594,7 +594,7 @@ public class DefaultWagonManager
Map<String, String> sums = new HashMap<>( 2 );
- // TODO: configure these on the repository
+ // TODO configure these on the repository
for ( int i = 0; i < CHECKSUM_IDS.length; i++ )
{
checksums.put( CHECKSUM_IDS[i], addChecksumObserver( wagon, CHECKSUM_ALGORITHMS[i] ) );
@@ -628,7 +628,7 @@ public class DefaultWagonManager
// We do this in here so we can checksum the artifact metadata too, otherwise it could be metadata itself
for ( String extension : checksums.keySet() )
{
- // TODO: shouldn't need a file intermediatary - improve wagon to take a stream
+ // TODO shouldn't need a file intermediatary - improve wagon to take a stream
File temp = File.createTempFile( "maven-artifact", null );
temp.deleteOnExit();
FileUtils.fileWrite( temp.getAbsolutePath(), "UTF-8", sums.get( extension ) );
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java
index 4bc9116..fc6b441 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java
@@ -37,7 +37,7 @@ import org.codehaus.plexus.component.annotations.Requirement;
public class DefaultArtifactRepositoryFactory
implements ArtifactRepositoryFactory
{
- // TODO: use settings?
+ // TODO use settings?
private String globalUpdatePolicy;
private String globalChecksumPolicy;
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
index 88168f1..c3603a6 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
@@ -249,7 +249,7 @@ public class DefaultLegacyArtifactCollector
Object key = node.getKey();
- // TODO: Does this check need to happen here? Had to add the same call
+ // TODO Does this check need to happen here? Had to add the same call
// below when we iterate on child nodes -- will that suffice?
if ( managedVersions.containsKey( key ) )
{
@@ -272,11 +272,11 @@ public class DefaultLegacyArtifactCollector
if ( ( previousRange != null ) && ( currentRange != null ) )
{
- // TODO: shouldn't need to double up on this work, only done for simplicity of handling
+ // TODO shouldn't need to double up on this work, only done for simplicity of handling
// recommended
// version but the restriction is identical
VersionRange newRange = previousRange.restrict( currentRange );
- // TODO: ick. this forces the OCE that should have come from the previous call. It is still
+ // TODO ick. this forces the OCE that should have come from the previous call. It is still
// correct
if ( newRange.isSelectedVersionKnown( previous.getArtifact() ) )
{
@@ -363,7 +363,7 @@ public class DefaultLegacyArtifactCollector
if ( resolved == null )
{
- // TODO: add better exception that can detail the two conflicting artifacts
+ // TODO add better exception that can detail the two conflicting artifacts
ArtifactResolutionException are =
new ArtifactResolutionException( "Cannot resolve artifact version conflict between "
+ previous.getArtifact().getVersion() + " and "
@@ -375,14 +375,14 @@ public class DefaultLegacyArtifactCollector
if ( ( resolved != previous ) && ( resolved != node ) )
{
- // TODO: add better exception
+ // TODO add better exception
result.addVersionRangeViolation( new ArtifactResolutionException(
"Conflict resolver returned unknown resolution node: ",
resolved.getArtifact() ) );
}
- // TODO: should this be part of mediation?
+ // TODO should this be part of mediation?
// previous one is more dominant
ResolutionNode nearest;
ResolutionNode farthest;
@@ -501,7 +501,7 @@ public class DefaultLegacyArtifactCollector
if ( artifact.getVersion() == null )
{
// set the recommended version
- // TODO: maybe its better to just pass the range through to retrieval and use a
+ // TODO maybe its better to just pass the range through to retrieval and use a
// transformation?
ArtifactVersion version;
if ( !artifact.isSelectedVersionKnown() )
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java
index 66716d1..9192b18 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java
@@ -32,7 +32,7 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
* A conflict resolver factory that obtains instances from a plexus container.
*
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
- * @todo you don't need the container in here with the active maps (jvz).
+ * TODO you don't need the container in here with the active maps (jvz).
* @since 3.0
*/
@Component( role = ConflictResolverFactory.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java
index 1879a81..e5bf558 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java
@@ -54,7 +54,7 @@ public class NewestConflictResolver
}
catch ( OverConstrainedVersionException exception )
{
- // TODO: log message or throw exception?
+ // TODO log message or throw exception?
return null;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java
index 5c5c12d..d5e880c 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java
@@ -54,7 +54,7 @@ public class OldestConflictResolver
}
catch ( OverConstrainedVersionException exception )
{
- // TODO: log message or throw exception?
+ // TODO log message or throw exception?
return null;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java
index 3a5c7c6..1ce5458 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java
@@ -42,7 +42,7 @@ import org.codehaus.plexus.logging.AbstractLogEnabled;
* Describes a version transformation during artifact resolution.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @todo try and refactor to remove abstract methods - not particular happy about current design
+ * TODO try and refactor to remove abstract methods - not particular happy about current design
*/
public abstract class AbstractVersionTransformation
extends AbstractLogEnabled
@@ -105,8 +105,8 @@ public abstract class AbstractVersionTransformation
version = artifact.getBaseVersion();
}
- // TODO: also do this logging for other metadata?
- // TODO: figure out way to avoid duplicated message
+ // TODO also do this logging for other metadata?
+ // TODO figure out way to avoid duplicated message
if ( getLogger().isDebugEnabled() )
{
if ( !version.equals( artifact.getBaseVersion() ) )
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
index 39084fe..391ec0f 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
@@ -166,7 +166,7 @@ public class DefaultArtifactCollectorTest
public void disabledtestResolveCorrectDependenciesWhenDifferentDependenciesOnNewest()
throws ArtifactResolutionException, InvalidVersionSpecificationException
{
- // TODO: use newest conflict resolver
+ // TODO use newest conflict resolver
ArtifactSpec a = createArtifactSpec( "a", "1.0" );
ArtifactSpec b = a.addDependency( "b", "1.0" );
ArtifactSpec c2 = b.addDependency( "c", "2.0" );
@@ -185,7 +185,7 @@ public class DefaultArtifactCollectorTest
public void disabledtestResolveCorrectDependenciesWhenDifferentDependenciesOnNewestVersionReplaced()
throws ArtifactResolutionException, InvalidVersionSpecificationException
{
- // TODO: use newest conflict resolver
+ // TODO use newest conflict resolver
ArtifactSpec a = createArtifactSpec( "a", "1.0" );
ArtifactSpec b1 = a.addDependency( "b", "1.0" );
ArtifactSpec c = a.addDependency( "c", "1.0" );
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java b/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
index 01247ae..faddef4 100644
--- a/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
+++ b/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
@@ -53,7 +53,7 @@ public abstract class AbstractMavenLifecycleParticipant
* activate profiles and perform similar tasks that affect MavenProject
* instance construction.
*/
- // TODO: This is too early for build extensions, so maybe just remove it?
+ // TODO This is too early for build extensions, so maybe just remove it?
public void afterSessionStart( MavenSession session )
throws MavenExecutionException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
index 503dcdb..a746846 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
@@ -85,7 +85,7 @@ public class DefaultArtifactFilterManager
/**
* Returns the artifact filter for the standard core artifacts.
*
- * @see org.apache.maven.ArtifactFilterManager#getExtensionDependencyFilter()
+ * @see org.apache.maven.ArtifactFilterManager#getCoreArtifactFilter()
*/
public ArtifactFilter getCoreArtifactFilter()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java b/maven-core/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java
index b54ba07..9979423 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java
@@ -23,7 +23,7 @@ package org.apache.maven.artifact;
* Exception that occurs when an artifact file is used, but has not been resolved.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @todo it may be better for artifact.getFile() to throw it - perhaps it is a runtime exception?
+ * TODO it may be better for artifact.getFile() to throw it - perhaps it is a runtime exception?
*/
public class DependencyResolutionRequiredException
extends Exception
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
index 38ae6bb..9765c73 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
@@ -28,7 +28,7 @@ import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.repository.Proxy;
-//TODO: completely separate local and remote artifact repositories
+//TODO completely separate local and remote artifact repositories
public class MavenArtifactRepository
implements ArtifactRepository
{
@@ -234,7 +234,7 @@ public class MavenArtifactRepository
*
* @param url the repository URL
* @return the basedir of the repository
- * @todo need to URL decode for spaces?
+ * TODO need to URL decode for spaces?
*/
private String basedir( String url )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
index 37e69e5..46c41b9 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
@@ -181,7 +181,7 @@ public abstract class AbstractRepositoryMetadata
public void merge( org.apache.maven.repository.legacy.metadata.ArtifactMetadata metadata )
{
- // TODO: not sure that it should assume this, maybe the calls to addMetadata should pre-merge, then artifact
+ // TODO not sure that it should assume this, maybe the calls to addMetadata should pre-merge, then artifact
// replaces?
AbstractRepositoryMetadata repoMetadata = (AbstractRepositoryMetadata) metadata;
this.metadata.merge( repoMetadata.getMetadata() );
@@ -189,7 +189,7 @@ public abstract class AbstractRepositoryMetadata
public void merge( ArtifactMetadata metadata )
{
- // TODO: not sure that it should assume this, maybe the calls to addMetadata should pre-merge, then artifact
+ // TODO not sure that it should assume this, maybe the calls to addMetadata should pre-merge, then artifact
// replaces?
AbstractRepositoryMetadata repoMetadata = (AbstractRepositoryMetadata) metadata;
this.metadata.merge( repoMetadata.getMetadata() );
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
index 22e3ade..d7fe50b 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
@@ -26,7 +26,7 @@ import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
* Describes repository directory metadata.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @todo not happy about the store method - they use "this"
+ * TODO not happy about the store method - they use "this"
*/
public interface RepositoryMetadata
extends org.apache.maven.artifact.metadata.ArtifactMetadata
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
index 2bad1a7..b780f50 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
@@ -36,7 +36,7 @@ import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
* - network/transfer errors - file system errors: permissions
*
* @author Jason van Zyl
- * @TODO carlos: all these possible has*Exceptions and get*Exceptions methods make the clients too
+ * TODO carlos: all these possible has*Exceptions and get*Exceptions methods make the clients too
* complex requiring a long list of checks, need to create a parent/interface/encapsulation
* for the types of exceptions
*/
@@ -173,7 +173,7 @@ public class ArtifactResolutionResult
}
/**
- * @TODO this needs to accept a {@link OverConstrainedVersionException} as returned by
+ * TODO this needs to accept a {@link OverConstrainedVersionException} as returned by
* {@link #getVersionRangeViolation(int)} but it's not used like that in
* {@link DefaultLegacyArtifactCollector}
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
index 5651641..3b64eaf 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
@@ -198,7 +198,7 @@ public class ResolutionNode
{
active = true;
- // TODO: if it was null, we really need to go find them now... or is this taken care of by the ordering?
+ // TODO if it was null, we really need to go find them now... or is this taken care of by the ordering?
if ( children != null )
{
for ( ResolutionNode node : children )
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java
index b6ef02e..e448af4 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java
@@ -27,7 +27,7 @@ import org.apache.maven.artifact.Artifact;
* Filter to exclude from a list of artifact patterns.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @todo I think this is equiv. to exclusion set filter in maven-core
+ * TODO I think this is equiv. to exclusion set filter in maven-core
*/
public class ExcludesArtifactFilter
extends IncludesArtifactFilter
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
index 6ac8884..7a3b6c7 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
@@ -49,7 +49,7 @@ public class IncludesArtifactFilter
boolean matched = false;
for ( Iterator<String> i = patterns.iterator(); i.hasNext() & !matched; )
{
- // TODO: what about wildcards? Just specifying groups? versions?
+ // TODO what about wildcards? Just specifying groups? versions?
if ( id.equals( i.next() ) )
{
matched = true;
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
index d67061f..089a7db 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
@@ -1088,7 +1088,7 @@ public class DefaultMavenExecutionRequest
return pluginArtifactRepositories;
}
- // TODO: this does not belong here.
+ // TODO this does not belong here.
@Override
public ProjectBuildingRequest getProjectBuildingRequest()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
index 53f84c5..d006a43 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
@@ -356,15 +356,15 @@ public interface MavenExecutionRequest
MavenExecutionRequest setUserToolchainsFile( File userToolchainsFile );
/**
- *
- *
+ *
+ *
* @return the global toolchains file
* @since 3.3.0
*/
File getGlobalToolchainsFile();
/**
- *
+ *
* @param globalToolchainsFile the global toolchains file
* @return this request
* @since 3.3.0
@@ -388,29 +388,31 @@ public interface MavenExecutionRequest
MavenExecutionRequest setUseLegacyLocalRepository( boolean useLegacyLocalRepository );
/**
- * Controls the {@link Builder} used by Maven by specification of the builder's id.
+ * Controls the {@link org.apache.maven.lifecycle.internal.builder.Builder} used by Maven by specification
+ * of the builder's id.
*
* @since 3.2.0
*/
MavenExecutionRequest setBuilderId( String builderId );
/**
- * Controls the {@link Builder} used by Maven by specification of the builders id.
+ * Controls the {@link org.apache.maven.lifecycle.internal.builder.Builder} used by Maven by specification
+ * of the builders id.
*
* @since 3.2.0
*/
String getBuilderId();
/**
- *
- * @param toolchains all toolchains grouped by type
- * @return this request
+ *
+ * @param toolchains all toolchains grouped by type
+ * @return this request
* @since 3.3.0
*/
MavenExecutionRequest setToolchains( Map<String, List<ToolchainModel>> toolchains );
-
+
/**
- *
+ *
* @return all toolchains grouped by type, never {@code null}
* @since 3.3.0
*/
@@ -428,9 +430,9 @@ public interface MavenExecutionRequest
/**
* @since 3.3.0
- */
+ */
MavenExecutionRequest setEventSpyDispatcher( EventSpyDispatcher eventSpyDispatcher );
-
+
/**
* @since 3.3.0
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java b/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java
index 94e7c10..102bc1d 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java
@@ -25,8 +25,9 @@ import org.apache.maven.plugin.MojoExecutionException;
/**
* Extension point that allows build extensions observe and possibly veto mojo executions.
* <p>
- * Unlike {@link MojoExecutionListener}, this extension point does not trigger instantiation of the component, hence
- * "weak" class name prefix. Only applies to mojo execution scoped components.
+ * Unlike {@link org.apache.maven.execution.MojoExecutionListener}, this extension point does not
+ * trigger instantiation of the component, hence "weak" class name prefix. Only applies to mojo execution
+ * scoped components.
*
* @see org.apache.maven.execution.MojoExecutionListener
* @since 3.1.2
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
index 6f994b3..dae1894 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
@@ -97,8 +97,8 @@ public class DefaultLifecycleExecutor
// fully populated Plugin objects, including executions with goals and default configuration taken
// from the plugin.xml inside a plugin.
//
- // TODO: This whole method could probably removed by injecting lifeCyclePluginAnalyzer straight into client site.
- // TODO: But for some reason the whole plexus appcontext refuses to start when I try this.
+ // TODO This whole method could probably removed by injecting lifeCyclePluginAnalyzer straight into client site.
+ // TODO But for some reason the whole plexus appcontext refuses to start when I try this.
public Set<Plugin> getPluginsBoundByDefaultToAllLifecycles( String packaging )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
index 48cd0c5..8186a39 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
@@ -40,7 +40,7 @@ import java.util.Set;
* @author Jason van Zyl
* @author Kristian Rosenvold
*/
-// TODO: The configuration for the lifecycle needs to be externalized so that I can use the annotations properly for the
+// TODO The configuration for the lifecycle needs to be externalized so that I can use the annotations properly for the
// wiring and reference and external source for the lifecycle configuration.
@Component( role = DefaultLifecycles.class )
public class DefaultLifecycles
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java b/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java
index 7dacb8e..e7b1a7f 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java
@@ -34,13 +34,13 @@ import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
-//TODO: lifecycles being executed
-//TODO: what runs in each phase
-//TODO: plugins that need downloading
-//TODO: project dependencies that need downloading
-//TODO: unfortunately the plugins need to be downloaded in order to get the plugin.xml file. need to externalize this
+//TODO lifecycles being executed
+//TODO what runs in each phase
+//TODO plugins that need downloading
+//TODO project dependencies that need downloading
+//TODO unfortunately the plugins need to be downloaded in order to get the plugin.xml file. need to externalize this
// from the plugin archive.
-//TODO: this will be the class that people get in IDEs to modify
+//TODO this will be the class that people get in IDEs to modify
public class MavenExecutionPlan
implements Iterable<ExecutionPlanItem>
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
index 2600881..46aff9e 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
@@ -525,8 +525,8 @@ public class DefaultLifecycleExecutionPlanCalculator
}
// org.apache.maven.plugins:maven-remote-resources-plugin:1.0:process
- // TODO: take repo mans into account as one may be aggregating prefixes of many
- // TODO: collect at the root of the repository, read the one at the root, and fetch remote if something is missing
+ // TODO take repo mans into account as one may be aggregating prefixes of many
+ // TODO collect at the root of the repository, read the one at the root, and fetch remote if something is missing
// or the user forces the issue
private List<MojoExecution> calculateForkedGoal( MojoExecution mojoExecution, MavenSession session,
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
index 18fae7a..0e4a708 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
@@ -35,7 +35,7 @@ import java.util.TreeSet;
* <p/>
* NOTE: This class is not part of any public api and can be changed or deleted without prior notice.
*/
-// TODO: From a concurrency perspective, this class is not good. The combination of mutable/immutable state is not nice
+// TODO From a concurrency perspective, this class is not good. The combination of mutable/immutable state is not nice
public class DependencyContext
{
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java
index 89e456b..f166403 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java
@@ -22,7 +22,7 @@ package org.apache.maven.lifecycle.internal;
/**
* A task that is a goal
* <p/>
- * TODO: From a concurrency perspective, this class is not good. The combination of mutable/immutable state is not nice
+ * TODO From a concurrency perspective, this class is not good. The combination of mutable/immutable state is not nice
*
* @since 3.0
* @author Benjamin Bentmann
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/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 e6b09ce..a19467f 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
@@ -239,8 +239,8 @@ public class MojoDescriptorCreator
session.getRepositorySession() );
}
- // TODO: take repo mans into account as one may be aggregating prefixes of many
- // TODO: collect at the root of the repository, read the one at the root, and fetch remote if something is missing
+ // TODO take repo mans into account as one may be aggregating prefixes of many
+ // TODO collect at the root of the repository, read the one at the root, and fetch remote if something is missing
// or the user forces the issue
public Plugin findPluginForPrefix( String prefix, MavenSession session )
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/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 427f449..2d7371b 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
@@ -51,7 +51,7 @@ public class ProjectBuildList
this.items = Collections.unmodifiableList( items );
}
- // TODO: Optimize; or maybe just rewrite the whole way aggregating mojos are being run.
+ // TODO Optimize; or maybe just rewrite the whole way aggregating mojos are being run.
/**
* Returns aProjectBuildList that contains only items for the specified taskSegment
* @param taskSegment the requested tasksegment
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/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 13539b4..aa56d57 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
@@ -35,7 +35,7 @@ import java.util.Map;
* <p/>
* NOTE: This class is not part of any public api and can be changed or deleted without prior notice.
*/
-// Todo: Kristian wonders if this class really is necessary and if it overlaps other concepts.
+// TODO Kristian wonders if this class really is necessary and if it overlaps other concepts.
public final class ProjectIndex
{
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/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 492bcda..16eb76a 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
@@ -69,5 +69,5 @@ public final class TaskSegment
return aggregating;
}
- // TODO: Consider throwing UnsupportedSomething on hashCode/equals
+ // TODO Consider throwing UnsupportedSomething on hashCode/equals
}
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
index 34fb323..f770670 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
@@ -188,7 +188,7 @@ public class BuilderCommon
}
}
- // Todo: I'm really wondering where this method belongs; smells like it should be on MavenProject, but for some
+ // TODO I'm really wondering where this method belongs; smells like it should be on MavenProject, but for some
// reason it isn't ? This localization is kind-of a code smell.
public static String getKey( MavenProject project )
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
index c14cf94..27f612f 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
@@ -62,7 +62,7 @@ public class Lifecycle
{
return this.lifecyclePhases;
}
-
+
/**
* Method setId
*
@@ -76,7 +76,7 @@ public class Lifecycle
/**
* Method setLifecyclePhases
*
- * @param phases
+ * @param lifecyclePhases
*/
public void setLifecyclePhases( Map<String, LifecyclePhase> lifecyclePhases )
{
@@ -91,12 +91,12 @@ public class Lifecycle
{
return null;
}
-
+
if ( lphases.isEmpty() )
{
return Collections.emptyMap();
}
-
+
Map<String, String> phases = new LinkedHashMap<>();
for ( Map.Entry<String, LifecyclePhase> e: lphases.entrySet() )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/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 5d7a56c..b4f7a4d 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
@@ -37,8 +37,8 @@ import org.codehaus.plexus.component.annotations.Requirement;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.RemoteRepository;
-// TODO: the antrun plugin has its own configurator, the only plugin that does. might need to think about how that works
-// TODO: remove the coreArtifactFilterManager
+// TODO the antrun plugin has its own configurator, the only plugin that does. might need to think about how that works
+// TODO remove the coreArtifactFilterManager
@Component( role = BuildPluginManager.class )
public class DefaultBuildPluginManager
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/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 a7eeb4e..984e22a 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
@@ -83,7 +83,7 @@ public class PluginParameterExpressionEvaluator
private Properties properties;
- @Deprecated //TODO: used by the Enforcer plugin
+ @Deprecated //TODO used by the Enforcer plugin
public PluginParameterExpressionEvaluator( MavenSession session, MojoExecution mojoExecution,
PathTranslator pathTranslator, Logger logger, MavenProject project,
Properties properties )
@@ -228,7 +228,7 @@ public class PluginParameterExpressionEvaluator
}
catch ( Exception e )
{
- // TODO: don't catch exception
+ // TODO don't catch exception
throw new ExpressionEvaluationException( "Error evaluating plugin parameter expression: " + expression,
e );
}
@@ -268,7 +268,7 @@ public class PluginParameterExpressionEvaluator
}
catch ( Exception e )
{
- // TODO: don't catch exception
+ // TODO don't catch exception
throw new ExpressionEvaluationException( "Error evaluating plugin parameter expression: " + expression,
e );
}
@@ -300,7 +300,7 @@ public class PluginParameterExpressionEvaluator
}
catch ( Exception e )
{
- // TODO: don't catch exception
+ // TODO don't catch exception
throw new ExpressionEvaluationException( "Error evaluating plugin parameter expression: " + expression,
e );
}
@@ -357,7 +357,7 @@ public class PluginParameterExpressionEvaluator
}
catch ( Exception e )
{
- // TODO: don't catch exception
+ // TODO don't catch exception
throw new ExpressionEvaluationException( "Error evaluating plugin parameter expression: " + expression,
e );
}
@@ -412,7 +412,7 @@ public class PluginParameterExpressionEvaluator
if ( value instanceof String )
{
- // TODO: without #, this could just be an evaluate call...
+ // TODO without #, this could just be an evaluate call...
String val = (String) value;
@@ -457,7 +457,7 @@ public class PluginParameterExpressionEvaluator
@Override
public File alignToBaseDirectory( File file )
{
- // TODO: Copied from the DefaultInterpolator. We likely want to resurrect the PathTranslator or at least a
+ // TODO Copied from the DefaultInterpolator. We likely want to resurrect the PathTranslator or at least a
// similar component for re-usage
if ( file != null )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/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 b87994e..72075fd 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
@@ -124,7 +124,7 @@ public class DefaultMavenPluginManager
* PluginId=>ExtensionRealmCache.CacheRecord map MavenProject context value key. The map is used to ensure the same
* class realm is used to load build extensions and load mojos for extensions=true plugins.
*
- * @noreference this is part of internal implementation and may be changed or removed without notice
+ * @provisional This is part of internal implementation and may be changed or removed without notice
* @since 3.3.0
*/
public static final String KEY_EXTENSIONS_REALMS = DefaultMavenPluginManager.class.getName() + "/extensionsRealms";
@@ -617,7 +617,7 @@ public class DefaultMavenPluginManager
try
{
- // TODO: could the configuration be passed to lookup and the configurator known to plexus via the descriptor
+ // TODO could the configuration be passed to lookup and the configurator known to plexus via the descriptor
// so that this method could entirely be handled by a plexus lookup?
configurator = container.lookup( ComponentConfigurator.class, configuratorId );
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/project/DuplicateArtifactAttachmentException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DuplicateArtifactAttachmentException.java b/maven-core/src/main/java/org/apache/maven/project/DuplicateArtifactAttachmentException.java
index 6121473..d263c28 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DuplicateArtifactAttachmentException.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DuplicateArtifactAttachmentException.java
@@ -27,7 +27,7 @@ import org.apache.maven.artifact.Artifact;
*
* @author pgier
* @author jdcasey
- * @todo Make this a checked exception, and modify the API of MavenProjectHelper.
+ * TODO Make this a checked exception, and modify the API of MavenProjectHelper.
* Currently, this modification would create compatibility problems for existing plugins.
*/
public class DuplicateArtifactAttachmentException