diff --git a/maven-core/src/main/java/org/apache/maven/DefaultProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/DefaultProjectDependencyGraph.java index adf85da7ac..84d2cc51e2 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultProjectDependencyGraph.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultProjectDependencyGraph.java @@ -76,12 +76,9 @@ private void getDownstreamProjects( String projectId, Collection project { for ( String id : sorter.getDependents( projectId ) ) { - if ( projectIds.add( id ) ) + if ( projectIds.add( id ) && transitive ) { - if ( transitive ) - { - getDownstreamProjects( id, projectIds, transitive ); - } + getDownstreamProjects( id, projectIds, transitive ); } } } diff --git a/maven-core/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java b/maven-core/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java index e3538c3872..62991f11dd 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java @@ -48,7 +48,7 @@ protected InvalidRepositoryException( String message, String repositoryId, Compo @Deprecated public InvalidRepositoryException( String message, Throwable t ) { - super( message ); + super( message, t ); this.repositoryId = null; } 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 1e103e9451..1feebab108 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 @@ -242,12 +242,9 @@ public ArtifactRepository createLocalRepository( MavenExecutionRequest request ) private void baseDirectory( MavenExecutionRequest request ) { - if ( request.getBaseDirectory() == null ) + if ( request.getBaseDirectory() == null && request.getPom() != null ) { - if ( request.getPom() != null ) - { - request.setBaseDirectory( request.getPom().getAbsoluteFile().getParentFile() ); - } + request.setBaseDirectory( request.getPom().getAbsoluteFile().getParentFile() ); } } diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java index 121e51acdf..dfa20c429c 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java @@ -177,12 +177,12 @@ public interface MavenExecutionRequest * * @param degreeOfConcurrency */ - public void setDegreeOfConcurrency( final int degreeOfConcurrency ); + void setDegreeOfConcurrency( int degreeOfConcurrency ); /** * @return the degree of concurrency for the build. */ - public int getDegreeOfConcurrency(); + int getDegreeOfConcurrency(); // Recursive (really to just process the top-level POM) MavenExecutionRequest setRecursive( boolean recursive ); diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java index 95a0fe68ce..575292b2da 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java @@ -75,12 +75,9 @@ public List calculateTaskSegments( MavenSession session ) List tasks = session.getGoals(); - if ( tasks == null || tasks.isEmpty() ) + if ( ( tasks == null || tasks.isEmpty() ) && !StringUtils.isEmpty( rootProject.getDefaultGoal() ) ) { - if ( !StringUtils.isEmpty( rootProject.getDefaultGoal() ) ) - { - tasks = Arrays.asList( StringUtils.split( rootProject.getDefaultGoal() ) ); - } + tasks = Arrays.asList( StringUtils.split( rootProject.getDefaultGoal() ) ); } return calculateTaskSegments( session, tasks ); diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java index 4b85aa32a1..6ecc3e33b9 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java @@ -27,7 +27,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.concurrent.CountDownLatch; /** * Wraps individual MojoExecutions, containing information about completion status and scheduling. diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java index 113a5ab3ef..6fe7e585e3 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java @@ -51,7 +51,7 @@ List calculateTaskSegments( MavenSession session ) MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, PluginVersionResolutionException, LifecyclePhaseNotFoundException, LifecycleNotFoundException; - public List calculateTaskSegments( MavenSession session, List tasks ) + List calculateTaskSegments( MavenSession session, List tasks ) throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, PluginVersionResolutionException; 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 cf5db3e4f1..560e454da7 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 @@ -37,7 +37,7 @@ public interface ExtensionRealmCache { - public static class CacheRecord + static class CacheRecord { public final ClassRealm realm; 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 df07d4cd93..fe0ef15f33 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,7 +47,7 @@ interface Key // marker interface for cache keys } - public static class CacheRecord + static class CacheRecord { public final List artifacts; 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 7c04ed5bb6..11e981ba60 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 @@ -41,7 +41,7 @@ public interface PluginRealmCache { - public static class CacheRecord + static class CacheRecord { public final ClassRealm realm; diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java index 8153aed8e7..a1b735e5d9 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java @@ -224,7 +224,7 @@ public boolean visitEnter( DependencyNode node ) org.eclipse.aether.graph.Dependency dep = node.getDependency(); if ( dep != null ) { - org.eclipse.aether.artifact.Artifact art = dep.getArtifact(); + Artifact art = dep.getArtifact(); buffer.append( art ); buffer.append( ':' ).append( dep.getScope() ); diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java index 91038b382e..0e83e40750 100644 --- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java +++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java @@ -71,7 +71,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; @@ -486,12 +485,9 @@ public void addScriptSourceRoot( String path ) if ( path != null ) { path = path.trim(); - if ( path.length() != 0 ) + if ( path.length() != 0 && !getScriptSourceRoots().contains( path ) ) { - if ( !getScriptSourceRoots().contains( path ) ) - { - getScriptSourceRoots().add( path ); - } + getScriptSourceRoots().add( path ); } } } @@ -529,13 +525,11 @@ public List getCompileClasspathElements() for ( Artifact a : getArtifacts() ) { - if ( a.getArtifactHandler().isAddedToClasspath() ) + if ( a.getArtifactHandler().isAddedToClasspath() + // TODO: let the scope handler deal with this + && ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() ) || Artifact.SCOPE_SYSTEM.equals( a.getScope() ) ) ) { - // TODO: let the scope handler deal with this - if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() ) || Artifact.SCOPE_SYSTEM.equals( a.getScope() ) ) - { - addArtifactPath( a, list ); - } + addArtifactPath( a, list ); } } @@ -550,13 +544,11 @@ public List getCompileArtifacts() for ( Artifact a : getArtifacts() ) { // TODO: classpath check doesn't belong here - that's the other method - if ( a.getArtifactHandler().isAddedToClasspath() ) + if ( a.getArtifactHandler().isAddedToClasspath() + // TODO: let the scope handler deal with this + && ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() ) || Artifact.SCOPE_SYSTEM.equals( a.getScope() ) ) ) { - // TODO: let the scope handler deal with this - if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() ) || Artifact.SCOPE_SYSTEM.equals( a.getScope() ) ) - { - list.add( a ); - } + list.add( a ); } } return list; @@ -681,13 +673,11 @@ public List getRuntimeClasspathElements() for ( Artifact a : getArtifacts() ) { - if ( a.getArtifactHandler().isAddedToClasspath() ) + if ( a.getArtifactHandler().isAddedToClasspath() + // TODO: let the scope handler deal with this + && ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_RUNTIME.equals( a.getScope() ) ) ) { - // TODO: let the scope handler deal with this - if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_RUNTIME.equals( a.getScope() ) ) - { - addArtifactPath( a, list ); - } + addArtifactPath( a, list ); } } return list; @@ -701,13 +691,11 @@ public List getRuntimeArtifacts() for ( Artifact a : getArtifacts() ) { // TODO: classpath check doesn't belong here - that's the other method - if ( a.getArtifactHandler().isAddedToClasspath() ) + if ( a.getArtifactHandler().isAddedToClasspath() + // TODO: let the scope handler deal with this + && ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_RUNTIME.equals( a.getScope() ) ) ) { - // TODO: let the scope handler deal with this - if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_RUNTIME.equals( a.getScope() ) ) - { - list.add( a ); - } + list.add( a ); } } return list; @@ -758,13 +746,11 @@ public List getSystemClasspathElements() for ( Artifact a : getArtifacts() ) { - if ( a.getArtifactHandler().isAddedToClasspath() ) + if ( a.getArtifactHandler().isAddedToClasspath() + // TODO: let the scope handler deal with this + && Artifact.SCOPE_SYSTEM.equals( a.getScope() ) ) { - // TODO: let the scope handler deal with this - if ( Artifact.SCOPE_SYSTEM.equals( a.getScope() ) ) - { - addArtifactPath( a, list ); - } + addArtifactPath( a, list ); } } return list; @@ -778,13 +764,11 @@ public List getSystemArtifacts() for ( Artifact a : getArtifacts() ) { // TODO: classpath check doesn't belong here - that's the other method - if ( a.getArtifactHandler().isAddedToClasspath() ) + if ( a.getArtifactHandler().isAddedToClasspath() + // TODO: let the scope handler deal with this + && Artifact.SCOPE_SYSTEM.equals( a.getScope() ) ) { - // TODO: let the scope handler deal with this - if ( Artifact.SCOPE_SYSTEM.equals( a.getScope() ) ) - { - list.add( a ); - } + list.add( a ); } } return list; @@ -1892,26 +1876,22 @@ protected void setScriptSourceRoots( List scriptSourceRoots ) protected ArtifactRepository getReleaseArtifactRepository() { - if ( releaseArtifactRepository == null ) + if ( releaseArtifactRepository == null && getDistributionManagement() != null + && getDistributionManagement().getRepository() != null ) { - if ( getDistributionManagement() != null && getDistributionManagement().getRepository() != null ) + checkProjectBuildingRequest(); + try { - checkProjectBuildingRequest(); - try - { - ArtifactRepository repo = - repositorySystem.buildArtifactRepository( getDistributionManagement().getRepository() ); - repositorySystem.injectProxy( projectBuilderConfiguration.getRepositorySession(), - Arrays.asList( repo ) ); - repositorySystem.injectAuthentication( projectBuilderConfiguration.getRepositorySession(), - Arrays.asList( repo ) ); - setReleaseArtifactRepository( repo ); - } - catch ( InvalidRepositoryException e ) - { - throw new IllegalStateException( "Failed to create release distribution repository for " + getId(), - e ); - } + ArtifactRepository repo = + repositorySystem.buildArtifactRepository( getDistributionManagement().getRepository() ); + repositorySystem.injectProxy( projectBuilderConfiguration.getRepositorySession(), Arrays.asList( repo ) ); + repositorySystem.injectAuthentication( projectBuilderConfiguration.getRepositorySession(), + Arrays.asList( repo ) ); + setReleaseArtifactRepository( repo ); + } + catch ( InvalidRepositoryException e ) + { + throw new IllegalStateException( "Failed to create release distribution repository for " + getId(), e ); } } @@ -1920,27 +1900,22 @@ protected ArtifactRepository getReleaseArtifactRepository() protected ArtifactRepository getSnapshotArtifactRepository() { - if ( snapshotArtifactRepository == null ) + if ( snapshotArtifactRepository == null && getDistributionManagement() != null + && getDistributionManagement().getSnapshotRepository() != null ) { - if ( getDistributionManagement() != null && getDistributionManagement().getSnapshotRepository() != null ) + checkProjectBuildingRequest(); + try { - checkProjectBuildingRequest(); - try - { - ArtifactRepository repo = - repositorySystem.buildArtifactRepository( getDistributionManagement().getSnapshotRepository() ); - repositorySystem.injectProxy( projectBuilderConfiguration.getRepositorySession(), - Arrays.asList( repo ) ); - repositorySystem.injectAuthentication( projectBuilderConfiguration.getRepositorySession(), - Arrays.asList( repo ) ); - setSnapshotArtifactRepository( repo ); - } - catch ( InvalidRepositoryException e ) - { - throw new IllegalStateException( - "Failed to create snapshot distribution repository for " + getId(), - e ); - } + ArtifactRepository repo = + repositorySystem.buildArtifactRepository( getDistributionManagement().getSnapshotRepository() ); + repositorySystem.injectProxy( projectBuilderConfiguration.getRepositorySession(), Arrays.asList( repo ) ); + repositorySystem.injectAuthentication( projectBuilderConfiguration.getRepositorySession(), + Arrays.asList( repo ) ); + setSnapshotArtifactRepository( repo ); + } + catch ( InvalidRepositoryException e ) + { + throw new IllegalStateException( "Failed to create snapshot distribution repository for " + getId(), e ); } } 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 456cfa90e7..415eab996b 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 @@ -35,7 +35,7 @@ public interface ProjectRealmCache { - public static class CacheRecord + static class CacheRecord { public final ClassRealm realm; 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 002134b4d3..f2fc322b34 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 @@ -157,13 +157,11 @@ public ResolutionGroup retrieve( MetadataResolutionRequest request ) cache.get( artifact, request.isResolveManagedVersions(), request.getLocalRepository(), request.getRemoteRepositories() ); - if ( cached != null ) + if ( cached != null + // if the POM has no file, we cached a missing artifact, only return the cached data if no update forced + && ( !request.isForceUpdate() || hasFile( cached.getPomArtifact() ) ) ) { - // if the POM has no file, we cached a missing artifact, only return the cached data if no update forced - if ( !request.isForceUpdate() || hasFile( cached.getPomArtifact() ) ) - { - return cached; - } + return cached; } List dependencies;