You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/10/24 01:25:59 UTC
[2/2] git commit: updated parent pom (and fixed issues...)
updated parent pom (and fixed issues...)
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/366f57c5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/366f57c5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/366f57c5
Branch: refs/heads/master
Commit: 366f57c563eef926e552208211f1085ae3398a0a
Parents: d413c51
Author: Hervé Boutemy <hb...@apache.org>
Authored: Fri Oct 24 01:25:49 2014 +0200
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Fri Oct 24 01:25:49 2014 +0200
----------------------------------------------------------------------
.../DefaultArtifactDescriptorReader.java | 40 ++--
.../internal/DefaultVersionRangeResolver.java | 6 +-
.../internal/DefaultVersionResolver.java | 18 +-
.../repository/internal/MavenAetherModule.java | 6 +-
.../repository/ArtifactRepositoryPolicy.java | 4 +-
maven-compat/pom.xml | 4 +
maven-core/pom.xml | 4 +
.../classrealm/DefaultClassRealmManager.java | 2 +-
.../maven/exception/ExceptionSummary.java | 2 +-
.../DefaultMavenExecutionRequestPopulator.java | 2 +-
.../execution/DefaultMavenExecutionResult.java | 4 +-
.../maven/execution/MojoExecutionEvent.java | 3 +-
.../maven/execution/MojoExecutionListener.java | 3 +-
.../scope/WeakMojoExecutionListener.java | 3 +-
.../internal/MojoExecutionScopeModule.java | 4 +-
.../lifecycle/LifecycleMappingDelegate.java | 3 +-
.../lifecycle/internal/BuildThreadFactory.java | 4 +-
.../maven/lifecycle/internal/MojoExecutor.java | 4 +-
.../DefaultLifecycleBindingsInjector.java | 2 +-
.../maven/plugin/DefaultPluginRealmCache.java | 2 +-
.../maven/project/DefaultProjectRealmCache.java | 2 +-
.../apache/maven/project/ProjectBuilder.java | 3 +-
.../maven/project/ProjectBuildingRequest.java | 3 +-
.../scope/internal/SessionScopeModule.java | 2 +-
.../java/org/apache/maven/cli/MavenCli.java | 5 +-
.../transfer/Slf4jMavenTransferListener.java | 3 +-
.../model/building/DefaultModelBuilder.java | 7 +-
.../building/DefaultModelBuilderFactory.java | 4 +-
.../model/building/DefaultModelProblem.java | 8 +-
.../maven/model/building/ModelProcessor.java | 1 +
.../StringSearchModelInterpolator.java | 1 +
.../maven/model/merge/MavenModelMerger.java | 8 +-
.../model/plugin/DefaultReportingConverter.java | 3 +-
.../activation/FileProfileActivator.java | 5 +-
.../model/validation/DefaultModelValidator.java | 235 ++++++++++---------
pom.xml | 31 +--
36 files changed, 222 insertions(+), 219 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index 51a8dd5..7caf863 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -202,13 +202,13 @@ public class DefaultArtifactDescriptorReader
return this;
}
- public DefaultArtifactDescriptorReader setRepositoryEventDispatcher( RepositoryEventDispatcher repositoryEventDispatcher )
+ public DefaultArtifactDescriptorReader setRepositoryEventDispatcher( RepositoryEventDispatcher red )
{
- if ( repositoryEventDispatcher == null )
+ if ( red == null )
{
throw new IllegalArgumentException( "repository event dispatcher has not been specified" );
}
- this.repositoryEventDispatcher = repositoryEventDispatcher;
+ this.repositoryEventDispatcher = red;
return this;
}
@@ -287,17 +287,17 @@ public class DefaultArtifactDescriptorReader
RequestTrace trace = RequestTrace.newChild( request.getTrace(), request );
Set<String> visited = new LinkedHashSet<String>();
- for ( Artifact artifact = request.getArtifact();; )
+ for ( Artifact a = request.getArtifact();; )
{
- Artifact pomArtifact = ArtifactDescriptorUtils.toPomArtifact( artifact );
+ Artifact pomArtifact = ArtifactDescriptorUtils.toPomArtifact( a );
try
{
VersionRequest versionRequest =
- new VersionRequest( artifact, request.getRepositories(), request.getRequestContext() );
+ new VersionRequest( a, request.getRepositories(), request.getRequestContext() );
versionRequest.setTrace( trace );
VersionResult versionResult = versionResolver.resolveVersion( session, versionRequest );
- artifact = artifact.setVersion( versionResult.getVersion() );
+ a = a.setVersion( versionResult.getVersion() );
versionRequest =
new VersionRequest( pomArtifact, request.getRepositories(), request.getRequestContext() );
@@ -312,12 +312,12 @@ public class DefaultArtifactDescriptorReader
throw new ArtifactDescriptorException( result );
}
- if ( !visited.add( artifact.getGroupId() + ':' + artifact.getArtifactId() + ':' + artifact.getBaseVersion() ) )
+ if ( !visited.add( a.getGroupId() + ':' + a.getArtifactId() + ':' + a.getBaseVersion() ) )
{
RepositoryException exception =
new RepositoryException( "Artifact relocations form a cycle: " + visited );
- invalidDescriptor( session, trace, artifact, exception );
- if ( ( getPolicy( session, artifact, request ) & ArtifactDescriptorPolicy.IGNORE_INVALID ) != 0 )
+ invalidDescriptor( session, trace, a, exception );
+ if ( ( getPolicy( session, a, request ) & ArtifactDescriptorPolicy.IGNORE_INVALID ) != 0 )
{
return null;
}
@@ -339,8 +339,8 @@ public class DefaultArtifactDescriptorReader
{
if ( e.getCause() instanceof ArtifactNotFoundException )
{
- missingDescriptor( session, trace, artifact, (Exception) e.getCause() );
- if ( ( getPolicy( session, artifact, request ) & ArtifactDescriptorPolicy.IGNORE_MISSING ) != 0 )
+ missingDescriptor( session, trace, a, (Exception) e.getCause() );
+ if ( ( getPolicy( session, a, request ) & ArtifactDescriptorPolicy.IGNORE_MISSING ) != 0 )
{
return null;
}
@@ -384,8 +384,8 @@ public class DefaultArtifactDescriptorReader
throw new ArtifactDescriptorException( result );
}
}
- invalidDescriptor( session, trace, artifact, e );
- if ( ( getPolicy( session, artifact, request ) & ArtifactDescriptorPolicy.IGNORE_INVALID ) != 0 )
+ invalidDescriptor( session, trace, a, e );
+ if ( ( getPolicy( session, a, request ) & ArtifactDescriptorPolicy.IGNORE_INVALID ) != 0 )
{
return null;
}
@@ -397,11 +397,11 @@ public class DefaultArtifactDescriptorReader
if ( relocation != null )
{
- result.addRelocation( artifact );
- artifact =
- new RelocatedArtifact( artifact, relocation.getGroupId(), relocation.getArtifactId(),
+ result.addRelocation( a );
+ a =
+ new RelocatedArtifact( a, relocation.getGroupId(), relocation.getArtifactId(),
relocation.getVersion() );
- result.setArtifact( artifact );
+ result.setArtifact( a );
}
else
{
@@ -510,14 +510,14 @@ public class DefaultArtifactDescriptorReader
repositoryEventDispatcher.dispatch( event.build() );
}
- private int getPolicy( RepositorySystemSession session, Artifact artifact, ArtifactDescriptorRequest request )
+ private int getPolicy( RepositorySystemSession session, Artifact a, ArtifactDescriptorRequest request )
{
ArtifactDescriptorPolicy policy = session.getArtifactDescriptorPolicy();
if ( policy == null )
{
return ArtifactDescriptorPolicy.STRICT;
}
- return policy.getPolicy( session, new ArtifactDescriptorPolicyRequest( artifact, request.getRequestContext() ) );
+ return policy.getPolicy( session, new ArtifactDescriptorPolicyRequest( a, request.getRequestContext() ) );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
index a7ff573..e8ba06b 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
@@ -143,13 +143,13 @@ public class DefaultVersionRangeResolver
return this;
}
- public DefaultVersionRangeResolver setRepositoryEventDispatcher( RepositoryEventDispatcher repositoryEventDispatcher )
+ public DefaultVersionRangeResolver setRepositoryEventDispatcher( RepositoryEventDispatcher red )
{
- if ( repositoryEventDispatcher == null )
+ if ( red == null )
{
throw new IllegalArgumentException( "repository event dispatcher has not been specified" );
}
- this.repositoryEventDispatcher = repositoryEventDispatcher;
+ this.repositoryEventDispatcher = red;
return this;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
index 9fcfc99..d722644 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
@@ -233,9 +233,9 @@ public class DefaultVersionResolver
}
else
{
- List<MetadataRequest> metadataRequests = new ArrayList<MetadataRequest>( request.getRepositories().size() );
+ List<MetadataRequest> metadataReqs = new ArrayList<MetadataRequest>( request.getRepositories().size() );
- metadataRequests.add( new MetadataRequest( metadata, null, request.getRequestContext() ) );
+ metadataReqs.add( new MetadataRequest( metadata, null, request.getRequestContext() ) );
for ( RemoteRepository repository : request.getRepositories() )
{
@@ -244,10 +244,10 @@ public class DefaultVersionResolver
metadataRequest.setDeleteLocalCopyIfMissing( true );
metadataRequest.setFavorLocalRepository( true );
metadataRequest.setTrace( trace );
- metadataRequests.add( metadataRequest );
+ metadataReqs.add( metadataRequest );
}
- List<MetadataResult> metadataResults = metadataResolver.resolveMetadata( session, metadataRequests );
+ List<MetadataResult> metadataResults = metadataResolver.resolveMetadata( session, metadataReqs );
Map<String, VersionInfo> infos = new HashMap<String, VersionInfo>();
@@ -261,8 +261,8 @@ public class DefaultVersionResolver
repository = session.getLocalRepository();
}
- Versioning versioning = readVersions( session, trace, metadataResult.getMetadata(), repository, result );
- merge( artifact, infos, versioning, repository );
+ Versioning v = readVersions( session, trace, metadataResult.getMetadata(), repository, result );
+ merge( artifact, infos, v, repository );
}
if ( RELEASE.equals( version ) )
@@ -282,7 +282,8 @@ public class DefaultVersionResolver
subRequest.setArtifact( artifact.setVersion( result.getVersion() ) );
if ( result.getRepository() instanceof RemoteRepository )
{
- subRequest.setRepositories( Collections.singletonList( (RemoteRepository) result.getRepository() ) );
+ RemoteRepository r = (RemoteRepository) result.getRepository();
+ subRequest.setRepositories( Collections.singletonList( r ) );
}
else
{
@@ -467,7 +468,8 @@ public class DefaultVersionResolver
VersionInfo dstInfo = infos.get( dstKey );
if ( dstInfo == null
- || ( srcInfo != null && dstInfo.isOutdated( srcInfo.timestamp ) && srcInfo.repository != dstInfo.repository ) )
+ || ( srcInfo != null && dstInfo.isOutdated( srcInfo.timestamp )
+ && srcInfo.repository != dstInfo.repository ) )
{
infos.put( dstKey, srcInfo );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java
index 6f391fd..fa81f61 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java
@@ -62,8 +62,10 @@ public final class MavenAetherModule
@Provides
@Singleton
- Set<MetadataGeneratorFactory> provideMetadataGeneratorFactories( @Named( "snapshot" ) MetadataGeneratorFactory snapshot,
- @Named( "versions" ) MetadataGeneratorFactory versions )
+ Set<MetadataGeneratorFactory> provideMetadataGeneratorFactories( @Named( "snapshot" )
+ MetadataGeneratorFactory snapshot,
+ @Named( "versions" )
+ MetadataGeneratorFactory versions )
{
Set<MetadataGeneratorFactory> factories = new HashSet<MetadataGeneratorFactory>();
factories.add( snapshot );
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/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 f76e2c1..b6cd8f3 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
@@ -170,7 +170,7 @@ public class ArtifactRepositoryPolicy
{
setEnabled( true );
- if ( ordinalOfChecksumPolicy( policy.getChecksumPolicy() ) < ordinalOfChecksumPolicy( getChecksumPolicy() ) )
+ if ( ordinalOfCksumPolicy( policy.getChecksumPolicy() ) < ordinalOfCksumPolicy( getChecksumPolicy() ) )
{
setChecksumPolicy( policy.getChecksumPolicy() );
}
@@ -182,7 +182,7 @@ public class ArtifactRepositoryPolicy
}
}
- private int ordinalOfChecksumPolicy( String policy )
+ private int ordinalOfCksumPolicy( String policy )
{
if ( ArtifactRepositoryPolicy.CHECKSUM_POLICY_FAIL.equals( policy ) )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 5aa1cae..cefdbdd 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -30,6 +30,10 @@
<tag>HEAD</tag>
</scm>
+ <properties>
+ <checkstyle.failOnViolation>false</checkstyle.failOnViolation><!-- lazyness 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/366f57c5/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 562d0e1..a6b6557 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -30,6 +30,10 @@
<tag>HEAD</tag>
</scm>
+ <properties>
+ <checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,JavadocType,LineLength,MethodName,MagicNumber,ConstantName,VisibilityModifier,InnerAssignment</checkstyle.violation.ignore>
+ </properties>
+
<dependencies>
<!-- Maven -->
<dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
index 2e6fbfd..b718ef1 100644
--- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
+++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
@@ -332,7 +332,7 @@ public class DefaultClassRealmManager
ClassLoader parent = ClassLoader.getSystemClassLoader();
Map<String, ClassLoader> foreignImports =
- Collections.<String, ClassLoader> singletonMap( "", getMavenApiRealm() );
+ Collections.<String, ClassLoader>singletonMap( "", getMavenApiRealm() );
return createRealm( getKey( plugin, true ), RealmType.Extension, parent, null, foreignImports, artifacts );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java b/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java
index 2b7f27b..dcc376a 100644
--- a/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java
+++ b/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java
@@ -53,7 +53,7 @@ public class ExceptionSummary
this.exception = exception;
this.message = ( message != null ) ? message : "";
this.reference = ( reference != null ) ? reference : "";
- this.children = ( children != null ) ? children : Collections.<ExceptionSummary> emptyList();
+ this.children = ( children != null ) ? children : Collections.<ExceptionSummary>emptyList();
}
public Throwable getException()
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/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 90d79d1..df3ee69 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
@@ -117,7 +117,7 @@ public class DefaultMavenExecutionRequestPopulator
if ( settings.getActiveProfiles().contains( rawProfile.getId() ) )
{
List<Repository> remoteRepositories = rawProfile.getRepositories();
- for( Repository remoteRepository : remoteRepositories )
+ for ( Repository remoteRepository : remoteRepositories )
{
try
{
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
index 115cd73..d3d63f9 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
@@ -65,7 +65,7 @@ public class DefaultMavenExecutionResult
public List<MavenProject> getTopologicallySortedProjects()
{
- return null == topologicallySortedProjects ? Collections.<MavenProject> emptyList()
+ return null == topologicallySortedProjects ? Collections.<MavenProject>emptyList()
: topologicallySortedProjects;
}
@@ -83,7 +83,7 @@ public class DefaultMavenExecutionResult
public List<Throwable> getExceptions()
{
- return exceptions == null ? Collections.<Throwable> emptyList() : exceptions;
+ return exceptions == null ? Collections.<Throwable>emptyList() : exceptions;
}
public MavenExecutionResult addException( Throwable t )
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java b/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java
index b3a807a..2494dea 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java
@@ -19,7 +19,6 @@ package org.apache.maven.execution;
* under the License.
*/
-import org.apache.maven.execution.scope.WeakMojoExecutionListener;
import org.apache.maven.plugin.Mojo;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.project.MavenProject;
@@ -29,7 +28,7 @@ import org.apache.maven.project.MavenProject;
* it become necessary to introduce new parameters in the existing callbacks in the future.
*
* @see MojoExecutionListener
- * @see WeakMojoExecutionListener
+ * @see org.apache.maven.execution.scope.WeakMojoExecutionListener
* @since 3.1.2
* @provisional This class is part of work in progress and can be changed or removed without notice.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java b/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java
index a14e43e..921acc6 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java
@@ -19,13 +19,12 @@ package org.apache.maven.execution;
* under the License.
*/
-import org.apache.maven.execution.scope.WeakMojoExecutionListener;
import org.apache.maven.plugin.MojoExecutionException;
/**
* Extension point that allows build extensions observe and possibly veto mojo executions.
*
- * @see WeakMojoExecutionListener
+ * @see org.apache.maven.execution.scope.WeakMojoExecutionListener
* @since 3.1.2
* @provisional This interface is part of work in progress and can be changed or removed without notice.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java b/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java
index 7ab30e9..89242c0 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java
@@ -20,7 +20,6 @@ package org.apache.maven.execution.scope;
*/
import org.apache.maven.execution.MojoExecutionEvent;
-import org.apache.maven.execution.MojoExecutionListener;
import org.apache.maven.plugin.MojoExecutionException;
/**
@@ -29,7 +28,7 @@ import org.apache.maven.plugin.MojoExecutionException;
* Unlike {@link MojoExecutionListener}, this extension point does not trigger instantiation of the component, hence
* "weak" class name prefix. Only applies to mojo execution scoped components.
*
- * @see MojoExecutionListener
+ * @see org.apache.maven.execution.MojoExecutionListener
* @since 3.1.2
* @provisional This interface is part of work in progress and can be changed or removed without notice.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/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 49adf48..229a3c5 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
@@ -49,8 +49,8 @@ public class MojoExecutionScopeModule
bindScope( MojoExecutionScoped.class, scope );
bind( MojoExecutionScope.class ).toInstance( scope );
- bind( MavenProject.class ).toProvider( MojoExecutionScope.<MavenProject> seededKeyProvider() ).in( scope );
- bind( MojoExecution.class ).toProvider( MojoExecutionScope.<MojoExecution> seededKeyProvider() ).in( scope );
+ bind( MavenProject.class ).toProvider( MojoExecutionScope.<MavenProject>seededKeyProvider() ).in( scope );
+ bind( MojoExecution.class ).toProvider( MojoExecutionScope.<MojoExecution>seededKeyProvider() ).in( scope );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java
index 9076d13..c246001 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.lifecycle.internal.DefaultLifecycleMappingDelegate;
import org.apache.maven.plugin.InvalidPluginDescriptorException;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.MojoNotFoundException;
@@ -41,7 +40,7 @@ import org.apache.maven.project.MavenProject;
* {@code @Component} annotations.
*
* @since 3.2.0
- * @see DefaultLifecycleMappingDelegate
+ * @see org.apache.maven.lifecycle.internal.DefaultLifecycleMappingDelegate
* @author ifedorenko
*/
public interface LifecycleMappingDelegate
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildThreadFactory.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildThreadFactory.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildThreadFactory.java
index f2d9575..0154507 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildThreadFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildThreadFactory.java
@@ -28,12 +28,12 @@ import java.util.concurrent.atomic.AtomicInteger;
public class BuildThreadFactory
implements ThreadFactory
{
- private final AtomicInteger ID = new AtomicInteger();
+ private final AtomicInteger id = new AtomicInteger();
private static final String PREFIX = "BuilderThread";
public Thread newThread( Runnable r )
{
- return new Thread( r, String.format( "%s %d", PREFIX, ID.getAndIncrement() ) );
+ return new Thread( r, String.format( "%s %d", PREFIX, id.getAndIncrement() ) );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
index 48dde5e..2e71199 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
@@ -255,7 +255,7 @@ public class MojoExecutor
Collection<String> scopesToResolve = dependencyContext.getScopesToResolveForCurrentProject();
lifeCycleDependencyResolver.resolveProjectDependencies( project, scopesToCollect, scopesToResolve, session,
- aggregating, Collections.<Artifact> emptySet() );
+ aggregating, Collections.<Artifact>emptySet() );
dependencyContext.synchronizeWithProjectState();
}
@@ -273,7 +273,7 @@ public class MojoExecutor
{
lifeCycleDependencyResolver.resolveProjectDependencies( aggregatedProject, scopesToCollect,
scopesToResolve, session, aggregating,
- Collections.<Artifact> emptySet() );
+ Collections.<Artifact>emptySet() );
}
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/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 b45c24c..f120b49 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
@@ -93,7 +93,7 @@ public class DefaultLifecycleBindingsInjector
}
Map<Object, Object> context =
- Collections.<Object, Object> singletonMap( PLUGIN_MANAGEMENT, target.getBuild().getPluginManagement() );
+ Collections.<Object, Object>singletonMap( PLUGIN_MANAGEMENT, target.getBuild().getPluginManagement() );
mergePluginContainer_Plugins( target.getBuild(), source.getBuild(), false, context );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/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 d867036..6c8288e 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
@@ -87,7 +87,7 @@ public class DefaultPluginRealmCache
}
this.parentRealm = parentRealm;
this.foreignImports =
- ( foreignImports != null ) ? foreignImports : Collections.<String, ClassLoader> emptyMap();
+ ( foreignImports != null ) ? foreignImports : Collections.<String, ClassLoader>emptyMap();
this.filter = dependencyFilter;
int hash = 17;
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/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 6ad8150..53b82bc 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
@@ -48,7 +48,7 @@ public class DefaultProjectRealmCache
public CacheKey( List<? extends ClassRealm> extensionRealms )
{
- this.extensionRealms = ( extensionRealms != null ) ? extensionRealms : Collections.<ClassRealm> emptyList();
+ this.extensionRealms = ( extensionRealms != null ) ? extensionRealms : Collections.<ClassRealm>emptyList();
this.hashCode = this.extensionRealms.hashCode();
}
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
index 55adce7..70eb5b4 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.building.ModelSource;
-import org.apache.maven.model.building.ModelSource2;
/**
* Builds in-memory descriptions of projects.
@@ -76,7 +75,7 @@ public interface ProjectBuilder
* @return The result of the project building, never {@code null}.
* @throws ProjectBuildingException If the project descriptor could not be successfully built.
*
- * @see ModelSource2
+ * @see org.apache.maven.model.building.ModelSource2
*/
ProjectBuildingResult build( ModelSource modelSource, ProjectBuildingRequest request )
throws ProjectBuildingException;
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/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 0ea80bb..32818af 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
@@ -25,7 +25,6 @@ import java.util.Properties;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Profile;
-import org.apache.maven.model.building.ModelBuildingRequest;
import org.eclipse.aether.RepositorySystemSession;
public interface ProjectBuildingRequest
@@ -95,7 +94,7 @@ public interface ProjectBuildingRequest
* Controls the level of validation to perform on processed models. By default, models are validated in strict mode.
*
* @param validationLevel The level of validation to perform on processed models, e.g.
- * {@link ModelBuildingRequest#VALIDATION_LEVEL_STRICT}.
+ * {@link org.apache.maven.model.building.ModelBuildingRequest#VALIDATION_LEVEL_STRICT}.
* @return This configuration, never {@code null}.
*/
ProjectBuildingRequest setValidationLevel( int validationLevel );
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/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 9b8c0ff..585d683 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
@@ -58,6 +58,6 @@ public class SessionScopeModule
bindScope( SessionScoped.class, scope );
bind( SessionScope.class ).toInstance( scope );
- bind( MavenSession.class ).toProvider( SessionScope.<MavenSession> seededKeyProvider() ).in( scope );
+ bind( MavenSession.class ).toProvider( SessionScope.<MavenSession>seededKeyProvider() ).in( scope );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/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 56884b3..cde88cb 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
@@ -1118,7 +1118,8 @@ public class MavenCli
int calculateDegreeOfConcurrencyWithCoreMultiplier( String threadConfiguration )
{
- return (int) ( Float.valueOf( threadConfiguration.replace( "C", "" ) ) * Runtime.getRuntime().availableProcessors() );
+ int procs = Runtime.getRuntime().availableProcessors();
+ return (int) ( Float.valueOf( threadConfiguration.replace( "C", "" ) ) * procs );
}
static File resolveFile( File file, String workingDirectory )
@@ -1240,7 +1241,7 @@ public class MavenCli
static class ExitException
extends Exception
{
-
+ @SuppressWarnings( "checkstyle:visibilitymodifier" )
public int exitCode;
public ExitException( int exitCode )
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/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 6560fe5..bb72db3 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
@@ -61,7 +61,8 @@ public class Slf4jMavenTransferListener
{
TransferResource resource = event.getResource();
- out.warn( event.getException().getMessage() + " for " + resource.getRepositoryUrl() + resource.getResourceName() );
+ out.warn( event.getException().getMessage() + " for " + resource.getRepositoryUrl()
+ + resource.getResourceName() );
}
@Override
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/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 39e68e2..1e01a5a 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
@@ -580,7 +580,8 @@ public class DefaultModelBuilder
configureResolver( modelResolver, model, problems, false );
}
- private void configureResolver( ModelResolver modelResolver, Model model, DefaultModelProblemCollector problems, boolean replaceRepositories )
+ private void configureResolver( ModelResolver modelResolver, Model model, DefaultModelProblemCollector problems,
+ boolean replaceRepositories )
{
if ( modelResolver == null )
{
@@ -835,8 +836,8 @@ public class DefaultModelBuilder
buffer.append( " of POM " ).append( ModelProblemUtils.toSourceHint( childModel ) );
}
buffer.append( " points at " ).append( groupId ).append( ":" ).append( artifactId );
- buffer.append( " instead of " ).append( parent.getGroupId() ).append( ":" ).append( parent.getArtifactId() );
- buffer.append( ", please verify your project structure" );
+ buffer.append( " instead of " ).append( parent.getGroupId() ).append( ":" );
+ buffer.append( parent.getArtifactId() ).append( ", please verify your project structure" );
problems.setSource( childModel );
problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.BASE )
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java
index 339562f..b1d46de 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java
@@ -124,9 +124,9 @@ public class DefaultModelBuilderFactory
protected ModelInterpolator newModelInterpolator()
{
- UrlNormalizer urlNormalizer = newUrlNormalizer();
+ UrlNormalizer normalizer = newUrlNormalizer();
PathTranslator pathTranslator = newPathTranslator();
- return new StringSearchModelInterpolator().setPathTranslator( pathTranslator ).setUrlNormalizer( urlNormalizer );
+ return new StringSearchModelInterpolator().setPathTranslator( pathTranslator ).setUrlNormalizer( normalizer );
}
protected ModelValidator newModelValidator()
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/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 0d68aae..ba37cac 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
@@ -61,8 +61,8 @@ public class DefaultModelProblem
* @param exception The exception that caused this problem, may be {@code null}.
*/
//mkleint: does this need to be public?
- public DefaultModelProblem( String message, Severity severity, Version version, Model source, int lineNumber, int columnNumber,
- Exception exception )
+ public DefaultModelProblem( String message, Severity severity, Version version, Model source, int lineNumber,
+ int columnNumber, Exception exception )
{
this( message, severity, version, ModelProblemUtils.toPath( source ), lineNumber, columnNumber,
ModelProblemUtils.toId( source ), exception );
@@ -82,8 +82,8 @@ public class DefaultModelProblem
* @param exception The exception that caused this problem, may be {@code null}.
*/
//mkleint: does this need to be public?
- public DefaultModelProblem( String message, Severity severity, Version version, String source, int lineNumber, int columnNumber,
- String modelId, Exception exception )
+ public DefaultModelProblem( String message, Severity severity, Version version, String source, int lineNumber,
+ int columnNumber, String modelId, Exception exception )
{
this.message = message;
this.severity = ( severity != null ) ? severity : Severity.ERROR;
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/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 a5c976d..ca34845 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,7 @@ package org.apache.maven.model.building;
import org.apache.maven.model.io.ModelReader;
import org.apache.maven.model.locator.ModelLocator;
+@SuppressWarnings( "checkstyle:interfaceistype" )
public interface ModelProcessor
extends ModelLocator, ModelReader
{
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/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 2ef7eb1..0f56b7d 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
@@ -450,6 +450,7 @@ public class StringSearchModelInterpolator
}
catch ( UnsupportedOperationException ignore )
{
+ // nop
}
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/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 0c35033..b3ff3ea 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
@@ -601,12 +601,12 @@ public class MavenModelMerger
List<ReportSet> tgt = target.getReportSets();
Map<Object, ReportSet> merged = new LinkedHashMap<Object, ReportSet>( ( src.size() + tgt.size() ) * 2 );
- for ( ReportSet element : src )
+ for ( ReportSet rset : src )
{
- if ( sourceDominant || ( element.getInherited() != null ? element.isInherited() : source.isInherited() ) )
+ if ( sourceDominant || ( rset.getInherited() != null ? rset.isInherited() : source.isInherited() ) )
{
- Object key = getReportSetKey( element );
- merged.put( key, element );
+ Object key = getReportSetKey( rset );
+ merged.put( key, rset );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
index 7079f88..4d4d315 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
@@ -106,7 +106,8 @@ public class DefaultReportingConverter
{
problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.V31 )
- .setMessage( "The <reporting> section is deprecated, please move the reports to the <configuration> section of the new Maven Site Plugin." )
+ .setMessage( "The <reporting> section is deprecated, please move the reports to the <configuration>"
+ + " section of the new Maven Site Plugin." )
.setLocation( reporting.getLocation( "" ) ) );
}*/
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
index b1d0442..e86f142 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
@@ -47,7 +47,7 @@ import org.codehaus.plexus.util.StringUtils;
*
* @author Benjamin Bentmann
* @see ActivationFile
- * @see org.apache.maven.model.validation.DefaultModelValidator#validateRawModel(org.apache.maven.model.Model, org.apache.maven.model.building.ModelBuildingRequest, ModelProblemCollector)
+ * @see org.apache.maven.model.validation.DefaultModelValidator#validateRawModel
*/
@Component( role = ProfileActivator.class, hint = "file" )
public class FileProfileActivator
@@ -137,7 +137,8 @@ public class FileProfileActivator
catch ( Exception e )
{
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
- .setMessage( "Failed to interpolate file location " + path + " for profile " + profile.getId() + ": " + e.getMessage() )
+ .setMessage( "Failed to interpolate file location " + path + " for profile " + profile.getId()
+ + ": " + e.getMessage() )
.setLocation( file.getLocation( missing ? "missing" : "exists" ) )
.setException( e ) );
return false;
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/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 66f059b..fd66323 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
@@ -74,9 +74,9 @@ public class DefaultModelValidator
private static final String ILLEGAL_REPO_ID_CHARS = ILLEGAL_FS_CHARS;
- public void validateRawModel( Model model, ModelBuildingRequest request, ModelProblemCollector problems )
+ public void validateRawModel( Model m, ModelBuildingRequest request, ModelProblemCollector problems )
{
- Parent parent = model.getParent();
+ Parent parent = m.getParent();
if ( parent != null )
{
validateStringNotEmpty( "parent.groupId", problems, Severity.FATAL, Version.BASE, parent.getGroupId(),
@@ -88,8 +88,8 @@ public class DefaultModelValidator
validateStringNotEmpty( "parent.version", problems, Severity.FATAL, Version.BASE, parent.getVersion(),
parent );
- if ( equals( parent.getGroupId(), model.getGroupId() )
- && equals( parent.getArtifactId(), model.getArtifactId() ) )
+ if ( equals( parent.getGroupId(), m.getGroupId() )
+ && equals( parent.getArtifactId(), m.getArtifactId() ) )
{
addViolation( problems, Severity.FATAL, Version.BASE, "parent.artifactId", null, "must be changed"
+ ", the parent element cannot have the same groupId:artifactId as the project.", parent );
@@ -100,39 +100,38 @@ public class DefaultModelValidator
{
Severity errOn30 = getSeverity( request, ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_0 );
- validateEnum( "modelVersion", problems, Severity.ERROR, Version.V20, model.getModelVersion(), null, model,
+ validateEnum( "modelVersion", problems, Severity.ERROR, Version.V20, m.getModelVersion(), null, m,
"4.0.0" );
- validateStringNoExpression( "groupId", problems, Severity.WARNING, Version.V20, model.getGroupId(), model );
+ validateStringNoExpression( "groupId", problems, Severity.WARNING, Version.V20, m.getGroupId(), m );
if ( parent == null )
{
- validateStringNotEmpty( "groupId", problems, Severity.FATAL, Version.V20, model.getGroupId(), model );
+ validateStringNotEmpty( "groupId", problems, Severity.FATAL, Version.V20, m.getGroupId(), m );
}
- validateStringNoExpression( "artifactId", problems, Severity.WARNING, Version.V20, model.getArtifactId(),
- model );
- validateStringNotEmpty( "artifactId", problems, Severity.FATAL, Version.V20, model.getArtifactId(), model );
+ validateStringNoExpression( "artifactId", problems, Severity.WARNING, Version.V20, m.getArtifactId(), m );
+ validateStringNotEmpty( "artifactId", problems, Severity.FATAL, Version.V20, m.getArtifactId(), m );
- validateVersionNoExpression( "version", problems, Severity.WARNING, Version.V20, model.getVersion(), model );
+ validateVersionNoExpression( "version", problems, Severity.WARNING, Version.V20, m.getVersion(), m );
if ( parent == null )
{
- validateStringNotEmpty( "version", problems, Severity.FATAL, Version.V20, model.getVersion(), model );
+ validateStringNotEmpty( "version", problems, Severity.FATAL, Version.V20, m.getVersion(), m );
}
- validate20RawDependencies( problems, model.getDependencies(), "dependencies.dependency", request );
+ validate20RawDependencies( problems, m.getDependencies(), "dependencies.dependency", request );
- if ( model.getDependencyManagement() != null )
+ if ( m.getDependencyManagement() != null )
{
- validate20RawDependencies( problems, model.getDependencyManagement().getDependencies(),
+ validate20RawDependencies( problems, m.getDependencyManagement().getDependencies(),
"dependencyManagement.dependencies.dependency", request );
}
- validateRawRepositories( problems, model.getRepositories(), "repositories.repository", request );
+ validateRawRepositories( problems, m.getRepositories(), "repositories.repository", request );
- validateRawRepositories( problems, model.getPluginRepositories(), "pluginRepositories.pluginRepository",
+ validateRawRepositories( problems, m.getPluginRepositories(), "pluginRepositories.pluginRepository",
request );
- Build build = model.getBuild();
+ Build build = m.getBuild();
if ( build != null )
{
validate20RawPlugins( problems, build.getPlugins(), "build.plugins.plugin", request );
@@ -140,13 +139,14 @@ public class DefaultModelValidator
PluginManagement mngt = build.getPluginManagement();
if ( mngt != null )
{
- validate20RawPlugins( problems, mngt.getPlugins(), "build.pluginManagement.plugins.plugin", request );
+ validate20RawPlugins( problems, mngt.getPlugins(), "build.pluginManagement.plugins.plugin",
+ request );
}
}
Set<String> profileIds = new HashSet<String>();
- for ( Profile profile : model.getProfiles() )
+ for ( Profile profile : m.getProfiles() )
{
String prefix = "profiles.profile[" + profile.getId() + "]";
@@ -156,7 +156,8 @@ public class DefaultModelValidator
"must be unique but found duplicate profile with id " + profile.getId(), profile );
}
- validate30RawProfileActivation( problems, profile.getActivation(), profile.getId(), prefix + ".activation", request );
+ validate30RawProfileActivation( problems, profile.getActivation(), profile.getId(), prefix
+ + ".activation", request );
validate20RawDependencies( problems, profile.getDependencies(), prefix + ".dependencies.dependency",
request );
@@ -226,11 +227,9 @@ public class DefaultModelValidator
Version.V30,
prefix + ( missing ? ".file.missing" : ".file.exists" ),
null,
- "Failed to interpolate file location "
- + path
- + " for profile "
- + sourceHint
- + ": ${project.basedir} expression not supported during profile activation, use ${basedir} instead",
+ "Failed to interpolate file location " + path + " for profile " + sourceHint
+ + ": ${project.basedir} expression not supported during profile activation, "
+ + "use ${basedir} instead",
file.getLocation( missing ? "missing" : "exists" ) );
}
else if ( hasProjectExpression( path ) )
@@ -287,44 +286,44 @@ public class DefaultModelValidator
}
}
- public void validateEffectiveModel( Model model, ModelBuildingRequest request, ModelProblemCollector problems )
+ public void validateEffectiveModel( Model m, ModelBuildingRequest request, ModelProblemCollector problems )
{
- validateStringNotEmpty( "modelVersion", problems, Severity.ERROR, Version.BASE, model.getModelVersion(), model );
+ validateStringNotEmpty( "modelVersion", problems, Severity.ERROR, Version.BASE, m.getModelVersion(), m );
- validateId( "groupId", problems, model.getGroupId(), model );
+ validateId( "groupId", problems, m.getGroupId(), m );
- validateId( "artifactId", problems, model.getArtifactId(), model );
+ validateId( "artifactId", problems, m.getArtifactId(), m );
- validateStringNotEmpty( "packaging", problems, Severity.ERROR, Version.BASE, model.getPackaging(), model );
+ validateStringNotEmpty( "packaging", problems, Severity.ERROR, Version.BASE, m.getPackaging(), m );
- if ( !model.getModules().isEmpty() )
+ if ( !m.getModules().isEmpty() )
{
- if ( !"pom".equals( model.getPackaging() ) )
+ if ( !"pom".equals( m.getPackaging() ) )
{
addViolation( problems, Severity.ERROR, Version.BASE, "packaging", null,
- "with value '" + model.getPackaging() + "' is invalid. Aggregator projects "
- + "require 'pom' as packaging.", model );
+ "with value '" + m.getPackaging() + "' is invalid. Aggregator projects "
+ + "require 'pom' as packaging.", m );
}
- for ( int i = 0, n = model.getModules().size(); i < n; i++ )
+ for ( int i = 0, n = m.getModules().size(); i < n; i++ )
{
- String module = model.getModules().get( i );
+ String module = m.getModules().get( i );
if ( StringUtils.isBlank( module ) )
{
addViolation( problems, Severity.WARNING, Version.BASE, "modules.module[" + i + "]", null,
"has been specified without a path to the project directory.",
- model.getLocation( "modules" ) );
+ m.getLocation( "modules" ) );
}
}
}
- validateStringNotEmpty( "version", problems, Severity.ERROR, Version.BASE, model.getVersion(), model );
+ validateStringNotEmpty( "version", problems, Severity.ERROR, Version.BASE, m.getVersion(), m );
Severity errOn30 = getSeverity( request, ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_0 );
- validateEffectiveDependencies( problems, model.getDependencies(), false, request );
+ validateEffectiveDependencies( problems, m.getDependencies(), false, request );
- DependencyManagement mgmt = model.getDependencyManagement();
+ DependencyManagement mgmt = m.getDependencyManagement();
if ( mgmt != null )
{
validateEffectiveDependencies( problems, mgmt.getDependencies(), true, request );
@@ -333,23 +332,23 @@ public class DefaultModelValidator
if ( request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0 )
{
Set<String> modules = new HashSet<String>();
- for ( int i = 0, n = model.getModules().size(); i < n; i++ )
+ for ( int i = 0, n = m.getModules().size(); i < n; i++ )
{
- String module = model.getModules().get( i );
+ String module = m.getModules().get( i );
if ( !modules.add( module ) )
{
addViolation( problems, Severity.ERROR, Version.V20, "modules.module[" + i + "]", null,
- "specifies duplicate child module " + module, model.getLocation( "modules" ) );
+ "specifies duplicate child module " + module, m.getLocation( "modules" ) );
}
}
Severity errOn31 = getSeverity( request, ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_1 );
- validateBannedCharacters( "version", problems, errOn31, Version.V20, model.getVersion(), null, model,
+ validateBannedCharacters( "version", problems, errOn31, Version.V20, m.getVersion(), null, m,
ILLEGAL_VERSION_CHARS );
- validate20ProperSnapshotVersion( "version", problems, errOn31, Version.V20, model.getVersion(), null, model );
+ validate20ProperSnapshotVersion( "version", problems, errOn31, Version.V20, m.getVersion(), null, m );
- Build build = model.getBuild();
+ Build build = m.getBuild();
if ( build != null )
{
for ( Plugin p : build.getPlugins() )
@@ -357,50 +356,51 @@ public class DefaultModelValidator
validateStringNotEmpty( "build.plugins.plugin.artifactId", problems, Severity.ERROR, Version.V20,
p.getArtifactId(), p );
- validateStringNotEmpty( "build.plugins.plugin.groupId", problems, Severity.ERROR, Version.V20, p.getGroupId(),
- p );
+ validateStringNotEmpty( "build.plugins.plugin.groupId", problems, Severity.ERROR, Version.V20,
+ p.getGroupId(), p );
validate20PluginVersion( "build.plugins.plugin.version", problems, p.getVersion(), p.getKey(), p,
- request );
+ request );
- validateBoolean( "build.plugins.plugin.inherited", problems, errOn30, Version.V20, p.getInherited(), p.getKey(),
- p );
+ validateBoolean( "build.plugins.plugin.inherited", problems, errOn30, Version.V20,
+ p.getInherited(), p.getKey(), p );
- validateBoolean( "build.plugins.plugin.extensions", problems, errOn30, Version.V20, p.getExtensions(),
- p.getKey(), p );
+ validateBoolean( "build.plugins.plugin.extensions", problems, errOn30, Version.V20,
+ p.getExtensions(), p.getKey(), p );
validate20EffectivePluginDependencies( problems, p, request );
}
validate20RawResources( problems, build.getResources(), "build.resources.resource", request );
- validate20RawResources( problems, build.getTestResources(), "build.testResources.testResource", request );
+ validate20RawResources( problems, build.getTestResources(), "build.testResources.testResource",
+ request );
}
- Reporting reporting = model.getReporting();
+ Reporting reporting = m.getReporting();
if ( reporting != null )
{
for ( ReportPlugin p : reporting.getPlugins() )
{
- validateStringNotEmpty( "reporting.plugins.plugin.artifactId", problems, Severity.ERROR, Version.V20,
- p.getArtifactId(), p );
+ validateStringNotEmpty( "reporting.plugins.plugin.artifactId", problems, Severity.ERROR,
+ Version.V20, p.getArtifactId(), p );
validateStringNotEmpty( "reporting.plugins.plugin.groupId", problems, Severity.ERROR, Version.V20,
p.getGroupId(), p );
}
}
- for ( Repository repository : model.getRepositories() )
+ for ( Repository repository : m.getRepositories() )
{
validate20EffectiveRepository( problems, repository, "repositories.repository", request );
}
- for ( Repository repository : model.getPluginRepositories() )
+ for ( Repository repository : m.getPluginRepositories() )
{
validate20EffectiveRepository( problems, repository, "pluginRepositories.pluginRepository", request );
}
- DistributionManagement distMgmt = model.getDistributionManagement();
+ DistributionManagement distMgmt = m.getDistributionManagement();
if ( distMgmt != null )
{
if ( distMgmt.getStatus() != null )
@@ -409,15 +409,16 @@ public class DefaultModelValidator
"must not be specified.", distMgmt );
}
- validate20EffectiveRepository( problems, distMgmt.getRepository(), "distributionManagement.repository", request );
+ validate20EffectiveRepository( problems, distMgmt.getRepository(), "distributionManagement.repository",
+ request );
validate20EffectiveRepository( problems, distMgmt.getSnapshotRepository(),
"distributionManagement.snapshotRepository", request );
}
}
}
- private void validate20RawDependencies( ModelProblemCollector problems, List<Dependency> dependencies, String prefix,
- ModelBuildingRequest request )
+ private void validate20RawDependencies( ModelProblemCollector problems, List<Dependency> dependencies,
+ String prefix, ModelBuildingRequest request )
{
Severity errOn30 = getSeverity( request, ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_0 );
Severity errOn31 = getSeverity( request, ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_1 );
@@ -501,25 +502,27 @@ public class DefaultModelValidator
if ( request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0 )
{
- validateBoolean( prefix + "optional", problems, errOn30, Version.V20, d.getOptional(), d.getManagementKey(), d );
+ validateBoolean( prefix + "optional", problems, errOn30, Version.V20, d.getOptional(),
+ d.getManagementKey(), d );
if ( !management )
{
- validateVersion( prefix + "version", problems, errOn30, Version.V20, d.getVersion(), d.getManagementKey(), d );
+ validateVersion( prefix + "version", problems, errOn30, Version.V20, d.getVersion(),
+ d.getManagementKey(), d );
/*
* TODO: Extensions like Flex Mojos use custom scopes like "merged", "internal", "external", etc.
* In order to don't break backward-compat with those, only warn but don't error out.
*/
- validateEnum( prefix + "scope", problems, Severity.WARNING, Version.V20, d.getScope(), d.getManagementKey(), d,
- "provided", "compile", "runtime", "test", "system" );
+ validateEnum( prefix + "scope", problems, Severity.WARNING, Version.V20, d.getScope(),
+ d.getManagementKey(), d, "provided", "compile", "runtime", "test", "system" );
}
}
}
}
private void validate20EffectivePluginDependencies( ModelProblemCollector problems, Plugin plugin,
- ModelBuildingRequest request )
+ ModelBuildingRequest request )
{
List<Dependency> dependencies = plugin.getDependencies();
@@ -533,10 +536,11 @@ public class DefaultModelValidator
{
validateEffectiveDependency( problems, d, false, prefix, request );
- validateVersion( prefix + "version", problems, errOn30, Version.BASE, d.getVersion(), d.getManagementKey(), d );
+ validateVersion( prefix + "version", problems, errOn30, Version.BASE, d.getVersion(),
+ d.getManagementKey(), d );
- validateEnum( prefix + "scope", problems, errOn30, Version.BASE, d.getScope(), d.getManagementKey(), d, "compile",
- "runtime", "system" );
+ validateEnum( prefix + "scope", problems, errOn30, Version.BASE, d.getScope(), d.getManagementKey(), d,
+ "compile", "runtime", "system" );
}
}
}
@@ -544,16 +548,19 @@ public class DefaultModelValidator
private void validateEffectiveDependency( ModelProblemCollector problems, Dependency d, boolean management,
String prefix, ModelBuildingRequest request )
{
- validateId( prefix + "artifactId", problems, Severity.ERROR, Version.BASE, d.getArtifactId(), d.getManagementKey(), d );
+ validateId( prefix + "artifactId", problems, Severity.ERROR, Version.BASE, d.getArtifactId(),
+ d.getManagementKey(), d );
- validateId( prefix + "groupId", problems, Severity.ERROR, Version.BASE, d.getGroupId(), d.getManagementKey(), d );
+ validateId( prefix + "groupId", problems, Severity.ERROR, Version.BASE, d.getGroupId(), d.getManagementKey(),
+ d );
if ( !management )
{
- validateStringNotEmpty( prefix + "type", problems, Severity.ERROR, Version.BASE, d.getType(), d.getManagementKey(), d );
+ validateStringNotEmpty( prefix + "type", problems, Severity.ERROR, Version.BASE, d.getType(),
+ d.getManagementKey(), d );
- validateStringNotEmpty( prefix + "version", problems, Severity.ERROR, Version.BASE, d.getVersion(), d.getManagementKey(),
- d );
+ validateStringNotEmpty( prefix + "version", problems, Severity.ERROR, Version.BASE, d.getVersion(),
+ d.getManagementKey(), d );
}
if ( "system".equals( d.getScope() ) )
@@ -562,8 +569,8 @@ public class DefaultModelValidator
if ( StringUtils.isEmpty( systemPath ) )
{
- addViolation( problems, Severity.ERROR, Version.BASE, prefix + "systemPath", d.getManagementKey(), "is missing.",
- d );
+ addViolation( problems, Severity.ERROR, Version.BASE, prefix + "systemPath", d.getManagementKey(),
+ "is missing.", d );
}
else
{
@@ -583,14 +590,16 @@ public class DefaultModelValidator
{
msg += ". Please verify that you run Maven using a JDK and not just a JRE.";
}
- addViolation( problems, Severity.WARNING, Version.BASE, prefix + "systemPath", d.getManagementKey(), msg, d );
+ addViolation( problems, Severity.WARNING, Version.BASE, prefix + "systemPath",
+ d.getManagementKey(), msg, d );
}
}
}
else if ( StringUtils.isNotEmpty( d.getSystemPath() ) )
{
- addViolation( problems, Severity.ERROR, Version.BASE, prefix + "systemPath", d.getManagementKey(), "must be omitted."
- + " This field may only be specified for a dependency with system scope.", d );
+ addViolation( problems, Severity.ERROR, Version.BASE, prefix + "systemPath", d.getManagementKey(),
+ "must be omitted." + " This field may only be specified for a dependency with system scope.",
+ d );
}
if ( request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0 )
@@ -607,11 +616,11 @@ public class DefaultModelValidator
}
else
{
- validateIdWithWildcards( prefix + "exclusions.exclusion.groupId", problems, Severity.WARNING, Version.V30,
- exclusion.getGroupId(), d.getManagementKey(), exclusion );
+ validateIdWithWildcards( prefix + "exclusions.exclusion.groupId", problems, Severity.WARNING,
+ Version.V30, exclusion.getGroupId(), d.getManagementKey(), exclusion );
- validateIdWithWildcards( prefix + "exclusions.exclusion.artifactId", problems, Severity.WARNING, Version.V30,
- exclusion.getArtifactId(), d.getManagementKey(), exclusion );
+ validateIdWithWildcards( prefix + "exclusions.exclusion.artifactId", problems, Severity.WARNING,
+ Version.V30, exclusion.getArtifactId(), d.getManagementKey(), exclusion );
}
}
}
@@ -624,7 +633,8 @@ public class DefaultModelValidator
for ( Repository repository : repositories )
{
- validateStringNotEmpty( prefix + ".id", problems, Severity.ERROR, Version.V20, repository.getId(), repository );
+ validateStringNotEmpty( prefix + ".id", problems, Severity.ERROR, Version.V20, repository.getId(),
+ repository );
validateStringNotEmpty( prefix + "[" + repository.getId() + "].url", problems, Severity.ERROR, Version.V20,
repository.getUrl(), repository );
@@ -637,8 +647,9 @@ public class DefaultModelValidator
{
Severity errOn30 = getSeverity( request, ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_0 );
- addViolation( problems, errOn30, Version.V20, prefix + ".id", null, "must be unique: " + repository.getId() + " -> "
- + existing.getUrl() + " vs " + repository.getUrl(), repository );
+ addViolation( problems, errOn30, Version.V20, prefix + ".id", null,
+ "must be unique: " + repository.getId() + " -> " + existing.getUrl() + " vs "
+ + repository.getUrl(), repository );
}
else
{
@@ -654,8 +665,8 @@ public class DefaultModelValidator
{
Severity errOn31 = getSeverity( request, ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_1 );
- validateBannedCharacters( prefix + ".id", problems, errOn31, Version.V20, repository.getId(), null, repository,
- ILLEGAL_REPO_ID_CHARS );
+ validateBannedCharacters( prefix + ".id", problems, errOn31, Version.V20, repository.getId(), null,
+ repository, ILLEGAL_REPO_ID_CHARS );
if ( "local".equals( repository.getId() ) )
{
@@ -679,8 +690,8 @@ public class DefaultModelValidator
for ( Resource resource : resources )
{
- validateStringNotEmpty( prefix + ".directory", problems, Severity.ERROR, Version.V20, resource.getDirectory(),
- resource );
+ validateStringNotEmpty( prefix + ".directory", problems, Severity.ERROR, Version.V20,
+ resource.getDirectory(), resource );
validateBoolean( prefix + ".filtering", problems, errOn30, Version.V20, resource.getFiltering(),
resource.getDirectory(), resource );
@@ -697,8 +708,8 @@ public class DefaultModelValidator
return validateId( fieldName, problems, Severity.ERROR, Version.BASE, id, null, tracker );
}
- private boolean validateId( String fieldName, ModelProblemCollector problems, Severity severity, Version version, String id,
- String sourceHint, InputLocationTracker tracker )
+ private boolean validateId( String fieldName, ModelProblemCollector problems, Severity severity, Version version,
+ String id, String sourceHint, InputLocationTracker tracker )
{
if ( !validateStringNotEmpty( fieldName, problems, severity, version, id, sourceHint, tracker ) )
{
@@ -716,8 +727,9 @@ public class DefaultModelValidator
}
}
- private boolean validateIdWithWildcards( String fieldName, ModelProblemCollector problems, Severity severity, Version version, String id,
- String sourceHint, InputLocationTracker tracker )
+ private boolean validateIdWithWildcards( String fieldName, ModelProblemCollector problems, Severity severity,
+ Version version, String id, String sourceHint,
+ InputLocationTracker tracker )
{
if ( !validateStringNotEmpty( fieldName, problems, severity, version, id, sourceHint, tracker ) )
{
@@ -736,8 +748,8 @@ public class DefaultModelValidator
}
- private boolean validateStringNoExpression( String fieldName, ModelProblemCollector problems, Severity severity, Version version,
- String string, InputLocationTracker tracker )
+ private boolean validateStringNoExpression( String fieldName, ModelProblemCollector problems, Severity severity,
+ Version version, String string, InputLocationTracker tracker )
{
if ( !hasExpression( string ) )
{
@@ -788,8 +800,8 @@ public class DefaultModelValidator
return value != null && value.contains( "${project." );
}
- private boolean validateStringNotEmpty( String fieldName, ModelProblemCollector problems, Severity severity, Version version,
- String string, InputLocationTracker tracker )
+ private boolean validateStringNotEmpty( String fieldName, ModelProblemCollector problems, Severity severity,
+ Version version, String string, InputLocationTracker tracker )
{
return validateStringNotEmpty( fieldName, problems, severity, version, string, null, tracker );
}
@@ -802,8 +814,9 @@ public class DefaultModelValidator
* <li><code>string.length > 0</code>
* </ul>
*/
- private boolean validateStringNotEmpty( String fieldName, ModelProblemCollector problems, Severity severity, Version version,
- String string, String sourceHint, InputLocationTracker tracker )
+ private boolean validateStringNotEmpty( String fieldName, ModelProblemCollector problems, Severity severity,
+ Version version, String string, String sourceHint,
+ InputLocationTracker tracker )
{
if ( !validateNotNull( fieldName, problems, severity, version, string, sourceHint, tracker ) )
{
@@ -827,8 +840,8 @@ public class DefaultModelValidator
* <li><code>string != null</code>
* </ul>
*/
- private boolean validateNotNull( String fieldName, ModelProblemCollector problems, Severity severity, Version version,
- Object object, String sourceHint, InputLocationTracker tracker )
+ private boolean validateNotNull( String fieldName, ModelProblemCollector problems, Severity severity,
+ Version version, Object object, String sourceHint, InputLocationTracker tracker )
{
if ( object != null )
{
@@ -860,7 +873,8 @@ public class DefaultModelValidator
}
private boolean validateEnum( String fieldName, ModelProblemCollector problems, Severity severity, Version version,
- String string, String sourceHint, InputLocationTracker tracker, String... validValues )
+ String string, String sourceHint, InputLocationTracker tracker,
+ String... validValues )
{
if ( string == null || string.length() <= 0 )
{
@@ -874,8 +888,8 @@ public class DefaultModelValidator
return true;
}
- addViolation( problems, severity, version, fieldName, sourceHint, "must be one of " + values + " but is '" + string
- + "'.", tracker );
+ addViolation( problems, severity, version, fieldName, sourceHint, "must be one of " + values + " but is '"
+ + string + "'.", tracker );
return false;
}
@@ -933,7 +947,7 @@ public class DefaultModelValidator
if ( string.endsWith( "SNAPSHOT" ) && !string.endsWith( "-SNAPSHOT" ) )
{
addViolation( problems, severity, version, fieldName, sourceHint,
- "uses an unsupported snapshot version format" + ", should be '*-SNAPSHOT' instead.", tracker );
+ "uses an unsupported snapshot version format, should be '*-SNAPSHOT' instead.", tracker );
return false;
}
@@ -968,7 +982,8 @@ public class DefaultModelValidator
}
private static void addViolation( ModelProblemCollector problems, Severity severity, Version version,
- String fieldName, String sourceHint, String message, InputLocationTracker tracker )
+ String fieldName, String sourceHint, String message,
+ InputLocationTracker tracker )
{
StringBuilder buffer = new StringBuilder( 256 );
buffer.append( '\'' ).append( fieldName ).append( '\'' );
http://git-wip-us.apache.org/repos/asf/maven/blob/366f57c5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3f1f79c..34e140b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>24</version>
+ <version>25</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
@@ -67,6 +67,8 @@
<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.excludes>**/package-info.java</checkstyle.excludes>
</properties>
<modules>
@@ -454,14 +456,6 @@
<exclude>**/*.odg</exclude>
</excludes>
</configuration>
- <executions>
- <execution>
- <id>check</id>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
@@ -512,25 +506,6 @@
</execution>
</executions>
</plugin>
- <plugin><!-- TODO remove when upgrading to maven-parent 25 -->
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-bytecode-version</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <enforceBytecodeVersion>
- <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
- </enforceBytecodeVersion>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-doap-plugin</artifactId>