You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/02/14 20:25:38 UTC
[1/8] maven git commit: [MNG-6353] Upgrade maven-shared-utils to
3.2.1 [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-6352-print-version 79f501ea6 -> d9c49f13a (forced update)
[MNG-6353] Upgrade maven-shared-utils to 3.2.1
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/24b8820f
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/24b8820f
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/24b8820f
Branch: refs/heads/MNG-6352-print-version
Commit: 24b8820f08f3ff1535931288b7782bb615b1f53d
Parents: 40cf506
Author: rfscholte <rf...@apache.org>
Authored: Sat Feb 10 15:17:03 2018 +0100
Committer: rfscholte <rf...@apache.org>
Committed: Sat Feb 10 15:17:03 2018 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/maven/cli/MavenCli.java | 9 +++++----
.../src/main/java/org/slf4j/impl/MavenSimpleLogger.java | 11 ++++++-----
pom.xml | 2 +-
3 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/24b8820f/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 77ef134..fa224d0 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
@@ -576,10 +576,11 @@ public class MavenCli
{
MessageBuilder buff = MessageUtils.buffer();
buff.a( "Message styles: " );
- buff.debug( "debug" ).a( ' ' );
- buff.info( "info" ).a( ' ' );
- buff.warning( "warning" ).a( ' ' );
- buff.error( "error" ).a( ' ' );
+ buff.a( MessageUtils.level().debug( "debug" ) ).a( ' ' );
+ buff.a( MessageUtils.level().info( "info" ) ).a( ' ' );
+ buff.a( MessageUtils.level().warning( "warning" ) ).a( ' ' );
+ buff.a( MessageUtils.level().error( "error" ) ).a( ' ' );
+
buff.success( "success" ).a( ' ' );
buff.failure( "failure" ).a( ' ' );
buff.strong( "strong" ).a( ' ' );
http://git-wip-us.apache.org/repos/asf/maven/blob/24b8820f/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
----------------------------------------------------------------------
diff --git a/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java b/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
index 3c1ca4f..9366687 100644
--- a/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
+++ b/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
@@ -19,6 +19,7 @@ package org.slf4j.impl;
* under the License.
*/
+import static org.apache.maven.shared.utils.logging.MessageUtils.level;
import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
import java.io.PrintStream;
@@ -42,16 +43,16 @@ public class MavenSimpleLogger
switch ( level )
{
case LOG_LEVEL_TRACE:
- return buffer().debug( "TRACE" ).toString();
+ return level().debug( "TRACE" ).toString();
case LOG_LEVEL_DEBUG:
- return buffer().debug( "DEBUG" ).toString();
+ return level().debug( "DEBUG" ).toString();
case LOG_LEVEL_INFO:
- return buffer().info( "INFO" ).toString();
+ return level().info( "INFO" ).toString();
case LOG_LEVEL_WARN:
- return buffer().warning( "WARNING" ).toString();
+ return level().warning( "WARNING" ).toString();
case LOG_LEVEL_ERROR:
default:
- return buffer().error( "ERROR" ).toString();
+ return level().error( "ERROR" ).toString();
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/24b8820f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 66b9d27..618a215 100644
--- a/pom.xml
+++ b/pom.xml
@@ -287,7 +287,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>3.1.0</version>
+ <version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.fusesource.jansi</groupId>
[4/8] maven git commit: Reduce number of global checkstyle rule
violations
Posted by kh...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 9765c73..d4c64f0 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,6 +28,10 @@ import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.repository.Proxy;
+/**
+ * Abstraction of an artifact repository. Artifact repositories can be remote, local, or even build reactor or
+ * IDE workspace.
+ */
//TODO completely separate local and remote artifact repositories
public class MavenArtifactRepository
implements ArtifactRepository
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
index 35626e5..0caeeb5 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
@@ -25,6 +25,9 @@ import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
+/**
+ * RepositoryMetadataManager
+ */
public interface RepositoryMetadataManager
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 cd824c4..a156871 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
@@ -32,6 +32,9 @@ import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
+/**
+ * ResolutionNode
+ */
public class ResolutionNode
{
private Artifact artifact;
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
index 9331710..84ad93c 100644
--- a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
+++ b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
@@ -76,13 +76,13 @@ public class MavenRepositorySystem
// DefaultProjectBuilder
public Artifact createArtifact( String groupId, String artifactId, String version, String scope, String type )
{
- return XcreateArtifact( groupId, artifactId, version, scope, type );
+ return createArtifactX( groupId, artifactId, version, scope, type );
}
// DefaultProjectBuilder
public Artifact createProjectArtifact( String groupId, String artifactId, String metaVersionId )
{
- return XcreateProjectArtifact( groupId, artifactId, metaVersionId );
+ return createProjectArtifactX( groupId, artifactId, metaVersionId );
}
// DefaultProjectBuilder
@@ -104,7 +104,7 @@ public class MavenRepositorySystem
}
Artifact artifact =
- XcreateDependencyArtifact( d.getGroupId(), d.getArtifactId(), versionRange, d.getType(),
+ createDependencyArtifactX( d.getGroupId(), d.getArtifactId(), versionRange, d.getType(),
d.getClassifier(), d.getScope(), d.isOptional() );
if ( Artifact.SCOPE_SYSTEM.equals( d.getScope() ) && d.getSystemPath() != null )
@@ -140,13 +140,13 @@ public class MavenRepositorySystem
return null;
}
- return XcreateExtensionArtifact( groupId, artifactId, versionRange );
+ return createExtensionArtifactX( groupId, artifactId, versionRange );
}
// DefaultProjectBuilder
public Artifact createParentArtifact( String groupId, String artifactId, String version )
{
- return XcreateParentArtifact( groupId, artifactId, version );
+ return createParentArtifactX( groupId, artifactId, version );
}
// DefaultProjectBuilder
@@ -167,7 +167,7 @@ public class MavenRepositorySystem
return null;
}
- return XcreatePluginArtifact( plugin.getGroupId(), plugin.getArtifactId(), versionRange );
+ return createPluginArtifactX( plugin.getGroupId(), plugin.getArtifactId(), versionRange );
}
public void injectMirror( List<ArtifactRepository> repositories, List<Mirror> mirrors )
@@ -471,43 +471,43 @@ public class MavenRepositorySystem
}
// ArtifactFactory
- private Artifact XcreateArtifact( String groupId, String artifactId, String version, String scope, String type )
+ private Artifact createArtifactX( String groupId, String artifactId, String version, String scope, String type )
{
- return XcreateArtifact( groupId, artifactId, version, scope, type, null, null );
+ return createArtifactX( groupId, artifactId, version, scope, type, null, null );
}
- private Artifact XcreateDependencyArtifact( String groupId, String artifactId, VersionRange versionRange,
- String type, String classifier, String scope, boolean optional )
+ private Artifact createDependencyArtifactX( String groupId, String artifactId, VersionRange versionRange,
+ String type, String classifier, String scope, boolean optional )
{
- return XcreateArtifact( groupId, artifactId, versionRange, type, classifier, scope, null, optional );
+ return createArtifactX( groupId, artifactId, versionRange, type, classifier, scope, null, optional );
}
- private Artifact XcreateProjectArtifact( String groupId, String artifactId, String version )
+ private Artifact createProjectArtifactX( String groupId, String artifactId, String version )
{
- return XcreateProjectArtifact( groupId, artifactId, version, null );
+ return createProjectArtifactX( groupId, artifactId, version, null );
}
- private Artifact XcreateParentArtifact( String groupId, String artifactId, String version )
+ private Artifact createParentArtifactX( String groupId, String artifactId, String version )
{
- return XcreateProjectArtifact( groupId, artifactId, version );
+ return createProjectArtifactX( groupId, artifactId, version );
}
- private Artifact XcreatePluginArtifact( String groupId, String artifactId, VersionRange versionRange )
+ private Artifact createPluginArtifactX( String groupId, String artifactId, VersionRange versionRange )
{
- return XcreateArtifact( groupId, artifactId, versionRange, "maven-plugin", null, Artifact.SCOPE_RUNTIME, null );
+ return createArtifactX( groupId, artifactId, versionRange, "maven-plugin", null, Artifact.SCOPE_RUNTIME, null );
}
- private Artifact XcreateProjectArtifact( String groupId, String artifactId, String version, String scope )
+ private Artifact createProjectArtifactX( String groupId, String artifactId, String version, String scope )
{
- return XcreateArtifact( groupId, artifactId, version, scope, "pom" );
+ return createArtifactX( groupId, artifactId, version, scope, "pom" );
}
- private Artifact XcreateExtensionArtifact( String groupId, String artifactId, VersionRange versionRange )
+ private Artifact createExtensionArtifactX( String groupId, String artifactId, VersionRange versionRange )
{
- return XcreateArtifact( groupId, artifactId, versionRange, "jar", null, Artifact.SCOPE_RUNTIME, null );
+ return createArtifactX( groupId, artifactId, versionRange, "jar", null, Artifact.SCOPE_RUNTIME, null );
}
- private Artifact XcreateArtifact( String groupId, String artifactId, String version, String scope, String type,
+ private Artifact createArtifactX( String groupId, String artifactId, String version, String scope, String type,
String classifier, String inheritedScope )
{
VersionRange versionRange = null;
@@ -515,16 +515,17 @@ public class MavenRepositorySystem
{
versionRange = VersionRange.createFromVersion( version );
}
- return XcreateArtifact( groupId, artifactId, versionRange, type, classifier, scope, inheritedScope );
+ return createArtifactX( groupId, artifactId, versionRange, type, classifier, scope, inheritedScope );
}
- private Artifact XcreateArtifact( String groupId, String artifactId, VersionRange versionRange, String type,
+ private Artifact createArtifactX( String groupId, String artifactId, VersionRange versionRange, String type,
String classifier, String scope, String inheritedScope )
{
- return XcreateArtifact( groupId, artifactId, versionRange, type, classifier, scope, inheritedScope, false );
+ return createArtifactX( groupId, artifactId, versionRange, type, classifier, scope, inheritedScope, false );
}
- private Artifact XcreateArtifact( String groupId, String artifactId, VersionRange versionRange, String type,
+ @SuppressWarnings( "checkstyle:parameternumber" )
+ private Artifact createArtifactX( String groupId, String artifactId, VersionRange versionRange, String type,
String classifier, String scope, String inheritedScope, boolean optional )
{
String desiredScope = Artifact.SCOPE_RUNTIME;
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java b/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java
index 353d4f6..3a51305 100644
--- a/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java
+++ b/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java
@@ -31,7 +31,9 @@ import java.util.Map;
*/
public interface EventSpy
{
-
+ /**
+ * Context
+ */
interface Context
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
index 5b802ed..2a86667 100644
--- a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
+++ b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
@@ -83,6 +83,9 @@ Plugins:
// PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
// CycleDetectedInPluginGraphException;
+/**
+ * Transform an exception into useful end-user message.
+ */
@Component( role = ExceptionHandler.class )
public class DefaultExceptionHandler
implements ExceptionHandler
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
index ba5630e..ec9419c 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
@@ -49,6 +49,9 @@ import org.apache.maven.toolchain.model.PersistedToolchains;
import org.apache.maven.toolchain.model.ToolchainModel;
import org.codehaus.plexus.util.StringUtils;
+/**
+ * Assists in populating an execution request for invocation of Maven.
+ */
@Named
public class DefaultMavenExecutionRequestPopulator
implements MavenExecutionRequestPopulator
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
index d69bbba..5b56df3 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
@@ -322,6 +322,7 @@ public class MavenSession
}
@Deprecated
+ @SuppressWarnings( "checkstyle:parameternumber" )
public MavenSession( PlexusContainer container, Settings settings, ArtifactRepository localRepository,
EventDispatcher eventDispatcher, ReactorManager unused, List<String> goals,
String executionRootDir, Properties executionProperties, Date startTime )
@@ -331,6 +332,7 @@ public class MavenSession
}
@Deprecated
+ @SuppressWarnings( "checkstyle:parameternumber" )
public MavenSession( PlexusContainer container, Settings settings, ArtifactRepository localRepository,
EventDispatcher eventDispatcher, ReactorManager unused, List<String> goals,
String executionRootDir, Properties executionProperties, Properties userProperties,
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java b/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
index 1280837..6fa5619 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
@@ -31,6 +31,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+/**
+ * ReactorManager - unused
+ */
@Deprecated
public class ReactorManager
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java
index e5b6c16..168a87f 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java
@@ -36,6 +36,9 @@ import com.google.inject.Provider;
import com.google.inject.Scope;
import com.google.inject.util.Providers;
+/**
+ * MojoExecutionScope
+ */
public class MojoExecutionScope
implements Scope, MojoExecutionListener
{
@@ -49,9 +52,9 @@ public class MojoExecutionScope
private static final class ScopeState
{
- public final Map<Key<?>, Provider<?>> seeded = Maps.newHashMap();
+ private final Map<Key<?>, Provider<?>> seeded = Maps.newHashMap();
- public final Map<Key<?>, Object> provided = Maps.newHashMap();
+ private final Map<Key<?>, Object> provided = Maps.newHashMap();
}
private final ThreadLocal<LinkedList<ScopeState>> values = new ThreadLocal<>();
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeCoreModule.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeCoreModule.java b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeCoreModule.java
index 8208c3c..79a18bd 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeCoreModule.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeCoreModule.java
@@ -24,6 +24,9 @@ import javax.inject.Named;
import org.apache.maven.execution.MojoExecutionListener;
+/**
+ * MojoExecutionScopeCoreModule
+ */
@Named
public class MojoExecutionScopeCoreModule
extends MojoExecutionScopeModule
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java
index 229a3c5..b62b590 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java
@@ -27,6 +27,9 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
import com.google.inject.AbstractModule;
+/**
+ * MojoExecutionScopeModule
+ */
public class MojoExecutionScopeModule
extends AbstractModule
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java
index e7e4534..3e6f9f7 100644
--- a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java
+++ b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java
@@ -26,6 +26,9 @@ import javax.inject.Singleton;
import org.codehaus.plexus.PlexusContainer;
import org.eclipse.sisu.Nullable;
+/**
+ * CoreExportsProvider
+ */
@Named
@Singleton
public class CoreExportsProvider
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java
index ce740a9..ffac1d3 100644
--- a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java
+++ b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java
@@ -78,7 +78,7 @@ public class CoreExtensionEntry
return packages;
}
- private static final ExtensionDescriptorBuilder builder = new ExtensionDescriptorBuilder();
+ private static final ExtensionDescriptorBuilder BUILDER = new ExtensionDescriptorBuilder();
public static CoreExtensionEntry discoverFrom( ClassRealm loader )
{
@@ -87,13 +87,13 @@ public class CoreExtensionEntry
try
{
- Enumeration<URL> urls = loader.getResources( builder.getExtensionDescriptorLocation() );
+ Enumeration<URL> urls = loader.getResources( BUILDER.getExtensionDescriptorLocation() );
while ( urls.hasMoreElements() )
{
try ( InputStream is = urls.nextElement().openStream() )
{
- ExtensionDescriptor descriptor = builder.build( is );
+ ExtensionDescriptor descriptor = BUILDER.build( is );
artifacts.addAll( descriptor.getExportedArtifacts() );
packages.addAll( descriptor.getExportedPackages() );
}
@@ -116,7 +116,7 @@ public class CoreExtensionEntry
{
for ( File entry : classpath )
{
- ExtensionDescriptor descriptor = builder.build( entry );
+ ExtensionDescriptor descriptor = BUILDER.build( entry );
if ( descriptor != null )
{
artifacts.addAll( descriptor.getExportedArtifacts() );
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
index 2cbea84..701e7c5 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
@@ -55,6 +55,9 @@ import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.dag.CycleDetectedException;
+/**
+ * Builds the {@link ProjectDependencyGraph inter-dependencies graph} between projects in the reactor.
+ */
@Component( role = GraphBuilder.class, hint = GraphBuilder.HINT )
public class DefaultGraphBuilder
implements GraphBuilder
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 e7b1a7f..aecf264 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
@@ -42,6 +42,9 @@ import org.apache.maven.plugin.descriptor.MojoDescriptor;
// from the plugin archive.
//TODO this will be the class that people get in IDEs to modify
+/**
+ * MavenExecutionPlan
+ */
public class MavenExecutionPlan
implements Iterable<ExecutionPlanItem>
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
index c2bf919..1ddee05 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
@@ -42,6 +42,11 @@ import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
+/**
+ * Lifecycle mapping delegate component interface. Calculates project build execution plan given {@link Lifecycle} and
+ * lifecycle phase. Standard lifecycles use plugin execution {@code <phase>} or mojo default lifecycle phase to
+ * calculate the execution plan, but custom lifecycles can use alternative mapping strategies.
+ */
@Component( role = LifecycleMappingDelegate.class, hint = DefaultLifecycleMappingDelegate.HINT )
public class DefaultLifecycleMappingDelegate
implements LifecycleMappingDelegate
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultProjectArtifactFactory.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultProjectArtifactFactory.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultProjectArtifactFactory.java
index 762fc72..a64da04 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultProjectArtifactFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultProjectArtifactFactory.java
@@ -30,6 +30,9 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.project.artifact.MavenMetadataSource;
+/**
+ * Default component responsible for creation of MavenProject#dependencyArtifacts instances.
+ */
@SuppressWarnings( "deprecation" )
@Named
public class DefaultProjectArtifactFactory
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
index dfc65a8..e755aa9 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
@@ -138,7 +138,7 @@ public class LifecycleDependencyResolver
if ( recordArtifacts != null )
{
- resolvedArtifacts = recordArtifacts.artifacts;
+ resolvedArtifacts = recordArtifacts.getArtifacts();
}
else
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderNotFoundException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderNotFoundException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderNotFoundException.java
index 52c668f..250d65d 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderNotFoundException.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderNotFoundException.java
@@ -19,6 +19,9 @@ package org.apache.maven.lifecycle.internal.builder;
* under the License.
*/
+/**
+ * BuilderNotFoundException
+ */
public class BuilderNotFoundException
extends Exception
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java
index 587a847..1732896 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java
@@ -71,7 +71,7 @@ public class ThreadOutputMuxer
class ConsolePrinter
implements Runnable
{
- public volatile boolean running;
+ private volatile boolean running;
private final ProjectBuildList projectBuildList;
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/singlethreaded/SingleThreadedBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/singlethreaded/SingleThreadedBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/singlethreaded/SingleThreadedBuilder.java
index 464944f..f205b03 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/singlethreaded/SingleThreadedBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/singlethreaded/SingleThreadedBuilder.java
@@ -32,6 +32,11 @@ import org.apache.maven.lifecycle.internal.builder.Builder;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
+/**
+ * <p>
+ * A {@link Builder} encapsulates a strategy for building a set of Maven projects. The default strategy in Maven builds
+ * the the projects serially, but a {@link Builder} can employ any type of concurrency model to build the projects.
+ */
@Component( role = Builder.class, hint = "singlethreaded" )
public class SingleThreadedBuilder
implements Builder
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
index e6845a3..e12debe 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
@@ -23,6 +23,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+/**
+ * DefaultLifecycleMapping
+ */
public class DefaultLifecycleMapping
implements LifecycleMapping
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java
index e656cc9..55d5544 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java
@@ -22,6 +22,9 @@ package org.apache.maven.lifecycle.mapping;
import java.util.List;
import java.util.Map;
+/**
+ * LifecycleMapping
+ */
public interface LifecycleMapping
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java
index f2af879..cd9a5b1 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java
@@ -24,6 +24,9 @@ import java.util.List;
import org.apache.maven.model.Dependency;
import org.codehaus.plexus.util.xml.Xpp3Dom;
+/**
+ * LifecycleMojo
+ */
public class LifecycleMojo
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
index 295e642..bf052c7 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
@@ -27,6 +27,9 @@ import java.util.Map;
import org.codehaus.plexus.util.StringUtils;
+/**
+ * LifecyclePhase
+ */
public class LifecyclePhase
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
index 1401e30..90cf8da 100644
--- a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
+++ b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
@@ -79,6 +79,9 @@ public class DefaultLifecycleBindingsInjector
}
}
+ /**
+ * The domain-specific model merger for the Maven POM
+ */
protected static class LifecycleBindingsMerger
extends MavenModelMerger
{
@@ -98,6 +101,7 @@ public class DefaultLifecycleBindingsInjector
mergePluginContainer_Plugins( target.getBuild(), source.getBuild(), false, context );
}
+ @SuppressWarnings( { "checkstyle:methodname" } )
@Override
protected void mergePluginContainer_Plugins( PluginContainer target, PluginContainer source,
boolean sourceDominant, Map<Object, Object> context )
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 b4f7a4d..1a00742 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
@@ -40,6 +40,9 @@ 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
+/**
+ * DefaultBuildPluginManager
+ */
@Component( role = BuildPluginManager.class )
public class DefaultBuildPluginManager
implements BuildPluginManager
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
index abb4782..4391f87 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
@@ -41,7 +41,9 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Disposable;
public class DefaultExtensionRealmCache
implements ExtensionRealmCache, Disposable
{
-
+ /**
+ * CacheKey
+ */
protected static class CacheKey
implements Key
{
@@ -142,7 +144,7 @@ public class DefaultExtensionRealmCache
{
for ( CacheRecord record : cache.values() )
{
- ClassRealm realm = record.realm;
+ ClassRealm realm = record.getRealm();
try
{
realm.getWorld().disposeRealm( realm.getId() );
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java
index b49e25e..c625f37 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java
@@ -46,7 +46,9 @@ import org.eclipse.aether.repository.WorkspaceRepository;
public class DefaultPluginArtifactsCache
implements PluginArtifactsCache
{
-
+ /**
+ * CacheKey
+ */
protected static class CacheKey
implements Key
{
@@ -139,9 +141,9 @@ public class DefaultPluginArtifactsCache
{
CacheRecord cacheRecord = cache.get( key );
- if ( cacheRecord != null && cacheRecord.exception != null )
+ if ( cacheRecord != null && cacheRecord.getException() != null )
{
- throw cacheRecord.exception;
+ throw cacheRecord.getException();
}
return cacheRecord;
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
index 1c09d9b..b82a2b5 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
@@ -48,7 +48,9 @@ import org.eclipse.aether.repository.WorkspaceRepository;
public class DefaultPluginRealmCache
implements PluginRealmCache, Disposable
{
-
+ /**
+ * CacheKey
+ */
protected static class CacheKey
implements Key
{
@@ -176,7 +178,7 @@ public class DefaultPluginRealmCache
{
for ( CacheRecord record : cache.values() )
{
- ClassRealm realm = record.realm;
+ ClassRealm realm = record.getRealm();
try
{
realm.getWorld().disposeRealm( realm.getId() );
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
index ffae815..4d01aca 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
@@ -44,14 +44,17 @@ public interface ExtensionRealmCache
// marker interface for cache keys
}
+ /**
+ * CacheRecord
+ */
class CacheRecord
{
- public final ClassRealm realm;
+ private final ClassRealm realm;
- public final ExtensionDescriptor descriptor;
+ private final ExtensionDescriptor descriptor;
- public final List<Artifact> artifacts;
+ private final List<Artifact> artifacts;
CacheRecord( ClassRealm realm, ExtensionDescriptor descriptor, List<Artifact> artifacts )
{
@@ -60,6 +63,20 @@ public interface ExtensionRealmCache
this.artifacts = artifacts;
}
+ public ClassRealm getRealm()
+ {
+ return realm;
+ }
+
+ public ExtensionDescriptor getDescriptor()
+ {
+ return descriptor;
+ }
+
+ public List<Artifact> getArtifacts()
+ {
+ return artifacts;
+ }
}
Key createKey( List<Artifact> extensionArtifacts );
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java b/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java
index 223ccd8..3a2e476 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java
@@ -21,6 +21,9 @@ package org.apache.maven.plugin;
import java.util.List;
+/**
+ * InvalidPluginDescriptorException
+ */
public class InvalidPluginDescriptorException
extends Exception
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
index 14cc7e1..ec4c511 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
@@ -25,6 +25,9 @@ import java.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
+/**
+ * MavenPluginValidator
+ */
public class MavenPluginValidator
{
private final Artifact pluginArtifact;
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java b/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
index 71ece87..fa72c18 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
@@ -27,6 +27,9 @@ import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.codehaus.plexus.util.xml.Xpp3Dom;
+/**
+ * MojoExecution
+ */
public class MojoExecution
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
index e24b733..11f5d70 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
@@ -47,14 +47,27 @@ public interface PluginArtifactsCache
// marker interface for cache keys
}
+ /**
+ * CacheRecord
+ */
class CacheRecord
{
- public final List<Artifact> artifacts;
+ private final List<Artifact> artifacts;
+
+ public List<Artifact> getArtifacts()
+ {
+ return artifacts;
+ }
+
+ public PluginResolutionException getException()
+ {
+ return exception;
+ }
- public final PluginResolutionException exception;
+ private final PluginResolutionException exception;
- CacheRecord( List<Artifact> artifacts )
+ public CacheRecord( List<Artifact> artifacts )
{
this.artifacts = artifacts;
this.exception = null;
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java
index 602d2cb..a99fbbc 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java
@@ -23,6 +23,9 @@ import org.apache.maven.project.DuplicateArtifactAttachmentException;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.StringUtils;
+/**
+ * Exception in the plugin manager.
+ */
public class PluginExecutionException
extends PluginManagerException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
index 5f431e0..eaf02ec 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
@@ -29,6 +29,9 @@ import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
import org.codehaus.plexus.util.StringUtils;
+/**
+ * PluginParameterException
+ */
public class PluginParameterException
extends PluginConfigurationException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 e701ec1..9d3b290 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
@@ -144,6 +144,7 @@ public class PluginParameterExpressionEvaluator
}
@Override
+ @SuppressWarnings( "checkstyle:methodlength" )
public Object evaluate( String expr, Class<?> type )
throws ExpressionEvaluationException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
index b2c3172..78c3ae6 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
@@ -40,14 +40,26 @@ import org.eclipse.aether.repository.RemoteRepository;
*/
public interface PluginRealmCache
{
-
+ /**
+ * CacheRecord
+ */
class CacheRecord
{
- public final ClassRealm realm;
+ public ClassRealm getRealm()
+ {
+ return realm;
+ }
+
+ public List<Artifact> getArtifacts()
+ {
+ return artifacts;
+ }
+
+ private final ClassRealm realm;
- public final List<Artifact> artifacts;
+ private final List<Artifact> artifacts;
- CacheRecord( ClassRealm realm, List<Artifact> artifacts )
+ public CacheRecord( ClassRealm realm, List<Artifact> artifacts )
{
this.realm = realm;
this.artifacts = artifacts;
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 612684b..34b3b17 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
@@ -339,8 +339,8 @@ public class DefaultMavenPluginManager
throw new IllegalStateException( e );
}
- ClassRealm pluginRealm = extensionRecord.realm;
- List<Artifact> pluginArtifacts = extensionRecord.artifacts;
+ ClassRealm pluginRealm = extensionRecord.getRealm();
+ List<Artifact> pluginArtifacts = extensionRecord.getArtifacts();
for ( ComponentDescriptor<?> componentDescriptor : pluginDescriptor.getComponents() )
{
@@ -362,11 +362,11 @@ public class DefaultMavenPluginManager
if ( cacheRecord != null )
{
- pluginDescriptor.setClassRealm( cacheRecord.realm );
- pluginDescriptor.setArtifacts( new ArrayList<>( cacheRecord.artifacts ) );
+ pluginDescriptor.setClassRealm( cacheRecord.getRealm() );
+ pluginDescriptor.setArtifacts( new ArrayList<>( cacheRecord.getArtifacts() ) );
for ( ComponentDescriptor<?> componentDescriptor : pluginDescriptor.getComponents() )
{
- componentDescriptor.setRealm( cacheRecord.realm );
+ componentDescriptor.setRealm( cacheRecord.getRealm() );
}
}
else
@@ -832,7 +832,7 @@ public class DefaultMavenPluginManager
}
if ( recordArtifacts != null )
{
- artifacts = recordArtifacts.artifacts;
+ artifacts = recordArtifacts.getArtifacts();
}
else
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java
index 3287021..6612913 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java
@@ -24,6 +24,9 @@ import java.util.List;
import org.eclipse.aether.repository.LocalRepository;
import org.eclipse.aether.repository.RemoteRepository;
+/**
+ * NoPluginFoundForPrefixException
+ */
public class NoPluginFoundForPrefixException
extends Exception
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java
index b5539be..13b1fb9 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java
@@ -19,6 +19,9 @@ package org.apache.maven.plugin.version;
* under the License.
*/
+/**
+ * PluginVersionNotFoundException
+ */
public class PluginVersionNotFoundException
extends Exception
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
index 84ec096..dd14b30 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
@@ -24,6 +24,9 @@ import java.util.List;
import org.eclipse.aether.repository.LocalRepository;
import org.eclipse.aether.repository.RemoteRepository;
+/**
+ * PluginVersionResolutionException
+ */
public class PluginVersionResolutionException
extends Exception
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
index 2cce9f6..1972242 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
@@ -31,6 +31,9 @@ import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
+/**
+ * DefaultMavenProjectHelper
+ */
@SuppressWarnings( "deprecation" )
@Component( role = MavenProjectHelper.class )
public class DefaultMavenProjectHelper
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java b/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
index 7fd2eca..91a875b 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
@@ -99,8 +99,8 @@ public class DefaultModelBuildingListener
ProjectRealmCache.CacheRecord record =
projectBuildingHelper.createProjectRealm( project, model, projectBuildingRequest );
- project.setClassRealm( record.realm );
- project.setExtensionDependencyFilter( record.extensionArtifactFilter );
+ project.setClassRealm( record.getRealm() );
+ project.setExtensionDependencyFilter( record.getExtensionArtifactFilter() );
}
catch ( PluginResolutionException | PluginManagerException | PluginVersionResolutionException e )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index ac38f5d..279399a 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -74,6 +74,7 @@ import org.eclipse.aether.resolution.ArtifactRequest;
import org.eclipse.aether.resolution.ArtifactResult;
/**
+ * DefaultProjectBuilder
*/
@Component( role = ProjectBuilder.class )
public class DefaultProjectBuilder
@@ -385,6 +386,7 @@ public class DefaultProjectBuilder
return results;
}
+ @SuppressWarnings( "checkstyle:parameternumber" )
private boolean build( List<ProjectBuildingResult> results, List<InterimResult> interimResults,
Map<String, MavenProject> projectIndex, List<File> pomFiles, Set<File> aggregatorFiles,
boolean isRoot, boolean recursive, InternalConfig config )
@@ -406,6 +408,7 @@ public class DefaultProjectBuilder
return noErrors;
}
+ @SuppressWarnings( "checkstyle:parameternumber" )
private boolean build( List<ProjectBuildingResult> results, List<InterimResult> interimResults,
Map<String, MavenProject> projectIndex, File pomFile, Set<File> aggregatorFiles,
boolean isRoot, boolean recursive, InternalConfig config )
@@ -606,6 +609,7 @@ public class DefaultProjectBuilder
return noErrors;
}
+ @SuppressWarnings( "checkstyle:methodlength" )
private void initProject( MavenProject project, Map<String, MavenProject> projects, ModelBuildingResult result,
Map<File, Boolean> profilesXmls, ProjectBuildingRequest projectBuildingRequest )
{
@@ -791,10 +795,9 @@ public class DefaultProjectBuilder
Map<String, Artifact> map = null;
if ( repositorySystem != null )
{
- List<Dependency> deps;
DependencyManagement dependencyManagement = project.getDependencyManagement();
- if ( ( dependencyManagement != null ) && ( ( deps = dependencyManagement.getDependencies() ) != null )
- && ( deps.size() > 0 ) )
+ if ( ( dependencyManagement != null ) && ( ( dependencyManagement.getDependencies() ) != null )
+ && ( dependencyManagement.getDependencies().size() > 0 ) )
{
map = new HashMap<>();
for ( Dependency d : dependencyManagement.getDependencies() )
@@ -924,18 +927,21 @@ public class DefaultProjectBuilder
return null;
}
+ /**
+ * InternalConfig
+ */
class InternalConfig
{
- public final ProjectBuildingRequest request;
+ private final ProjectBuildingRequest request;
- public final RepositorySystemSession session;
+ private final RepositorySystemSession session;
- public final List<RemoteRepository> repositories;
+ private final List<RemoteRepository> repositories;
- public final ReactorModelPool modelPool;
-
- public final ReactorModelCache modelCache;
+ private final ReactorModelPool modelPool;
+
+ private final ReactorModelCache modelCache;
InternalConfig( ProjectBuildingRequest request, ReactorModelPool modelPool, ReactorModelCache modelCache )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
index d0e3f6b..3159fac 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
@@ -196,9 +196,9 @@ public class DefaultProjectBuildingHelper
ExtensionRealmCache.CacheRecord recordRealm =
pluginManager.setupExtensionsRealm( project, plugin, request.getRepositorySession() );
- final ClassRealm extensionRealm = recordRealm.realm;
- final ExtensionDescriptor extensionDescriptor = recordRealm.descriptor;
- final List<Artifact> artifacts = recordRealm.artifacts;
+ final ClassRealm extensionRealm = recordRealm.getRealm();
+ final ExtensionDescriptor extensionDescriptor = recordRealm.getDescriptor();
+ final List<Artifact> artifacts = recordRealm.getArtifacts();
extensionRealms.add( extensionRealm );
if ( extensionDescriptor != null )
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
index dafbefd..0451a30 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
@@ -31,6 +31,9 @@ import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.properties.internal.SystemProperties;
import org.eclipse.aether.RepositorySystemSession;
+/**
+ * DefaultProjectBuildingRequest
+ */
public class DefaultProjectBuildingRequest
implements ProjectBuildingRequest
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
index 9d66eb0..a14e624 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
@@ -38,7 +38,9 @@ import org.eclipse.aether.graph.DependencyFilter;
public class DefaultProjectRealmCache
implements ProjectRealmCache, Disposable
{
-
+ /**
+ * CacheKey
+ */
protected static class CacheKey
implements Key
{
@@ -118,7 +120,7 @@ public class DefaultProjectRealmCache
{
for ( CacheRecord record : cache.values() )
{
- ClassRealm realm = record.realm;
+ ClassRealm realm = record.getRealm();
try
{
realm.getWorld().disposeRealm( realm.getId() );
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java b/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java
index 5e42ee4..8080f6e 100644
--- a/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java
+++ b/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java
@@ -23,6 +23,9 @@ import java.io.File;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+/**
+ * InvalidProjectVersionException
+ */
public class InvalidProjectVersionException
extends ProjectBuildingException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
index d0e4afe..80523ae 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
@@ -27,6 +27,9 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Profile;
import org.eclipse.aether.RepositorySystemSession;
+/**
+ * ProjectBuildingRequest
+ */
public interface ProjectBuildingRequest
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java b/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
index 3400f96..28ac0d6 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
@@ -43,12 +43,25 @@ public interface ProjectRealmCache
// marker interface for cache keys
}
+ /**
+ * CacheRecord
+ */
class CacheRecord
{
- public final ClassRealm realm;
+ public ClassRealm getRealm()
+ {
+ return realm;
+ }
+
+ public DependencyFilter getExtensionArtifactFilter()
+ {
+ return extensionArtifactFilter;
+ }
+
+ private final ClassRealm realm;
- public final DependencyFilter extensionArtifactFilter;
+ private final DependencyFilter extensionArtifactFilter;
CacheRecord( ClassRealm realm, DependencyFilter extensionArtifactFilter )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 1ca35d8..22a466f 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
@@ -38,6 +38,9 @@ import org.codehaus.plexus.util.dag.DAG;
import org.codehaus.plexus.util.dag.TopologicalSorter;
import org.codehaus.plexus.util.dag.Vertex;
+/**
+ * ProjectSorter
+ */
public class ProjectSorter
{
private DAG dag;
@@ -165,7 +168,7 @@ public class ProjectSorter
this.sortedProjects = Collections.unmodifiableList( sortedProjects );
}
-
+ @SuppressWarnings( "checkstyle:parameternumber" )
private void addEdge( Map<String, MavenProject> projectMap, Map<String, Map<String, Vertex>> vertexMap,
MavenProject project, Vertex projectVertex, String groupId, String artifactId,
String version, boolean force, boolean safe )
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
index 6b6d2bb..64b30dd 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
@@ -96,7 +96,7 @@ class ReactorModelPool
@Override
public String toString()
{
- StringBuilder buffer = new StringBuilder( 96 );
+ StringBuilder buffer = new StringBuilder( 128 );
buffer.append( groupId ).append( ':' ).append( artifactId ).append( ':' ).append( version );
return buffer.toString();
}
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/artifact/ArtifactWithDependencies.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ArtifactWithDependencies.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ArtifactWithDependencies.java
index cb06b70..a83cae6 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/ArtifactWithDependencies.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/ArtifactWithDependencies.java
@@ -23,6 +23,9 @@ import java.util.List;
import org.apache.maven.model.Dependency;
+/**
+ * ArtifactWithDependencies
+ */
public interface ArtifactWithDependencies
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java
index f52b540..056c052 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java
@@ -36,6 +36,9 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.codehaus.plexus.component.annotations.Component;
+/**
+ * DefaultMavenMetadataCache
+ */
@Component( role = MavenMetadataCache.class )
public class DefaultMavenMetadataCache
implements MavenMetadataCache
@@ -43,6 +46,9 @@ public class DefaultMavenMetadataCache
protected final Map<CacheKey, CacheRecord> cache = new ConcurrentHashMap<>();
+ /**
+ * CacheKey
+ */
public static class CacheKey
{
private final Artifact artifact;
@@ -198,6 +204,9 @@ public class DefaultMavenMetadataCache
return s1 != null ? s1.equals( s2 ) : s2 == null;
}
+ /**
+ * CacheRecord
+ */
public class CacheRecord
{
private Artifact pomArtifact;
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
index 87d2e44..3d9d32d 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
@@ -49,7 +49,9 @@ import org.eclipse.aether.repository.WorkspaceRepository;
public class DefaultProjectArtifactsCache
implements ProjectArtifactsCache
{
-
+ /**
+ * CacheKey
+ */
protected static class CacheKey
implements Key
{
@@ -186,9 +188,9 @@ public class DefaultProjectArtifactsCache
{
CacheRecord cacheRecord = cache.get( key );
- if ( cacheRecord != null && cacheRecord.exception != null )
+ if ( cacheRecord != null && cacheRecord.getException() != null )
{
- throw cacheRecord.exception;
+ throw cacheRecord.getException();
}
return cacheRecord;
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java
index 036ee86..033e42a 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java
@@ -25,6 +25,9 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.metadata.ResolutionGroup;
+/**
+ * MavenMetadataCache
+ */
public interface MavenMetadataCache
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 42bbe45..2dc9372 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
@@ -534,7 +534,7 @@ public class MavenMetadataSource
return projectBuilder;
}
-
+ @SuppressWarnings( "checkstyle:methodlength" )
private ProjectRelocation retrieveRelocatedProject( Artifact artifact, MetadataResolutionRequest repositoryRequest )
throws ArtifactMetadataRetrievalException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java b/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java
index d348d59..3b4e2ef 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java
@@ -28,6 +28,9 @@ import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
+/**
+ * PluginArtifact
+ */
public class PluginArtifact
extends DefaultArtifact
implements ArtifactWithDependencies
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java
index 924523f..8556a6a 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java
@@ -28,6 +28,9 @@ import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.project.MavenProject;
+/**
+ * ProjectArtifact
+ */
public class ProjectArtifact
extends DefaultArtifact
implements ArtifactWithDependencies
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
index cfec1d9..8d8ad79 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
@@ -46,12 +46,25 @@ public interface ProjectArtifactsCache
// marker interface for cache keys
}
+ /**
+ * CacheRecord
+ */
class CacheRecord
{
- public final Set<Artifact> artifacts;
+ public Set<Artifact> getArtifacts()
+ {
+ return artifacts;
+ }
+
+ private final Set<Artifact> artifacts;
+
+ public LifecycleExecutionException getException()
+ {
+ return exception;
+ }
- public final LifecycleExecutionException exception;
+ private final LifecycleExecutionException exception;
CacheRecord( Set<Artifact> artifacts )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/repository/ArtifactDoesNotExistException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/repository/ArtifactDoesNotExistException.java b/maven-core/src/main/java/org/apache/maven/repository/ArtifactDoesNotExistException.java
index 296f4ea..3e72387 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/ArtifactDoesNotExistException.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/ArtifactDoesNotExistException.java
@@ -19,6 +19,9 @@ package org.apache.maven.repository;
* under the License.
*/
+/**
+ * ArtifactDoesNotExistException
+ */
public class ArtifactDoesNotExistException
extends Exception
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferFailedException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferFailedException.java b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferFailedException.java
index 9315f4c..f35de65 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferFailedException.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferFailedException.java
@@ -19,6 +19,9 @@ package org.apache.maven.repository;
* under the License.
*/
+/**
+ * ArtifactTransferFailedException
+ */
public class ArtifactTransferFailedException
extends Exception
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferListener.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferListener.java b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferListener.java
index 72a56cf..c6d2446 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferListener.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferListener.java
@@ -19,6 +19,9 @@ package org.apache.maven.repository;
* under the License.
*/
+/**
+ * ArtifactTransferListener
+ */
public interface ArtifactTransferListener
{
boolean isShowChecksumEvents();
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java b/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
index e33789e..6f1c934 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
@@ -22,6 +22,9 @@ package org.apache.maven.repository;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.MavenArtifactRepository;
+/**
+ * LocalArtifactRepository
+ */
public abstract class LocalArtifactRepository
extends MavenArtifactRepository
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java b/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java
index fcc0f77..30b4925 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java
@@ -44,10 +44,13 @@ public interface RepositorySystem
{
String DEFAULT_LOCAL_REPO_ID = "local";
+ @SuppressWarnings( "checkstyle:constantname" )
String userHome = System.getProperty( "user.home" );
+ @SuppressWarnings( "checkstyle:constantname" )
File userMavenConfigurationHome = new File( userHome, ".m2" );
+ @SuppressWarnings( "checkstyle:constantname" )
File defaultUserLocalRepository = new File( userMavenConfigurationHome, "repository" );
String DEFAULT_REMOTE_REPO_ID = "central";
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java
index e942f70..ae1019a 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java
@@ -26,6 +26,9 @@ import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
+/**
+ * ResolutionGroup
+ */
public class ResolutionGroup
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
index 7ca63ab..e57a19c 100644
--- a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
+++ b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
@@ -20,17 +20,20 @@ package org.apache.maven.session.scope.internal;
*/
import java.util.Collections;
+import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
import com.google.inject.Key;
import com.google.inject.OutOfScopeException;
import com.google.inject.Provider;
import com.google.inject.Scope;
import com.google.inject.util.Providers;
+/**
+ * SessionScope
+ */
public class SessionScope
implements Scope
{
@@ -55,11 +58,14 @@ public class SessionScope
}
};
+ /**
+ * ScopeState
+ */
private static final class ScopeState
{
- public final Map<Key<?>, Provider<?>> seeded = Maps.newHashMap();
+ private final Map<Key<?>, Provider<?>> seeded = new HashMap<>();
- public final Map<Key<?>, Object> provided = Maps.newHashMap();
+ private final Map<Key<?>, Object> provided = new HashMap<>();
}
private final ThreadLocal<LinkedList<ScopeState>> values = new ThreadLocal<>();
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java
index 585d683..cd88104 100644
--- a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java
+++ b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java
@@ -29,6 +29,9 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
import com.google.inject.AbstractModule;
+/**
+ * SessionScopeModule
+ */
@Named
public class SessionScopeModule
extends AbstractModule
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java b/maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java
index ca910d8..41ccf58 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java
@@ -71,13 +71,13 @@ public class MavenToolchainMerger
}
else
{
- mergeToolchainModel_Configuration( dominantModel, recessiveModel );
+ mergeToolchainModelConfiguration( dominantModel, recessiveModel );
}
}
}
- protected void mergeToolchainModel_Configuration( ToolchainModel target,
- ToolchainModel source )
+ protected void mergeToolchainModelConfiguration( ToolchainModel target,
+ ToolchainModel source )
{
Xpp3Dom src = (Xpp3Dom) source.getConfiguration();
if ( src != null )
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java b/maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
index c919cdf..a685bc1 100644
--- a/maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
+++ b/maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
@@ -43,7 +43,7 @@ public class LegacyLocalRepositoryManager
private final LocalRepository repository;
- public LegacyLocalRepositoryManager( File basedir )
+ LegacyLocalRepositoryManager( File basedir )
{
this.repository = new LocalRepository( basedir.getAbsoluteFile(), "legacy" );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 03ef00c..8b2d9b7 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
@@ -22,6 +22,9 @@ package org.apache.maven.cli;
import java.util.ArrayList;
import java.util.List;
+/**
+ * CleanArgument
+ */
public class CleanArgument
{
public static String[] cleanArgs( String[] args )
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-embedder/src/main/java/org/apache/maven/cli/CliRequest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CliRequest.java b/maven-embedder/src/main/java/org/apache/maven/cli/CliRequest.java
index 4656dd3..34937e8 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CliRequest.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CliRequest.java
@@ -27,6 +27,9 @@ import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequest;
import org.codehaus.plexus.classworlds.ClassWorld;
+/**
+ * CliRequest
+ */
public class CliRequest
{
String[] args;
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 77ef134..4fac2ad 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
@@ -1268,6 +1268,7 @@ public class MavenCli
return populateRequest( cliRequest, cliRequest.request );
}
+ @SuppressWarnings( "checkstyle:methodlength" )
private MavenExecutionRequest populateRequest( CliRequest cliRequest, MavenExecutionRequest request )
{
CommandLine commandLine = cliRequest.commandLine;
@@ -1681,8 +1682,7 @@ public class MavenCli
static class ExitException
extends Exception
{
- @SuppressWarnings( "checkstyle:visibilitymodifier" )
- public int exitCode;
+ int exitCode;
ExitException( int exitCode )
{
[3/8] maven git commit: Reduce number of global checkstyle rule
violations
Posted by kh...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-embedder/src/main/java/org/apache/maven/cli/configuration/ConfigurationProcessor.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/configuration/ConfigurationProcessor.java b/maven-embedder/src/main/java/org/apache/maven/cli/configuration/ConfigurationProcessor.java
index 75fb9b9..50a5854 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/configuration/ConfigurationProcessor.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/configuration/ConfigurationProcessor.java
@@ -21,6 +21,9 @@ package org.apache.maven.cli.configuration;
import org.apache.maven.cli.CliRequest;
+/**
+ * ConfigurationProcessor
+ */
public interface ConfigurationProcessor
{
void process( CliRequest request )
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java b/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
index d9a6954..2536a22 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
@@ -47,6 +47,9 @@ import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.slf4j.Logger;
+/**
+ * SettingsXmlConfigurationProcessor
+ */
@Component( role = ConfigurationProcessor.class, hint = SettingsXmlConfigurationProcessor.HINT )
public class SettingsXmlConfigurationProcessor
implements ConfigurationProcessor
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java
index f62b57e..55b1155 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java
@@ -24,6 +24,9 @@ import java.util.Map;
import org.apache.maven.eventspy.EventSpy;
+/**
+ * DefaultEventSpyContext
+ */
public class DefaultEventSpyContext
implements EventSpy.Context
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java
index 2a7d3e3..9fada05 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java
@@ -49,6 +49,9 @@ import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.util.filter.ExclusionsDependencyFilter;
import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator;
+/**
+ * BootstrapCoreExtensionManager
+ */
@Named
public class BootstrapCoreExtensionManager
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
index f64f330..8dc81c7 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
@@ -28,6 +28,9 @@ package org.apache.maven.cli.logging;
*/
public interface Slf4jConfiguration
{
+ /**
+ * Level
+ */
enum Level
{
DEBUG, INFO, ERROR
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
index c33e8a2..984902e 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
@@ -30,6 +30,9 @@ import org.eclipse.aether.transfer.TransferCancelledException;
import org.eclipse.aether.transfer.TransferEvent;
import org.eclipse.aether.transfer.TransferResource;
+/**
+ * AbstractMavenTransferListener
+ */
public abstract class AbstractMavenTransferListener
extends AbstractTransferListener
{
@@ -153,6 +156,7 @@ public abstract class AbstractMavenTransferListener
return format( size, unit, false );
}
+ @SuppressWarnings( "checkstyle:magicnumber" )
public String format( long size, ScaleUnit unit, boolean omitSymbol )
{
Validate.isTrue( size >= 0L, "file size cannot be negative: %s", size );
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java
index 0e20f17..2eee8f6 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java
@@ -21,6 +21,9 @@ package org.apache.maven.cli.transfer;
import java.io.PrintStream;
+/**
+ * BatchModeMavenTransferListener
+ */
public class BatchModeMavenTransferListener
extends AbstractMavenTransferListener
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
index 5c97acb..086e406 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
@@ -29,6 +29,9 @@ import org.eclipse.aether.transfer.TransferResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * Slf4jMavenTransferListener
+ */
public class Slf4jMavenTransferListener
extends AbstractTransferListener
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 c3dd043..44ee334 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
@@ -239,6 +239,7 @@ public class DefaultModelBuilder
return this;
}
+ @SuppressWarnings( "checkstyle:methodlength" )
@Override
public ModelBuildingResult build( ModelBuildingRequest request )
throws ModelBuildingException
@@ -1131,6 +1132,7 @@ public class DefaultModelBuilder
return superPomProvider.getSuperModel( "4.0.0" ).clone();
}
+ @SuppressWarnings( "checkstyle:methodlength" )
private void importDependencyManagement( Model model, ModelBuildingRequest request,
DefaultModelProblemCollector problems, Collection<String> importIds )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
index 78e81e3..e1b05aa 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
@@ -82,6 +82,7 @@ public class DefaultModelProblem
* @param exception The exception that caused this problem, may be {@code null}.
*/
//mkleint: does this need to be public?
+ @SuppressWarnings( "checkstyle:parameternumber" )
public DefaultModelProblem( String message, Severity severity, Version version, String source, int lineNumber,
int columnNumber, String modelId, Exception exception )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java
index a4d5fa9..6f4f084 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java
@@ -31,6 +31,9 @@ import org.apache.maven.model.locator.ModelLocator;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
+/**
+ * DefaultModelProcessor
+ */
@Component( role = ModelProcessor.class )
public class DefaultModelProcessor
implements ModelProcessor
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java
index b21dd0d..1f39ad4 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java
@@ -206,7 +206,7 @@ class ModelData
*/
public String getId()
{
- StringBuilder buffer = new StringBuilder( 96 );
+ StringBuilder buffer = new StringBuilder( 128 );
buffer.append( getGroupId() ).append( ':' ).append( getArtifactId() ).append( ':' ).append( getVersion() );
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java
index 43272ba..2c7a72e 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java
@@ -41,6 +41,9 @@ public interface ModelProblem
}
+ /**
+ * Version
+ */
enum Version
{
//based on ModeBuildingResult.validationLevel
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java
index 76c23e1..1b694c4 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java
@@ -44,7 +44,7 @@ public class ModelProblemUtils
return "";
}
- StringBuilder buffer = new StringBuilder( 192 );
+ StringBuilder buffer = new StringBuilder( 128 );
buffer.append( toId( model ) );
@@ -108,7 +108,7 @@ public class ModelProblemUtils
*/
static String toId( String groupId, String artifactId, String version )
{
- StringBuilder buffer = new StringBuilder( 96 );
+ StringBuilder buffer = new StringBuilder( 128 );
buffer.append( ( groupId != null && groupId.length() > 0 ) ? groupId : "[unknown-group-id]" );
buffer.append( ':' );
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProcessor.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProcessor.java
index ca34845..c2c2ec0 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProcessor.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProcessor.java
@@ -22,6 +22,9 @@ package org.apache.maven.model.building;
import org.apache.maven.model.io.ModelReader;
import org.apache.maven.model.locator.ModelLocator;
+/**
+ * ModelProcessor
+ */
@SuppressWarnings( "checkstyle:interfaceistype" )
public interface ModelProcessor
extends ModelLocator, ModelReader
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
index 51150db..890c845 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
@@ -44,6 +44,7 @@ import org.codehaus.plexus.util.StringUtils;
*
* @author Benjamin Bentmann
*/
+@SuppressWarnings( { "checkstyle:methodname" } )
@Component( role = InheritanceAssembler.class )
public class DefaultInheritanceAssembler
implements InheritanceAssembler
@@ -135,6 +136,9 @@ public class DefaultInheritanceAssembler
return adjustment;
}
+ /**
+ * InheritanceModelMerger
+ */
protected static class InheritanceModelMerger
extends MavenModelMerger
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java
index 9b0500d..fcec526 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java
@@ -25,6 +25,9 @@ import java.util.GregorianCalendar;
import java.util.Properties;
import java.util.TimeZone;
+/**
+ * MavenBuildTimestamp
+ */
public class MavenBuildTimestamp
{
// ISO 8601-compliant timestamp for machine readability
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 1d8ad04..c95cacb 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
@@ -44,6 +44,9 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+/**
+ * StringSearchModelInterpolator
+ */
@Component( role = ModelInterpolator.class )
public class StringSearchModelInterpolator
extends AbstractStringBasedModelInterpolator
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
index e611973..4547407 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
@@ -38,6 +38,7 @@ import org.codehaus.plexus.component.annotations.Component;
*
* @author Benjamin Bentmann
*/
+@SuppressWarnings( { "checkstyle:methodname" } )
@Component( role = DependencyManagementInjector.class )
public class DefaultDependencyManagementInjector
implements DependencyManagementInjector
@@ -51,6 +52,9 @@ public class DefaultDependencyManagementInjector
merger.mergeManagedDependencies( model );
}
+ /**
+ * ManagementModelMerger
+ */
protected static class ManagementModelMerger
extends MavenModelMerger
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java
index 4a50cfe..9d4dc19 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java
@@ -41,6 +41,7 @@ import org.codehaus.plexus.component.annotations.Component;
*
* @author Benjamin Bentmann
*/
+@SuppressWarnings( { "checkstyle:methodname" } )
@Component( role = PluginManagementInjector.class )
public class DefaultPluginManagementInjector
implements PluginManagementInjector
@@ -54,6 +55,9 @@ public class DefaultPluginManagementInjector
merger.mergeManagedBuildPlugins( model );
}
+ /**
+ * ManagementModelMerger
+ */
protected static class ManagementModelMerger
extends MavenModelMerger
{
@@ -66,12 +70,12 @@ public class DefaultPluginManagementInjector
PluginManagement pluginManagement = build.getPluginManagement();
if ( pluginManagement != null )
{
- mergePluginContainer_Plugins( build, pluginManagement );
+ mergePluginContainerPlugins( build, pluginManagement );
}
}
}
- private void mergePluginContainer_Plugins( PluginContainer target, PluginContainer source )
+ private void mergePluginContainerPlugins( PluginContainer target, PluginContainer source )
{
List<Plugin> src = source.getPlugins();
if ( !src.isEmpty() )
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 e96425d..8e90454 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
@@ -53,6 +53,7 @@ import org.apache.maven.model.Site;
*
* @author Benjamin Bentmann
*/
+@SuppressWarnings( { "checkstyle:methodname" } )
public class MavenModelMerger
extends ModelMerger
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
index 2803b0a..d625bb5 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
@@ -94,6 +94,9 @@ public class DefaultModelNormalizer
}
}
+ /**
+ * DuplicateMerger
+ */
protected static class DuplicateMerger
extends MavenModelMerger
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java
index aed837b..32a2fc0 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java
@@ -47,6 +47,7 @@ import org.codehaus.plexus.component.annotations.Component;
* @author Benjamin Bentmann
*/
@Component( role = ProfileInjector.class )
+@SuppressWarnings( { "checkstyle:methodname" } )
public class DefaultProfileInjector
implements ProfileInjector
{
@@ -72,6 +73,9 @@ public class DefaultProfileInjector
}
}
+ /**
+ * ProfileModelMerger
+ */
protected static class ProfileModelMerger
extends MavenModelMerger
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-model-builder/src/main/java/org/apache/maven/model/resolution/WorkspaceModelResolver.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/WorkspaceModelResolver.java b/maven-model-builder/src/main/java/org/apache/maven/model/resolution/WorkspaceModelResolver.java
index d12edea..8264ed7 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/WorkspaceModelResolver.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/resolution/WorkspaceModelResolver.java
@@ -21,6 +21,9 @@ package org.apache.maven.model.resolution;
import org.apache.maven.model.Model;
+/**
+ * WorkspaceModelResolver
+ */
public interface WorkspaceModelResolver
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 f0acb1f..4018618 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
@@ -979,6 +979,7 @@ public class DefaultModelValidator
return false;
}
+ @SuppressWarnings( "checkstyle:parameternumber" )
private boolean validateEnum( String fieldName, ModelProblemCollector problems, Severity severity, Version version,
String string, String sourceHint, InputLocationTracker tracker,
String... validValues )
@@ -1001,6 +1002,7 @@ public class DefaultModelValidator
return false;
}
+ @SuppressWarnings( "checkstyle:parameternumber" )
private boolean validateBannedCharacters( String fieldName, ModelProblemCollector problems, Severity severity,
Version version, String string, String sourceHint,
InputLocationTracker tracker, String banned )
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoNotFoundException.java
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoNotFoundException.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoNotFoundException.java
index cdb9a23..cd97fb7 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoNotFoundException.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoNotFoundException.java
@@ -25,6 +25,9 @@ import java.util.List;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
+/**
+ * MojoNotFoundException
+ */
public class MojoNotFoundException
extends Exception
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateMojoDescriptorException.java
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateMojoDescriptorException.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateMojoDescriptorException.java
index b236c8c..59e0d5d 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateMojoDescriptorException.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateMojoDescriptorException.java
@@ -19,6 +19,9 @@ package org.apache.maven.plugin.descriptor;
* under the License.
*/
+/**
+ * DuplicateMojoDescriptorException
+ */
public class DuplicateMojoDescriptorException
extends InvalidPluginDescriptorException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateParameterException.java
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateParameterException.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateParameterException.java
index 4cad9b7..69fea1c 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateParameterException.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateParameterException.java
@@ -19,6 +19,9 @@ package org.apache.maven.plugin.descriptor;
* under the License.
*/
+/**
+ * DuplicateParameterException
+ */
public class DuplicateParameterException
extends InvalidPluginDescriptorException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/InvalidPluginDescriptorException.java
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/InvalidPluginDescriptorException.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/InvalidPluginDescriptorException.java
index 4b8e739..f63fd26 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/InvalidPluginDescriptorException.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/InvalidPluginDescriptorException.java
@@ -21,6 +21,9 @@ package org.apache.maven.plugin.descriptor;
import org.codehaus.plexus.configuration.PlexusConfigurationException;
+/**
+ * InvalidPluginDescriptorException
+ */
public class InvalidPluginDescriptorException
extends PlexusConfigurationException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 865e66b..3df7ab4 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
@@ -114,6 +114,7 @@ public class PluginDescriptorBuilder
return pluginDescriptor;
}
+ @SuppressWarnings( "checkstyle:methodlength" )
public MojoDescriptor buildComponentDescriptor( PlexusConfiguration c, PluginDescriptor pluginDescriptor )
throws PlexusConfigurationException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
index c087bdf..ef7f0cf 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
@@ -150,6 +150,7 @@ public class DefaultVersionResolver
return this;
}
+ @SuppressWarnings( "checkstyle:methodlength" )
public VersionResult resolveVersion( RepositorySystemSession session, VersionRequest request )
throws VersionResolutionException
{
@@ -482,7 +483,7 @@ public class DefaultVersionResolver
this.repository = repository;
}
- public boolean isOutdated( String timestamp )
+ boolean isOutdated( String timestamp )
{
return timestamp != null && timestamp.compareTo( this.timestamp ) > 0;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenResolverModule.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenResolverModule.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenResolverModule.java
index 070b91c..1e49bfc 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenResolverModule.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenResolverModule.java
@@ -35,6 +35,9 @@ import org.eclipse.aether.impl.VersionRangeResolver;
import org.eclipse.aether.impl.VersionResolver;
import org.eclipse.aether.impl.guice.AetherModule;
+/**
+ * MavenResolverModule
+ */
public final class MavenResolverModule
extends AbstractModule
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenWorkspaceReader.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenWorkspaceReader.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenWorkspaceReader.java
index 270cf58..c87f723 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenWorkspaceReader.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenWorkspaceReader.java
@@ -23,6 +23,9 @@ import org.apache.maven.model.Model;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.repository.WorkspaceReader;
+/**
+ * MavenWorkspaceReader
+ */
public interface MavenWorkspaceReader
extends WorkspaceReader
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLoggerFactory.java
----------------------------------------------------------------------
diff --git a/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLoggerFactory.java b/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLoggerFactory.java
index d56e346..4adfdbe 100644
--- a/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLoggerFactory.java
+++ b/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLoggerFactory.java
@@ -21,6 +21,9 @@ package org.slf4j.impl;
import org.slf4j.Logger;
+/**
+ * MavenSimpleLoggerFactory
+ */
public class MavenSimpleLoggerFactory
extends SimpleLoggerFactory
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 66b9d27..b912b67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@ under the License.
<distributionShortName>Maven</distributionShortName>
<distributionName>Apache Maven</distributionName>
<maven.site.path>ref/3-LATEST</maven.site.path>
- <checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,JavadocType,MagicNumber,InnerAssignment,MethodName</checkstyle.violation.ignore>
+ <checkstyle.violation.ignore>None</checkstyle.violation.ignore>
<checkstyle.excludes>**/package-info.java</checkstyle.excludes>
</properties>
[7/8] maven git commit: Merge remote-tracking branch
'remotes/origin/MNG-6353'
Posted by kh...@apache.org.
Merge remote-tracking branch 'remotes/origin/MNG-6353'
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/cd34b08d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/cd34b08d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/cd34b08d
Branch: refs/heads/MNG-6352-print-version
Commit: cd34b08df1f378b44fae3d8020aa1fda8089dc79
Parents: b8c06e6 22f782a
Author: rfscholte <rf...@apache.org>
Authored: Sun Feb 11 18:29:43 2018 +0100
Committer: rfscholte <rf...@apache.org>
Committed: Sun Feb 11 18:29:43 2018 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/maven/cli/MavenCli.java | 10 ++++++----
.../src/main/java/org/slf4j/impl/MavenSimpleLogger.java | 11 ++++++-----
pom.xml | 2 +-
3 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/cd34b08d/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/cd34b08d/pom.xml
----------------------------------------------------------------------
[8/8] maven git commit: [MNG-6352] - Printout version information at
the end of the build
Posted by kh...@apache.org.
[MNG-6352] - Printout version information at the end of the build
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d9c49f13
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d9c49f13
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d9c49f13
Branch: refs/heads/MNG-6352-print-version
Commit: d9c49f13a34472421f3cb1257ec5a8546ca5638f
Parents: cd34b08
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Thu Feb 8 20:47:25 2018 +0100
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Wed Feb 14 21:23:56 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/maven/cli/event/ExecutionEventLogger.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/d9c49f13/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
index d4171f7..22a6291 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
@@ -138,6 +138,7 @@ public class ExecutionEventLogger
logStats( event.getSession() );
infoLine( '-' );
+
}
}
@@ -157,6 +158,8 @@ public class ExecutionEventLogger
buffer.append( project.getName() );
buffer.append( ' ' );
+ buffer.append( project.getVersion() );
+ buffer.append( ' ' );
if ( buffer.length() <= MAX_PROJECT_NAME_LENGTH )
{
[5/8] maven git commit: Reduce number of global checkstyle rule
violations
Posted by kh...@apache.org.
Reduce number of global checkstyle rule violations
Fix code for following checkstyle rules:
ConstantName, FileLength, InnerAssignment, JavadocType, MagicNumber, MethodLength, MethodName, NewlineAtEndOfFile, ParameterNumber, RedundantThrows, VisibilityModifier
Fixes #149
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d9250817
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d9250817
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d9250817
Branch: refs/heads/MNG-6352-print-version
Commit: d92508179410897404bcc7e826bb0877be2d08b8
Parents: 40cf506
Author: Sylwester Lachiewicz <sl...@gmail.com>
Authored: Thu Feb 1 22:57:39 2018 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sun Feb 11 11:41:16 2018 +0100
----------------------------------------------------------------------
.../apache/maven/artifact/ArtifactUtils.java | 3 ++
.../apache/maven/artifact/DefaultArtifact.java | 1 +
.../artifact/metadata/ArtifactMetadata.java | 3 ++
.../repository/ArtifactRepositoryPolicy.java | 1 +
.../artifact/repository/Authentication.java | 3 ++
.../layout/ArtifactRepositoryLayout2.java | 3 ++
.../artifact/versioning/ComparableVersion.java | 13 +++--
.../java/org/apache/maven/repository/Proxy.java | 3 ++
maven-compat/pom.xml | 4 --
.../artifact/deployer/ArtifactDeployer.java | 3 ++
.../deployer/DefaultArtifactDeployer.java | 3 ++
.../artifact/manager/DefaultWagonManager.java | 3 ++
.../repository/layout/FlatRepositoryLayout.java | 3 ++
.../repository/metadata/MetadataBridge.java | 2 +-
.../artifact/resolver/ArtifactCollector.java | 4 ++
.../artifact/resolver/ArtifactResolver.java | 1 +
.../resolver/DefaultArtifactCollector.java | 4 ++
.../resolver/DefaultArtifactResolver.java | 11 ++--
.../filter/InversionArtifactFilter.java | 3 ++
.../artifact/versioning/ManagedVersionMap.java | 3 ++
.../profiles/DefaultMavenProfilesBuilder.java | 3 ++
.../maven/profiles/DefaultProfileManager.java | 3 ++
.../apache/maven/profiles/ProfileManager.java | 3 ++
.../maven/profiles/ProfilesConversionUtils.java | 3 ++
.../activation/DetectedProfileActivator.java | 3 ++
.../activation/FileProfileActivator.java | 3 ++
.../activation/JdkPrefixProfileActivator.java | 3 ++
.../OperatingSystemProfileActivator.java | 3 ++
.../activation/ProfileActivationException.java | 3 ++
.../profiles/activation/ProfileActivator.java | 3 ++
.../SystemPropertyProfileActivator.java | 3 ++
.../DefaultProjectBuilderConfiguration.java | 3 ++
.../project/InvalidProjectModelException.java | 3 ++
.../MissingRepositoryElementException.java | 4 +-
.../org/apache/maven/project/ProjectUtils.java | 3 ++
.../DefaultModelInheritanceAssembler.java | 3 ++
.../StringSearchModelInterpolator.java | 7 ++-
.../project/path/DefaultPathTranslator.java | 3 ++
.../validation/DefaultModelValidator.java | 2 +-
.../maven/repository/DefaultMirrorSelector.java | 3 ++
.../repository/MetadataResolutionResult.java | 5 +-
.../repository/UserLocalArtifactRepository.java | 3 ++
.../legacy/DefaultUpdateCheckManager.java | 3 ++
.../repository/legacy/DefaultWagonManager.java | 5 ++
.../legacy/LegacyRepositorySystem.java | 2 +-
.../maven/repository/legacy/MavenArtifact.java | 2 +-
.../legacy/TransferListenerAdapter.java | 3 ++
.../repository/legacy/UpdateCheckManager.java | 3 ++
.../legacy/WagonConfigurationException.java | 4 +-
.../maven/repository/legacy/WagonManager.java | 3 ++
.../DefaultLegacyArtifactCollector.java | 4 ++
.../resolver/LegacyArtifactCollector.java | 1 +
.../ArtifactTransformationManager.java | 4 +-
.../transform/LatestArtifactTransformation.java | 3 ++
.../repository/metadata/ArtifactMetadata.java | 21 +++-----
.../repository/metadata/MetadataGraphEdge.java | 1 +
.../metadata/MetadataResolutionException.java | 3 ++
.../MetadataResolutionRequestTypeEnum.java | 3 ++
.../ExpressionDocumentationException.java | 3 ++
.../usability/plugin/ExpressionDocumenter.java | 3 ++
maven-core/pom.xml | 4 --
.../org/apache/maven/ArtifactFilterManager.java | 3 ++
.../DefaultProjectDependenciesResolver.java | 5 ++
.../src/main/java/org/apache/maven/Maven.java | 1 +
.../apache/maven/MissingModuleException.java | 3 ++
.../maven/ProjectDependenciesResolver.java | 2 +-
.../maven/artifact/factory/ArtifactFactory.java | 4 ++
.../factory/DefaultArtifactFactory.java | 5 ++
.../metadata/AbstractArtifactMetadata.java | 3 ++
.../ArtifactMetadataRetrievalException.java | 3 ++
.../metadata/ArtifactMetadataSource.java | 4 ++
.../artifact/metadata/ResolutionGroup.java | 3 ++
.../repository/MavenArtifactRepository.java | 4 ++
.../metadata/RepositoryMetadataManager.java | 3 ++
.../maven/artifact/resolver/ResolutionNode.java | 3 ++
.../maven/bridge/MavenRepositorySystem.java | 53 ++++++++++----------
.../org/apache/maven/eventspy/EventSpy.java | 4 +-
.../exception/DefaultExceptionHandler.java | 3 ++
.../DefaultMavenExecutionRequestPopulator.java | 3 ++
.../apache/maven/execution/MavenSession.java | 2 +
.../apache/maven/execution/ReactorManager.java | 3 ++
.../scope/internal/MojoExecutionScope.java | 7 ++-
.../internal/MojoExecutionScopeCoreModule.java | 3 ++
.../internal/MojoExecutionScopeModule.java | 3 ++
.../extension/internal/CoreExportsProvider.java | 3 ++
.../extension/internal/CoreExtensionEntry.java | 8 +--
.../apache/maven/graph/DefaultGraphBuilder.java | 3 ++
.../maven/lifecycle/MavenExecutionPlan.java | 3 ++
.../DefaultLifecycleMappingDelegate.java | 5 ++
.../internal/DefaultProjectArtifactFactory.java | 3 ++
.../internal/LifecycleDependencyResolver.java | 2 +-
.../builder/BuilderNotFoundException.java | 3 ++
.../multithreaded/ThreadOutputMuxer.java | 2 +-
.../singlethreaded/SingleThreadedBuilder.java | 5 ++
.../mapping/DefaultLifecycleMapping.java | 3 ++
.../lifecycle/mapping/LifecycleMapping.java | 3 ++
.../maven/lifecycle/mapping/LifecycleMojo.java | 3 ++
.../maven/lifecycle/mapping/LifecyclePhase.java | 3 ++
.../DefaultLifecycleBindingsInjector.java | 4 ++
.../maven/plugin/DefaultBuildPluginManager.java | 3 ++
.../plugin/DefaultExtensionRealmCache.java | 6 ++-
.../plugin/DefaultPluginArtifactsCache.java | 8 +--
.../maven/plugin/DefaultPluginRealmCache.java | 6 ++-
.../maven/plugin/ExtensionRealmCache.java | 23 +++++++--
.../InvalidPluginDescriptorException.java | 3 ++
.../maven/plugin/MavenPluginValidator.java | 3 ++
.../org/apache/maven/plugin/MojoExecution.java | 3 ++
.../maven/plugin/PluginArtifactsCache.java | 19 +++++--
.../maven/plugin/PluginExecutionException.java | 3 ++
.../maven/plugin/PluginParameterException.java | 3 ++
.../PluginParameterExpressionEvaluator.java | 1 +
.../apache/maven/plugin/PluginRealmCache.java | 20 ++++++--
.../internal/DefaultMavenPluginManager.java | 12 ++---
.../prefix/NoPluginFoundForPrefixException.java | 3 ++
.../version/PluginVersionNotFoundException.java | 3 ++
.../PluginVersionResolutionException.java | 3 ++
.../project/DefaultMavenProjectHelper.java | 3 ++
.../project/DefaultModelBuildingListener.java | 4 +-
.../maven/project/DefaultProjectBuilder.java | 24 +++++----
.../project/DefaultProjectBuildingHelper.java | 6 +--
.../project/DefaultProjectBuildingRequest.java | 3 ++
.../maven/project/DefaultProjectRealmCache.java | 6 ++-
.../project/InvalidProjectVersionException.java | 3 ++
.../maven/project/ProjectBuildingRequest.java | 3 ++
.../apache/maven/project/ProjectRealmCache.java | 17 ++++++-
.../org/apache/maven/project/ProjectSorter.java | 5 +-
.../apache/maven/project/ReactorModelPool.java | 2 +-
.../artifact/ArtifactWithDependencies.java | 3 ++
.../artifact/DefaultMavenMetadataCache.java | 9 ++++
.../artifact/DefaultProjectArtifactsCache.java | 8 +--
.../project/artifact/MavenMetadataCache.java | 3 ++
.../project/artifact/MavenMetadataSource.java | 2 +-
.../maven/project/artifact/PluginArtifact.java | 3 ++
.../maven/project/artifact/ProjectArtifact.java | 3 ++
.../project/artifact/ProjectArtifactsCache.java | 17 ++++++-
.../ArtifactDoesNotExistException.java | 3 ++
.../ArtifactTransferFailedException.java | 3 ++
.../repository/ArtifactTransferListener.java | 3 ++
.../repository/LocalArtifactRepository.java | 3 ++
.../maven/repository/RepositorySystem.java | 3 ++
.../legacy/metadata/ResolutionGroup.java | 3 ++
.../session/scope/internal/SessionScope.java | 12 +++--
.../scope/internal/SessionScopeModule.java | 3 ++
.../toolchain/merge/MavenToolchainMerger.java | 6 +--
.../project/LegacyLocalRepositoryManager.java | 2 +-
.../org/apache/maven/cli/CleanArgument.java | 3 ++
.../java/org/apache/maven/cli/CliRequest.java | 3 ++
.../java/org/apache/maven/cli/MavenCli.java | 4 +-
.../configuration/ConfigurationProcessor.java | 3 ++
.../SettingsXmlConfigurationProcessor.java | 3 ++
.../maven/cli/event/DefaultEventSpyContext.java | 3 ++
.../internal/BootstrapCoreExtensionManager.java | 3 ++
.../maven/cli/logging/Slf4jConfiguration.java | 3 ++
.../transfer/AbstractMavenTransferListener.java | 4 ++
.../BatchModeMavenTransferListener.java | 3 ++
.../transfer/Slf4jMavenTransferListener.java | 3 ++
.../model/building/DefaultModelBuilder.java | 2 +
.../model/building/DefaultModelProblem.java | 1 +
.../model/building/DefaultModelProcessor.java | 3 ++
.../apache/maven/model/building/ModelData.java | 2 +-
.../maven/model/building/ModelProblem.java | 3 ++
.../maven/model/building/ModelProblemUtils.java | 4 +-
.../maven/model/building/ModelProcessor.java | 3 ++
.../DefaultInheritanceAssembler.java | 4 ++
.../interpolation/MavenBuildTimestamp.java | 3 ++
.../StringSearchModelInterpolator.java | 3 ++
.../DefaultDependencyManagementInjector.java | 4 ++
.../DefaultPluginManagementInjector.java | 8 ++-
.../maven/model/merge/MavenModelMerger.java | 1 +
.../normalization/DefaultModelNormalizer.java | 3 ++
.../model/profile/DefaultProfileInjector.java | 4 ++
.../resolution/WorkspaceModelResolver.java | 3 ++
.../model/validation/DefaultModelValidator.java | 2 +
.../maven/plugin/MojoNotFoundException.java | 3 ++
.../DuplicateMojoDescriptorException.java | 3 ++
.../descriptor/DuplicateParameterException.java | 3 ++
.../InvalidPluginDescriptorException.java | 3 ++
.../descriptor/PluginDescriptorBuilder.java | 1 +
.../internal/DefaultVersionResolver.java | 3 +-
.../internal/MavenResolverModule.java | 3 ++
.../internal/MavenWorkspaceReader.java | 3 ++
.../slf4j/impl/MavenSimpleLoggerFactory.java | 3 ++
pom.xml | 2 +-
183 files changed, 658 insertions(+), 145 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
index 2c1bddd..cf7d27d 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
@@ -29,6 +29,9 @@ import java.util.regex.Matcher;
import org.apache.commons.lang3.Validate;
import org.apache.maven.artifact.versioning.VersionRange;
+/**
+ * ArtifactUtils
+ */
public final class ArtifactUtils
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
index bd2e8ed..1167e91 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
@@ -94,6 +94,7 @@ public class DefaultArtifact
this( groupId, artifactId, versionRange, scope, type, classifier, artifactHandler, false );
}
+ @SuppressWarnings( "checkstyle:parameternumber" )
public DefaultArtifact( String groupId, String artifactId, VersionRange versionRange, String scope, String type,
String classifier, ArtifactHandler artifactHandler, boolean optional )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java b/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
index 452c9f4..7bf8c61 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
@@ -19,6 +19,9 @@ package org.apache.maven.artifact.metadata;
* under the License.
*/
+/**
+ * Contains metadata about an artifact, and methods to retrieve/store it from an artifact repository.
+ */
@Deprecated
public interface ArtifactMetadata
extends org.apache.maven.repository.legacy.metadata.ArtifactMetadata
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
index c5d2473..5a795e9 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
@@ -198,6 +198,7 @@ public class ArtifactRepositoryPolicy
}
}
+ @SuppressWarnings( "checkstyle:magicnumber" )
private int ordinalOfUpdatePolicy( String policy )
{
if ( ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY.equals( policy ) )
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java
index 323fb25..f02d1c5 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java
@@ -19,6 +19,9 @@ package org.apache.maven.artifact.repository;
* under the License.
*/
+/**
+ * Authentication
+ */
public class Authentication
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout2.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout2.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout2.java
index c0544e5..f6bc573 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout2.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout2.java
@@ -22,6 +22,9 @@ package org.apache.maven.artifact.repository.layout;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+/**
+ * ArtifactRepositoryLayout2
+ */
public interface ArtifactRepositoryLayout2
extends ArtifactRepositoryLayout
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index 8eb9a8f..4c64d2b 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -148,10 +148,8 @@ public class ComparableVersion
private static class StringItem
implements Item
{
- private static final String[] QUALIFIERS = { "alpha", "beta", "milestone", "rc", "snapshot", "", "sp" };
-
- @SuppressWarnings( "checkstyle:constantname" )
- private static final List<String> _QUALIFIERS = Arrays.asList( QUALIFIERS );
+ private static final List<String> QUALIFIERS =
+ Arrays.asList( "alpha", "beta", "milestone", "rc", "snapshot", "", "sp" );
private static final Properties ALIASES = new Properties();
static
@@ -165,7 +163,7 @@ public class ComparableVersion
* A comparable value for the empty-string qualifier. This one is used to determine if a given qualifier makes
* the version older than one without a qualifier, or more recent.
*/
- private static final String RELEASE_VERSION_INDEX = String.valueOf( _QUALIFIERS.indexOf( "" ) );
+ private static final String RELEASE_VERSION_INDEX = String.valueOf( QUALIFIERS.indexOf( "" ) );
private String value;
@@ -216,9 +214,9 @@ public class ComparableVersion
*/
public static String comparableQualifier( String qualifier )
{
- int i = _QUALIFIERS.indexOf( qualifier );
+ int i = QUALIFIERS.indexOf( qualifier );
- return i == -1 ? ( _QUALIFIERS.size() + "-" + qualifier ) : String.valueOf( i );
+ return i == -1 ? ( QUALIFIERS.size() + "-" + qualifier ) : String.valueOf( i );
}
public int compareTo( Item item )
@@ -350,6 +348,7 @@ public class ComparableVersion
parseVersion( version );
}
+ @SuppressWarnings( "checkstyle:innerassignment" )
public final void parseVersion( String version )
{
this.value = version;
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 e42f1ed..960d7be 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
@@ -19,6 +19,9 @@ package org.apache.maven.repository;
* under the License.
*/
+/**
+ * Proxy
+ */
public class Proxy
{
public static final String PROXY_SOCKS5 = "SOCKS_5";
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 7ec94e2..20de667 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -33,10 +33,6 @@ under the License.
<name>Maven Compat</name>
<description>Maven2 classes maintained as compatibility layer.</description>
- <properties>
- <checkstyle.failOnViolation>false</checkstyle.failOnViolation><!-- laziness for code that will disappear in future... -->
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
index 072552c..bf15206 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
@@ -24,6 +24,9 @@ import java.io.File;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
+/**
+ * ArtifactDeployer
+ */
public interface ArtifactDeployer
{
String ROLE = ArtifactDeployer.class.getName();
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
index 1463c5a..87d9c46 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
@@ -47,6 +47,9 @@ import org.eclipse.aether.metadata.MergeableMetadata;
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.util.artifact.SubArtifact;
+/**
+ * DefaultArtifactDeployer
+ */
@Component( role = ArtifactDeployer.class, instantiationStrategy = "per-lookup" )
public class DefaultArtifactDeployer
extends AbstractLogEnabled
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 fe89d1e..5f7957e 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
@@ -42,6 +42,9 @@ import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
+/**
+ * Manages <a href="https://maven.apache.org/wagon">Wagon</a> related operations in Maven.
+ */
@Component( role = WagonManager.class )
public class DefaultWagonManager
extends org.apache.maven.repository.legacy.DefaultWagonManager
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
index 58143e0..4426611 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
@@ -25,6 +25,9 @@ import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.codehaus.plexus.component.annotations.Component;
+/**
+ * FlatRepositoryLayout
+ */
@Component( role = ArtifactRepositoryLayout.class, hint = "flat" )
public class FlatRepositoryLayout
implements ArtifactRepositoryLayout
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
index bf19921..0fd49dd 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
@@ -149,7 +149,7 @@ public final class MetadataBridge
private File metadataFile;
- public MetadataRepository( File metadataFile )
+ MetadataRepository( File metadataFile )
{
super( "local", "", null );
this.metadataFile = metadataFile;
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
index 5ef8602..3526be4 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
@@ -27,6 +27,10 @@ import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+/**
+ * Artifact collector - takes a set of original artifacts and resolves all of the best versions to use
+ * along with their metadata. No artifacts are downloaded.
+ */
@Deprecated
public interface ArtifactCollector
extends org.apache.maven.repository.legacy.resolver.LegacyArtifactCollector
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
index d36ebde..45204f8 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
@@ -79,6 +79,7 @@ public interface ArtifactResolver
throws ArtifactResolutionException, ArtifactNotFoundException;
@Deprecated
+ @SuppressWarnings( "checkstyle:parameternumber" )
ArtifactResolutionResult resolveTransitively(
Set<Artifact> artifacts, Artifact originatingArtifact,
Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
index cefb9e2..25e92c4 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
@@ -21,6 +21,10 @@ package org.apache.maven.artifact.resolver;
import org.codehaus.plexus.component.annotations.Component;
+/**
+ * Artifact collector - takes a set of original artifacts and resolves all of the best versions to use
+ * along with their metadata. No artifacts are downloaded.
+ */
@Deprecated
@Component( role = ArtifactCollector.class )
public class DefaultArtifactCollector
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 915ee72..2d1d8d9 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
@@ -258,7 +258,8 @@ public class DefaultArtifactResolver
throws ArtifactResolutionException,
ArtifactNotFoundException
{
- return resolveTransitively( artifacts, originatingArtifact, Collections.<String, Artifact>emptyMap(), localRepository,
+ return resolveTransitively(
+ artifacts, originatingArtifact, Collections.<String, Artifact>emptyMap(), localRepository,
remoteRepositories, source, filter );
}
@@ -305,10 +306,12 @@ public class DefaultArtifactResolver
throws ArtifactResolutionException,
ArtifactNotFoundException
{
- return resolveTransitively( artifacts, originatingArtifact, Collections.<String, Artifact>emptyMap(), localRepository,
+ return resolveTransitively(
+ artifacts, originatingArtifact, Collections.<String, Artifact>emptyMap(), localRepository,
remoteRepositories, source, null, listeners );
}
+ @SuppressWarnings( "checkstyle:parameternumber" )
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
Map<String, Artifact> managedVersions,
ArtifactRepository localRepository,
@@ -322,6 +325,7 @@ public class DefaultArtifactResolver
remoteRepositories, source, filter, listeners, null );
}
+ @SuppressWarnings( "checkstyle:parameternumber" )
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
Map<String, Artifact> managedVersions,
ArtifactRepository localRepository,
@@ -366,6 +370,7 @@ public class DefaultArtifactResolver
//
// ------------------------------------------------------------------------
+ @SuppressWarnings( "checkstyle:methodlength" )
public ArtifactResolutionResult resolve( ArtifactResolutionRequest request )
{
Artifact rootArtifact = request.getArtifact();
@@ -599,7 +604,7 @@ public class DefaultArtifactResolver
private final ArtifactResolutionResult result;
- public ResolveTask( ClassLoader classLoader, CountDownLatch latch, Artifact artifact,
+ ResolveTask( ClassLoader classLoader, CountDownLatch latch, Artifact artifact,
RepositorySystemSession session, List<ArtifactRepository> remoteRepositories,
ArtifactResolutionResult result )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java
index 0499db5..fa66574 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java
@@ -21,6 +21,9 @@ package org.apache.maven.artifact.resolver.filter;
import org.apache.maven.artifact.Artifact;
+/**
+ * InversionArtifactFilter
+ */
public class InversionArtifactFilter
implements ArtifactFilter
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java b/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
index 02ac24c..c098d7f 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
@@ -25,6 +25,9 @@ import java.util.Map;
import org.apache.maven.artifact.Artifact;
+/**
+ * ManagedVersionMap
+ */
@Deprecated
public class ManagedVersionMap
extends HashMap<String, Artifact>
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
index 98ff3d0..8ee9001 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
@@ -34,6 +34,9 @@ import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
+/**
+ * DefaultMavenProfilesBuilder
+ */
@Deprecated
@Component( role = MavenProfilesBuilder.class )
public class DefaultMavenProfilesBuilder
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
index e3e0cb7..9890622 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
@@ -39,6 +39,9 @@ import java.util.Map;
import java.util.Properties;
import org.apache.maven.model.building.ModelProblemCollectorRequest;
+/**
+ * DefaultProfileManager
+ */
@Deprecated
public class DefaultProfileManager
implements ProfileManager
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java b/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java
index 98064ef..5fab100 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java
@@ -26,6 +26,9 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
+/**
+ * ProfileManager
+ */
@Deprecated
public interface ProfileManager
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java b/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
index 72527b0..154176e 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
@@ -27,6 +27,9 @@ import org.apache.maven.model.Repository;
import java.util.List;
+/**
+ * ProfilesConversionUtils
+ */
@Deprecated
public class ProfilesConversionUtils
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java b/maven-compat/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java
index 5d6a8bf..f034245 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java
@@ -21,6 +21,9 @@ package org.apache.maven.profiles.activation;
import org.apache.maven.model.Profile;
+/**
+ * DetectedProfileActivator
+ */
@Deprecated
public abstract class DetectedProfileActivator
implements ProfileActivator
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java b/maven-compat/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java
index de4ba2e..e7044f5 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java
@@ -33,6 +33,9 @@ import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
+/**
+ * FileProfileActivator
+ */
@Deprecated
public class FileProfileActivator
extends DetectedProfileActivator
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java b/maven-compat/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java
index dfae95f..1c835f8 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java
@@ -26,6 +26,9 @@ import org.apache.maven.model.Activation;
import org.apache.maven.model.Profile;
import org.codehaus.plexus.util.StringUtils;
+/**
+ * JdkPrefixProfileActivator
+ */
@Deprecated
public class JdkPrefixProfileActivator
extends DetectedProfileActivator
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java b/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java
index 7464a30..378c3c9 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java
@@ -24,6 +24,9 @@ import org.apache.maven.model.ActivationOS;
import org.apache.maven.model.Profile;
import org.codehaus.plexus.util.Os;
+/**
+ * OperatingSystemProfileActivator
+ */
@Deprecated
public class OperatingSystemProfileActivator
implements ProfileActivator
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java b/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java
index 7fc372c..59f70be 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java
@@ -19,6 +19,9 @@ package org.apache.maven.profiles.activation;
* under the License.
*/
+/**
+ * ProfileActivationException
+ */
@Deprecated
public class ProfileActivationException
extends Exception
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java b/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java
index 2688785..6482018 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java
@@ -21,6 +21,9 @@ package org.apache.maven.profiles.activation;
import org.apache.maven.model.Profile;
+/**
+ * ProfileActivator
+ */
@Deprecated
public interface ProfileActivator
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java b/maven-compat/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java
index a03267d..d7e4003 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java
@@ -28,6 +28,9 @@ import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.codehaus.plexus.util.StringUtils;
+/**
+ * SystemPropertyProfileActivator
+ */
@Deprecated
public class SystemPropertyProfileActivator
extends DetectedProfileActivator implements Contextualizable
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java b/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
index d08f18e..aca6a03 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
@@ -25,6 +25,9 @@ import java.util.Properties;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.profiles.ProfileManager;
+/**
+ * DefaultProjectBuilderConfiguration
+ */
@Deprecated
public class DefaultProjectBuilderConfiguration
implements ProjectBuilderConfiguration
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/project/InvalidProjectModelException.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/InvalidProjectModelException.java b/maven-compat/src/main/java/org/apache/maven/project/InvalidProjectModelException.java
index cf85aa9..d7241fd 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/InvalidProjectModelException.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/InvalidProjectModelException.java
@@ -23,6 +23,9 @@ import java.io.File;
import org.apache.maven.project.validation.ModelValidationResult;
+/**
+ * InvalidProjectModelException
+ */
@Deprecated
public class InvalidProjectModelException
extends ProjectBuildingException
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/project/MissingRepositoryElementException.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/MissingRepositoryElementException.java b/maven-compat/src/main/java/org/apache/maven/project/MissingRepositoryElementException.java
index 17c267e..75384e1 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/MissingRepositoryElementException.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/MissingRepositoryElementException.java
@@ -20,7 +20,9 @@ package org.apache.maven.project;
*/
import org.apache.maven.artifact.InvalidRepositoryException;
-
+/**
+ * Error constructing an artifact repository.
+ */
public class MissingRepositoryElementException
extends InvalidRepositoryException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java b/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
index 72ea6d1..21a4ac7 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
@@ -37,6 +37,9 @@ import org.eclipse.aether.RepositorySystemSession;
// This class needs to stick around because it was exposed the the remote resources plugin started using it instead of
// getting the repositories from the project.
+/**
+ * ProjectUtils
+ */
@Deprecated
public final class ProjectUtils
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 07e9473..81ea92d 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
@@ -47,6 +47,9 @@ import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
+/**
+ * DefaultModelInheritanceAssembler
+ */
@Component( role = ModelInheritanceAssembler.class )
public class DefaultModelInheritanceAssembler
implements ModelInheritanceAssembler
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
index ecde27f..f137c6e 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
@@ -41,6 +41,9 @@ import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
+/**
+ * StringSearchModelInterpolator
+ */
@Deprecated
@Component( role = ModelInterpolator.class )
public class StringSearchModelInterpolator
@@ -111,7 +114,7 @@ public class StringSearchModelInterpolator
private final List<ValueSource> valueSources;
private final List<InterpolationPostProcessor> postProcessors;
- public InterpolateObjectAction( Object target, List<ValueSource> valueSources,
+ InterpolateObjectAction( Object target, List<ValueSource> valueSources,
List<InterpolationPostProcessor> postProcessors, boolean debugEnabled,
StringSearchModelInterpolator modelInterpolator, Logger logger )
{
@@ -145,7 +148,7 @@ public class StringSearchModelInterpolator
return null;
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings( { "unchecked", "checkstyle:methodlength" } )
private void traverseObjectWithParents( Class<?> cls, Object target )
throws ModelInterpolationException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java b/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
index eb3f24d..79e1f41 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
@@ -29,6 +29,9 @@ import org.apache.maven.model.Reporting;
import org.apache.maven.model.Resource;
import org.codehaus.plexus.component.annotations.Component;
+/**
+ * DefaultPathTranslator
+ */
@Deprecated
@Component( role = PathTranslator.class )
public class DefaultPathTranslator
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java b/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
index 0095f80..6406b58 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
@@ -60,7 +60,7 @@ public class DefaultModelValidator
ModelValidationResult result;
- public SimpleModelProblemCollector( ModelValidationResult result )
+ SimpleModelProblemCollector( ModelValidationResult result )
{
this.result = result;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java b/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
index 53e7bd4..6fa2c55 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
@@ -29,6 +29,9 @@ import org.apache.maven.settings.Mirror;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils;
+/**
+ * DefaultMirrorSelector
+ */
@Component( role = MirrorSelector.class )
public class DefaultMirrorSelector
implements MirrorSelector
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 28fb723..70b9c3f 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
@@ -74,7 +74,7 @@ public class MetadataResolutionResult
return originatingArtifact;
}
- public MetadataResolutionResult ListOriginatingArtifact( final Artifact originatingArtifact )
+ public MetadataResolutionResult listOriginatingArtifact( final Artifact originatingArtifact )
{
this.originatingArtifact = originatingArtifact;
@@ -323,8 +323,9 @@ public class MetadataResolutionResult
public String toString()
{
if ( artifacts == null )
+ {
return "";
-
+ }
StringBuilder sb = new StringBuilder( 256 );
int i = 1;
sb.append( "---------\n" );
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java b/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
index 70d3e0a..a88b009 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
@@ -25,6 +25,9 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
+/**
+ * UserLocalArtifactRepository
+ */
public class UserLocalArtifactRepository
extends LocalArtifactRepository
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
index 4839d68..cd01ec9 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
@@ -39,6 +39,9 @@ import java.nio.channels.FileLock;
import java.util.Date;
import java.util.Properties;
+/**
+ * DefaultUpdateCheckManager
+ */
@Component( role = UpdateCheckManager.class )
public class DefaultUpdateCheckManager
extends AbstractLogEnabled
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 8dd6b36..d8f590b 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
@@ -59,6 +59,10 @@ import org.eclipse.aether.util.ConfigUtils;
//TODO remove the update check manager
//TODO separate into retriever and publisher
//TODO remove hardcoding of checksum logic
+
+/**
+ * Manages <a href="https://maven.apache.org/wagon">Wagon</a> related operations in Maven.
+ */
@Component( role = WagonManager.class )
public class DefaultWagonManager
implements WagonManager
@@ -333,6 +337,7 @@ public class DefaultWagonManager
return proxyInfo;
}
+ @SuppressWarnings( "checkstyle:methodlength" )
@Override
public void getRemoteFile( ArtifactRepository repository, File destination, String remotePath,
TransferListener downloadMonitor, String checksumPolicy, boolean force )
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
index 8d4d407..0acab4f 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
@@ -882,7 +882,7 @@ public class LegacyRepositorySystem
private final ArtifactRepositoryLayout fallback;
- public UnknownRepositoryLayout( String id, ArtifactRepositoryLayout fallback )
+ UnknownRepositoryLayout( String id, ArtifactRepositoryLayout fallback )
{
this.id = id;
this.fallback = fallback;
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/repository/legacy/MavenArtifact.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/MavenArtifact.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/MavenArtifact.java
index 29b9b82..07d2cdb 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/MavenArtifact.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/MavenArtifact.java
@@ -32,7 +32,7 @@ class MavenArtifact
private long transferStartTime;
- public MavenArtifact( String repositoryUrl, Resource resource )
+ MavenArtifact( String repositoryUrl, Resource resource )
{
if ( repositoryUrl == null )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
index 017dd9b..c3bc5e9 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
@@ -30,6 +30,9 @@ import org.apache.maven.wagon.events.TransferListener;
import org.apache.maven.wagon.repository.Repository;
import org.apache.maven.wagon.resource.Resource;
+/**
+ * TransferListenerAdapter
+ */
public class TransferListenerAdapter
implements TransferListener
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java
index f4e969b..0ef8c6a 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java
@@ -25,6 +25,9 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
+/**
+ * UpdateCheckManager
+ */
public interface UpdateCheckManager
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java
index 078de00..5542125 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java
@@ -21,7 +21,9 @@ package org.apache.maven.repository.legacy;
import org.apache.maven.wagon.TransferFailedException;
-
+/**
+ * WagonConfigurationException
+ */
public class WagonConfigurationException
extends TransferFailedException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
index 35fcf42..6156818 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
@@ -32,6 +32,9 @@ import org.apache.maven.wagon.Wagon;
import org.apache.maven.wagon.events.TransferListener;
import org.apache.maven.wagon.repository.Repository;
+/**
+ * WagonManager
+ */
public interface WagonManager
{
@Deprecated
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/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 c3603a6..ffc9e9a 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
@@ -87,6 +87,7 @@ public class DefaultLegacyArtifactCollector
}
}
+ @SuppressWarnings( "checkstyle:parameternumber" )
public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories,
@@ -102,6 +103,7 @@ public class DefaultLegacyArtifactCollector
conflictResolvers );
}
+ @SuppressWarnings( "checkstyle:parameternumber" )
public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
Map<String, Artifact> managedVersions,
ArtifactResolutionRequest repositoryRequest,
@@ -239,6 +241,7 @@ public class DefaultLegacyArtifactCollector
return versionMap;
}
+ @SuppressWarnings( { "checkstyle:parameternumber", "checkstyle:methodlength" } )
private void recurse( ArtifactResolutionResult result, ResolutionNode node,
Map<Object, List<ResolutionNode>> resolvedArtifacts, ManagedVersionMap managedVersions,
ArtifactResolutionRequest request, ArtifactMetadataSource source, ArtifactFilter filter,
@@ -791,6 +794,7 @@ public class DefaultLegacyArtifactCollector
}
}
+ @SuppressWarnings( "checkstyle:parameternumber" )
public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories,
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java
index 4045258..90b869f 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java
@@ -39,6 +39,7 @@ import org.apache.maven.repository.legacy.resolver.conflict.ConflictResolver;
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
@Deprecated
+@SuppressWarnings( "checkstyle:parameternumber" )
public interface LegacyArtifactCollector
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java
index 95f15f9..ed3ee9a 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java
@@ -29,7 +29,9 @@ import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-/** Manages multiple ArtifactTransformation instances and applies them in succession. */
+/**
+ * Manages multiple ArtifactTransformation instances and applies them in succession.
+ */
public interface ArtifactTransformationManager
{
String ROLE = ArtifactTransformationManager.class.getName();
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java
index 7b0e851..0bc89c1 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java
@@ -28,6 +28,9 @@ import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.codehaus.plexus.component.annotations.Component;
+/**
+ * Describes a version transformation during artifact resolution - "latest" type
+ */
@Component( role = ArtifactTransformation.class, hint = "latest" )
public class LatestArtifactTransformation
extends AbstractVersionTransformation
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
index 2666eaf..13b00c3 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
@@ -94,36 +94,34 @@ public class ArtifactMetadata
}
}
- // ------------------------------------------------------------------
public ArtifactMetadata( String groupId, String name, String version )
{
this( groupId, name, version, null );
}
- //------------------------------------------------------------------
+
public ArtifactMetadata( String groupId, String name, String version, String type )
{
this( groupId, name, version, type, null );
}
- //------------------------------------------------------------------
public ArtifactMetadata( String groupId, String name, String version, String type, ArtifactScopeEnum artifactScope )
{
this( groupId, name, version, type, artifactScope, null );
}
- //------------------------------------------------------------------
public ArtifactMetadata( String groupId, String name, String version, String type, ArtifactScopeEnum artifactScope,
String classifier )
{
this( groupId, name, version, type, artifactScope, classifier, null );
}
- //------------------------------------------------------------------
+
public ArtifactMetadata( String groupId, String name, String version, String type, ArtifactScopeEnum artifactScope,
String classifier, String artifactUri )
{
this( groupId, name, version, type, artifactScope, classifier, artifactUri, null, true, null );
}
- //------------------------------------------------------------------
+
+ @SuppressWarnings( "checkstyle:parameternumber" )
public ArtifactMetadata( String groupId, String name, String version, String type, ArtifactScopeEnum artifactScope,
String classifier, String artifactUri, String why, boolean resolved, String error )
{
@@ -138,7 +136,8 @@ public class ArtifactMetadata
this.resolved = resolved;
this.error = error;
}
- //------------------------------------------------------------------
+
+ @SuppressWarnings( "checkstyle:parameternumber" )
public ArtifactMetadata( String groupId, String name, String version, String type, String scopeString,
String classifier, String artifactUri, String why, boolean resolved, String error )
{
@@ -147,7 +146,6 @@ public class ArtifactMetadata
classifier, artifactUri, why, resolved, error );
}
- //------------------------------------------------------------------
public ArtifactMetadata( Artifact af )
{
/*
@@ -171,20 +169,17 @@ public class ArtifactMetadata
// this.resolved = af.isResolved();
// }
- //------------------------------------------------------------------
@Override
public String toString()
{
return groupId + ":" + artifactId + ":" + version;
}
- //------------------------------------------------------------------
public String toDomainString()
{
return groupId + ":" + artifactId;
}
- //------------------------------------------------------------------
public String getGroupId()
{
return groupId;
@@ -327,7 +322,6 @@ public class ArtifactMetadata
this.why = why;
}
- //-------------------------------------------------------------------
public String getError()
{
return error;
@@ -343,11 +337,8 @@ public class ArtifactMetadata
return error == null;
}
- //------------------------------------------------------------------
public String getDependencyConflictId()
{
return groupId + ":" + artifactId;
}
- //------------------------------------------------------------------
- //------------------------------------------------------------------
}
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
index 5a4c106..16fe9bc 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
@@ -81,6 +81,7 @@ public class MetadataGraphEdge
* used to eliminate exact duplicates in the edge list
*/
@Override
+ @SuppressWarnings( "checkstyle:equalshashcode" )
public boolean equals( Object o )
{
if ( o instanceof MetadataGraphEdge )
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java
index 24f832e..149d2ac 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java
@@ -19,6 +19,9 @@ package org.apache.maven.repository.metadata;
* under the License.
*/
+/**
+ * MetadataResolutionException
+ */
public class MetadataResolutionException
extends Exception
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java
index f305497..31e3e91 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java
@@ -19,6 +19,9 @@ package org.apache.maven.repository.metadata;
* under the License.
*/
+/**
+ * MetadataResolutionRequestTypeEnum
+ */
public enum MetadataResolutionRequestTypeEnum
{
tree( 1 )
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumentationException.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumentationException.java b/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumentationException.java
index 050d135..d001562 100644
--- a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumentationException.java
+++ b/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumentationException.java
@@ -19,6 +19,9 @@ package org.apache.maven.usability.plugin;
* under the License.
*/
+/**
+ * ExpressionDocumentationException
+ */
public class ExpressionDocumentationException
extends Exception
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java b/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
index b5e606d..f4e7bf9 100644
--- a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
+++ b/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
@@ -35,6 +35,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+/**
+ * ExpressionDocumenter
+ */
public class ExpressionDocumenter
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 7c2cde1..751fd53 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -33,10 +33,6 @@ under the License.
<name>Maven Core</name>
<description>Maven Core classes.</description>
- <properties>
- <checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,JavadocType,MethodName,MagicNumber,ConstantName,VisibilityModifier,InnerAssignment</checkstyle.violation.ignore>
- </properties>
-
<dependencies>
<!-- Maven -->
<dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java b/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java
index 2cf9f99..e15037e 100644
--- a/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java
+++ b/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java
@@ -23,6 +23,9 @@ import java.util.Set;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+/**
+ * ArtifactFilterManager
+ */
public interface ArtifactFilterManager
{
/**
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
index be7c97a..dca8014 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
@@ -42,6 +42,11 @@ import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
+/**
+ * @deprecated As of 3.2.2, and there is no direct replacement. This is an internal class which was not marked as such,
+ * but should have been.
+ *
+ */
@Deprecated
@Component( role = ProjectDependenciesResolver.class )
public class DefaultProjectDependenciesResolver
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/Maven.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/Maven.java b/maven-core/src/main/java/org/apache/maven/Maven.java
index 69f9fca..665da6c 100644
--- a/maven-core/src/main/java/org/apache/maven/Maven.java
+++ b/maven-core/src/main/java/org/apache/maven/Maven.java
@@ -31,6 +31,7 @@ import org.apache.maven.execution.MavenExecutionResult;
public interface Maven
{
@Deprecated
+ @SuppressWarnings( "checkstyle:constantname" )
String POMv4 = "pom.xml";
MavenExecutionResult execute( MavenExecutionRequest request );
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/MissingModuleException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/MissingModuleException.java b/maven-core/src/main/java/org/apache/maven/MissingModuleException.java
index c920a6e..1bdf87a 100644
--- a/maven-core/src/main/java/org/apache/maven/MissingModuleException.java
+++ b/maven-core/src/main/java/org/apache/maven/MissingModuleException.java
@@ -21,6 +21,9 @@ package org.apache.maven;
import java.io.File;
+/**
+ * MissingModuleException
+ */
public class MissingModuleException
extends MavenExecutionException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java
index 01e6227..f7a5244 100644
--- a/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java
@@ -28,13 +28,13 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
-@Deprecated
/**
* @deprecated As of 3.2.2, and there is no direct replacement. This is an internal class which was not marked as such,
* but should have been.
* @author jvanzyl
*
*/
+@Deprecated
public interface ProjectDependenciesResolver
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java b/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java
index a16f64f..28f281e 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java
@@ -22,7 +22,11 @@ package org.apache.maven.artifact.factory;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.versioning.VersionRange;
+/**
+ * ArtifactFactory - deprecated
+ */
@Deprecated
+@SuppressWarnings( "checkstyle:parameternumber" )
public interface ArtifactFactory
{
@Deprecated
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java b/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
index dfcac01..3ee65de 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
@@ -27,7 +27,12 @@ import org.apache.maven.artifact.versioning.VersionRange;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
+/**
+ * DefaultArtifactFactory
+ *
+ */
@Component( role = ArtifactFactory.class )
+@SuppressWarnings( "checkstyle:parameternumber" )
public class DefaultArtifactFactory
implements ArtifactFactory
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java b/maven-core/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java
index 5ef3a98..f0de677 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java
@@ -21,6 +21,9 @@ package org.apache.maven.artifact.metadata;
import org.apache.maven.artifact.Artifact;
+/**
+ * AbstractArtifactMetadata
+ */
@Deprecated
public abstract class AbstractArtifactMetadata
extends org.apache.maven.repository.legacy.metadata.AbstractArtifactMetadata
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java b/maven-core/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java
index e419ef9..bef0268 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java
@@ -21,6 +21,9 @@ package org.apache.maven.artifact.metadata;
import org.apache.maven.artifact.Artifact;
+/**
+ * Error while retrieving repository metadata from the repository - deprecated
+ */
@Deprecated
public class ArtifactMetadataRetrievalException
extends org.apache.maven.repository.legacy.metadata.ArtifactMetadataRetrievalException
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java b/maven-core/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java
index ccd5836..605230f 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java
@@ -26,6 +26,10 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.repository.legacy.metadata.MetadataResolutionRequest;
+/**
+ * Provides some metadata operations, like querying the remote repository for a list of versions available for an
+ * artifact - deprecated
+ */
@Deprecated
public interface ArtifactMetadataSource
extends org.apache.maven.repository.legacy.metadata.ArtifactMetadataSource
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java b/maven-core/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java
index c219b24..3503265 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java
@@ -26,6 +26,9 @@ import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
+/**
+ * ResolutionGroup
+ */
@Deprecated
public class ResolutionGroup
extends org.apache.maven.repository.legacy.metadata.ResolutionGroup
[2/8] maven git commit: [MNG-6353] Upgrade maven-shared-utils to
3.2.1 Add o.a.m.s.u.logging.MessageUtils.registerShutdownHook() to prevent
ANSI from staying active when killing an active process
Posted by kh...@apache.org.
[MNG-6353] Upgrade maven-shared-utils to 3.2.1
Add o.a.m.s.u.logging.MessageUtils.registerShutdownHook() to prevent ANSI from staying active when killing an active process
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/22f782ae
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/22f782ae
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/22f782ae
Branch: refs/heads/MNG-6352-print-version
Commit: 22f782aecdba911324d459937e638e33165d7c12
Parents: 24b8820
Author: rfscholte <rf...@apache.org>
Authored: Sat Feb 10 15:28:59 2018 +0100
Committer: rfscholte <rf...@apache.org>
Committed: Sat Feb 10 15:28:59 2018 +0100
----------------------------------------------------------------------
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/22f782ae/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 fa224d0..07e28bf 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
@@ -191,6 +191,7 @@ public class MavenCli
MavenCli cli = new MavenCli();
MessageUtils.systemInstall();
+ MessageUtils.registerShutdownHook();
int result = cli.doMain( new CliRequest( args, classWorld ) );
MessageUtils.systemUninstall();
[6/8] maven git commit: Remove Google Guava usage (move to Java7)
Posted by kh...@apache.org.
Remove Google Guava usage (move to Java7)
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b8c06e61
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b8c06e61
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b8c06e61
Branch: refs/heads/MNG-6352-print-version
Commit: b8c06e61ab73cd9e25a5b2c93d9e5077b2196751
Parents: d925081
Author: Sylwester Lachiewicz <sl...@gmail.com>
Authored: Wed Nov 8 22:29:50 2017 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sun Feb 11 11:54:17 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/maven/DefaultMaven.java | 8 +-
.../execution/DefaultMavenExecutionRequest.java | 4 +-
.../scope/internal/MojoExecutionScope.java | 6 +-
.../maven/extension/internal/CoreExports.java | 10 +-
.../extension/internal/CoreExtensionEntry.java | 7 +-
.../apache/maven/graph/DefaultGraphBuilder.java | 18 +--
.../maven/lifecycle/DefaultLifecycles.java | 7 +-
...DefaultLifecycleExecutionPlanCalculator.java | 5 +-
.../maven/project/ProjectModelResolver.java | 14 +--
.../session/scope/internal/SessionScope.java | 3 +-
.../java/org/apache/maven/cli/MavenCli.java | 5 +-
.../org/apache/maven/model/building/Result.java | 109 +++++++++++--------
12 files changed, 101 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/b8c06e61/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index 7e46ad0..7f052c1 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -60,8 +60,6 @@ import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.WorkspaceReader;
import org.eclipse.aether.util.repository.ChainedWorkspaceReader;
-import com.google.common.collect.Iterables;
-
/**
* @author Jason van Zyl
*/
@@ -222,8 +220,7 @@ public class DefaultMaven
if ( graphResult.hasErrors() )
{
- return addExceptionToResult( result, Iterables.toArray( graphResult.getProblems(),
- ModelProblem.class )[0].getException() );
+ return addExceptionToResult( result, graphResult.getProblems().iterator().next().getException() );
}
try
@@ -289,8 +286,7 @@ public class DefaultMaven
if ( graphResult.hasErrors() )
{
- return addExceptionToResult( result, Iterables.toArray( graphResult.getProblems(),
- ModelProblem.class )[0].getException() );
+ return addExceptionToResult( result, graphResult.getProblems().iterator().next().getException() );
}
try
http://git-wip-us.apache.org/repos/asf/maven/blob/b8c06e61/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 089a7db..fe558cd 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
@@ -43,8 +43,6 @@ import org.eclipse.aether.RepositoryCache;
import org.eclipse.aether.repository.WorkspaceReader;
import org.eclipse.aether.transfer.TransferListener;
-import com.google.common.collect.Maps;
-
/**
* @author Jason van Zyl
*/
@@ -1280,7 +1278,7 @@ public class DefaultMavenExecutionRequest
{
if ( data == null )
{
- data = Maps.newHashMap();
+ data = new HashMap<>();
}
return data;
http://git-wip-us.apache.org/repos/asf/maven/blob/b8c06e61/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java
index 168a87f..785877e 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java
@@ -20,6 +20,7 @@ package org.apache.maven.execution.scope.internal;
*/
import java.util.Collection;
+import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.LinkedList;
import java.util.Map;
@@ -29,7 +30,6 @@ import org.apache.maven.execution.MojoExecutionListener;
import org.apache.maven.execution.scope.WeakMojoExecutionListener;
import org.apache.maven.plugin.MojoExecutionException;
-import com.google.common.collect.Maps;
import com.google.inject.Key;
import com.google.inject.OutOfScopeException;
import com.google.inject.Provider;
@@ -52,9 +52,9 @@ public class MojoExecutionScope
private static final class ScopeState
{
- private final Map<Key<?>, Provider<?>> seeded = Maps.newHashMap();
+ private final Map<Key<?>, Provider<?>> seeded = new HashMap<>();
- private final Map<Key<?>, Object> provided = Maps.newHashMap();
+ private final Map<Key<?>, Object> provided = new HashMap<>();
}
private final ThreadLocal<LinkedList<ScopeState>> values = new ThreadLocal<>();
http://git-wip-us.apache.org/repos/asf/maven/blob/b8c06e61/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java
index e253e9f..331617c 100644
--- a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java
+++ b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java
@@ -19,15 +19,15 @@ package org.apache.maven.extension.internal;
* under the License.
*/
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-
/**
* Provides information about artifacts (identified by groupId:artifactId string key) and classpath elements exported by
* Maven core itself and loaded Maven core extensions.
@@ -52,8 +52,8 @@ public class CoreExports
{
packages.put( pkg, realm );
}
- this.artifacts = ImmutableSet.copyOf( exportedArtifacts );
- this.packages = ImmutableMap.copyOf( packages );
+ this.artifacts = Collections.unmodifiableSet( new HashSet<>( exportedArtifacts ) );
+ this.packages = Collections.unmodifiableMap( new HashMap<>( packages ) );
}
/**
http://git-wip-us.apache.org/repos/asf/maven/blob/b8c06e61/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java
index ffac1d3..50220f6 100644
--- a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java
+++ b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java
@@ -19,7 +19,6 @@ package org.apache.maven.extension.internal;
* under the License.
*/
-import com.google.common.collect.ImmutableSet;
import org.apache.maven.project.ExtensionDescriptor;
import org.apache.maven.project.ExtensionDescriptorBuilder;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
@@ -29,7 +28,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.Collection;
+import java.util.Collections;
import java.util.Enumeration;
+import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
@@ -50,8 +51,8 @@ public class CoreExtensionEntry
public CoreExtensionEntry( ClassRealm realm, Collection<String> artifacts, Collection<String> packages )
{
this.realm = realm;
- this.artifacts = ImmutableSet.copyOf( artifacts );
- this.packages = ImmutableSet.copyOf( packages );
+ this.artifacts = Collections.unmodifiableSet( new HashSet<>( artifacts ) );
+ this.packages = Collections.unmodifiableSet( new HashSet<>( packages ) );
}
/**
http://git-wip-us.apache.org/repos/asf/maven/blob/b8c06e61/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
index 701e7c5..ec72e8d 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
@@ -23,12 +23,12 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
-import com.google.common.collect.Lists;
import org.apache.maven.DefaultMaven;
import org.apache.maven.MavenExecutionException;
import org.apache.maven.ProjectCycleException;
@@ -85,23 +85,17 @@ public class DefaultGraphBuilder
return result;
}
- catch ( final ProjectBuildingException e )
+ catch ( final ProjectBuildingException | DuplicateProjectException | MavenExecutionException e )
{
- return Result.error( Lists.newArrayList( new DefaultModelProblem( null, null, null, null, 0, 0, e ) ) );
+ return Result.error( Collections.singletonList
+ ( new DefaultModelProblem ( null, null, null, null, 0, 0, e ) ) );
}
catch ( final CycleDetectedException e )
{
String message = "The projects in the reactor contain a cyclic reference: " + e.getMessage();
ProjectCycleException error = new ProjectCycleException( message, e );
- return Result.error( Lists.newArrayList( new DefaultModelProblem( null, null, null, null, 0, 0, error ) ) );
- }
- catch ( final DuplicateProjectException e )
- {
- return Result.error( Lists.newArrayList( new DefaultModelProblem( null, null, null, null, 0, 0, e ) ) );
- }
- catch ( final MavenExecutionException e )
- {
- return Result.error( Lists.newArrayList( new DefaultModelProblem( null, null, null, null, 0, 0, e ) ) );
+ return Result.error( Collections.singletonList(
+ new DefaultModelProblem( null, null, null, null, 0, 0, error ) ) );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/b8c06e61/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 8186a39..a7d9fac 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
@@ -24,8 +24,6 @@ import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.StringUtils;
-import com.google.common.base.Preconditions;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -122,7 +120,10 @@ public class DefaultLifecycles
for ( String name : lifecycleNames )
{
Lifecycle lifecycle = lifecycles.get( name );
- Preconditions.checkNotNull( "A lifecycle must have an id.", lifecycle.getId() );
+ if ( lifecycle.getId() == null )
+ {
+ throw new NullPointerException( "A lifecycle must have an id." );
+ }
result.add( lifecycle );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/b8c06e61/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 1e81b18..ef60c4e 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
@@ -59,7 +59,6 @@ import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import com.google.common.collect.ImmutableMap;
/**
* <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice.
@@ -111,8 +110,8 @@ public class DefaultLifecycleExecutionPlanCalculator
this.defaultLifeCycles = defaultLifeCycles;
this.mojoDescriptorCreator = mojoDescriptorCreator;
this.lifecyclePluginResolver = lifecyclePluginResolver;
- this.mojoExecutionConfigurators =
- ImmutableMap.of( "default", (MojoExecutionConfigurator) new DefaultMojoExecutionConfigurator() );
+ this.mojoExecutionConfigurators = Collections.singletonMap(
+ "default", (MojoExecutionConfigurator) new DefaultMojoExecutionConfigurator() );
}
@Override
http://git-wip-us.apache.org/repos/asf/maven/blob/b8c06e61/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index 3a31d33..2b3108a 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -23,11 +23,10 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Repository;
@@ -157,14 +156,15 @@ public class ProjectModelResolver
private static void removeMatchingRepository( Iterable<RemoteRepository> repositories, final String id )
{
- Iterables.removeIf( repositories, new Predicate<RemoteRepository>()
+ Iterator iterator = repositories.iterator( );
+ while ( iterator.hasNext() )
{
- @Override
- public boolean apply( RemoteRepository remoteRepository )
+ RemoteRepository next = ( RemoteRepository ) iterator.next();
+ if ( next.getId().equals( id ) )
{
- return remoteRepository.getId().equals( id );
+ iterator.remove();
}
- } );
+ }
}
public ModelResolver newCopy()
http://git-wip-us.apache.org/repos/asf/maven/blob/b8c06e61/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
index e57a19c..ac423bc 100644
--- a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
+++ b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
@@ -24,7 +24,6 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
-import com.google.common.collect.ImmutableMap;
import com.google.inject.Key;
import com.google.inject.OutOfScopeException;
import com.google.inject.Provider;
@@ -46,7 +45,7 @@ public class SessionScope
Memento( final Map<Key<?>, Provider<?>> seeded )
{
- this.seeded = ImmutableMap.copyOf( seeded );
+ this.seeded = Collections.unmodifiableMap( new HashMap<>( seeded ) );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/b8c06e61/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 4fac2ad..f254c58 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
@@ -19,8 +19,6 @@ package org.apache.maven.cli;
* under the License.
*/
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
import com.google.inject.AbstractModule;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
@@ -101,6 +99,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -378,7 +377,7 @@ public class MavenCli
if ( configFile.isFile() )
{
- for ( String arg : Files.toString( configFile, Charsets.UTF_8 ).split( "\\s+" ) )
+ for ( String arg : new String( Files.readAllBytes( configFile.toPath() ) ).split( "\\s+" ) )
{
if ( !arg.isEmpty() )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/b8c06e61/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 c9d5f68..df0c797 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
@@ -19,23 +19,14 @@ package org.apache.maven.model.building;
* under the License.
*/
-import static com.google.common.base.Predicates.in;
-import static com.google.common.collect.Iterables.any;
-import static com.google.common.collect.Iterables.concat;
-import static com.google.common.collect.Iterables.transform;
import static java.util.Collections.singleton;
-import static java.util.EnumSet.of;
import static org.apache.maven.model.building.ModelProblem.Severity.ERROR;
import static org.apache.maven.model.building.ModelProblem.Severity.FATAL;
-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
-
-import org.apache.maven.model.building.ModelProblem.Severity;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Iterables;
+import java.util.List;
/**
* There are various forms of results that are represented by this class:
@@ -83,7 +74,17 @@ public class Result<T>
*/
public static <T> Result<T> success( T model, Result<?>... results )
{
- return success( model, Iterables.concat( Iterables.transform( Arrays.asList( results ), GET_PROBLEMS ) ) );
+ final List<ModelProblem> problemsList = new ArrayList<>();
+
+ for ( Result<?> result1 : results )
+ {
+ for ( ModelProblem modelProblem : result1.getProblems() )
+ {
+ problemsList.add( modelProblem );
+ }
+ }
+
+ return success( model, problemsList );
}
/**
@@ -108,7 +109,17 @@ public class Result<T>
public static <T> Result<T> error( Result<?>... results )
{
- return error( Iterables.concat( Iterables.transform( Arrays.asList( results ), GET_PROBLEMS ) ) );
+ final List<ModelProblem> problemsList = new ArrayList<>( );
+
+ for ( Result<?> result1 : results )
+ {
+ for ( ModelProblem modelProblem : result1.getProblems( ) )
+ {
+ problemsList.add( modelProblem );
+ }
+ }
+
+ return error( problemsList );
}
/**
@@ -153,13 +164,30 @@ public class Result<T>
*/
public static <T> Result<T> addProblems( Result<T> result, Iterable<? extends ModelProblem> problems )
{
- return new Result<>( result.hasErrors() || hasErrors( problems ), result.get(), concat( result.getProblems(),
- problems ) );
+ Collection<ModelProblem> list = new ArrayList<>();
+ for ( ModelProblem item : problems )
+ {
+ list.add( item );
+ }
+ for ( ModelProblem item : result.getProblems() )
+ {
+ list.add( item );
+ }
+ return new Result<>( result.hasErrors() || hasErrors( problems ), result.get(), list );
}
public static <T> Result<T> addProblems( Result<T> result, Result<?>... results )
{
- return addProblems( result, Iterables.concat( Iterables.transform( Arrays.asList( results ), GET_PROBLEMS ) ) );
+ final List<ModelProblem> problemsList = new ArrayList<>();
+
+ for ( Result<?> result1 : results )
+ {
+ for ( ModelProblem modelProblem : result1.getProblems( ) )
+ {
+ problemsList.add( modelProblem );
+ }
+ }
+ return addProblems( result, problemsList );
}
/**
@@ -169,37 +197,38 @@ public class Result<T>
*/
public static <T> Result<Iterable<T>> newResultSet( Iterable<? extends Result<? extends T>> results )
{
- final boolean hasErrors = any( transform( results, new Function<Result<?>, Boolean>()
+ boolean hasErrors = false;
+ List<T> modelsList = new ArrayList<>();
+ List<ModelProblem> problemsList = new ArrayList<>();
+
+ for ( Result<? extends T> result : results )
{
- @Override
- public Boolean apply( Result<?> input )
+ modelsList.add( result.get() );
+
+ for ( ModelProblem modelProblem : result.getProblems() )
{
- return input.hasErrors();
+ problemsList.add( modelProblem );
}
- } ), Predicates.equalTo( true ) );
- final Iterable<T> models = transform( results, new Function<Result<? extends T>, T>()
- {
- @Override
- public T apply( Result<? extends T> input )
+
+ if ( result.hasErrors() )
{
- return input.get();
+ hasErrors = true;
}
- } );
- final Iterable<ModelProblem> problems = concat( transform( results, GET_PROBLEMS ) );
- return new Result<>( hasErrors, models, problems );
+ }
+ return new Result<>( hasErrors, ( Iterable<T> ) modelsList, problemsList );
}
// helper to determine if problems contain error
private static boolean hasErrors( Iterable<? extends ModelProblem> problems )
{
- return any( transform( problems, new Function<ModelProblem, Severity>()
+ for ( ModelProblem input : problems )
{
- @Override
- public Severity apply( ModelProblem input )
+ if ( input.getSeverity().equals( ERROR ) || input.getSeverity().equals( FATAL ) )
{
- return input.getSeverity();
+ return true;
}
- } ), in( of( ERROR, FATAL ) ) );
+ }
+ return false;
}
/**
@@ -233,14 +262,4 @@ public class Result<T>
{
return errors;
}
-
- private static final Function<Result<?>, Iterable<? extends ModelProblem>> GET_PROBLEMS =
- new Function<Result<?>, Iterable<? extends ModelProblem>>()
- {
- @Override
- public Iterable<? extends ModelProblem> apply( Result<?> input )
- {
- return input.getProblems();
- }
- };
}
\ No newline at end of file