You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2017/03/11 17:46:15 UTC
[1/4] maven git commit: [MNG-6170] NPE in cases using Multithreaded
-T X versions:set -DnewVersion=1.0-SNAPSHOT o In some cases the code will
return a null which should not be scheduled. [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-6057 d45c316b1 -> 9d1fce536 (forced update)
[MNG-6170] NPE in cases using Multithreaded -T X versions:set
-DnewVersion=1.0-SNAPSHOT
o In some cases the code will return a null which should
not be scheduled.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7cdff43a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7cdff43a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7cdff43a
Branch: refs/heads/MNG-6057
Commit: 7cdff43aba436408c79d2b4afc169b9c6909235a
Parents: 587317b
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Sun Feb 12 12:59:25 2017 +0100
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Sat Mar 11 12:00:24 2017 +0100
----------------------------------------------------------------------
.../multithreaded/MultiThreadedBuilder.java | 27 ++++++++++++--------
1 file changed, 16 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/7cdff43a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
index 072aec8..1414a12 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
@@ -55,6 +55,7 @@ import org.codehaus.plexus.logging.Logger;
* @since 3.0
* @author Kristian Rosenvold
* Builds one or more lifecycles for a full module
+ * NOTE: This class is not part of any public api and can be changed or deleted without prior notice.
*/
@Component( role = Builder.class, hint = "multithreaded" )
public class MultiThreadedBuilder
@@ -67,7 +68,6 @@ public class MultiThreadedBuilder
@Requirement
private LifecycleModuleBuilder lifecycleModuleBuilder;
-
public MultiThreadedBuilder()
{
}
@@ -142,15 +142,20 @@ public class MultiThreadedBuilder
{
break;
}
- final List<MavenProject> newItemsThatCanBeBuilt =
- analyzer.markAsFinished( projectBuild.getProject() );
- for ( MavenProject mavenProject : newItemsThatCanBeBuilt )
+
+ // MNG-6170: Only schedule other modules from reactor if we have more modules to build than one.
+ if ( analyzer.getNumberOfBuilds() > 1 )
{
- ProjectSegment scheduledDependent = projectBuildList.get( mavenProject );
- logger.debug( "Scheduling: " + scheduledDependent );
- Callable<ProjectSegment> cb =
- createBuildCallable( rootSession, scheduledDependent, reactorContext, taskSegment, muxer );
- service.submit( cb );
+ final List<MavenProject> newItemsThatCanBeBuilt =
+ analyzer.markAsFinished( projectBuild.getProject() );
+ for ( MavenProject mavenProject : newItemsThatCanBeBuilt )
+ {
+ ProjectSegment scheduledDependent = projectBuildList.get( mavenProject );
+ logger.debug( "Scheduling: " + scheduledDependent );
+ Callable<ProjectSegment> cb =
+ createBuildCallable( rootSession, scheduledDependent, reactorContext, taskSegment, muxer );
+ service.submit( cb );
+ }
}
}
catch ( InterruptedException e )
@@ -160,13 +165,13 @@ public class MultiThreadedBuilder
}
catch ( ExecutionException e )
{
- // TODO MNG-5766 changes likely made this redundant
+ // TODO MNG-5766 changes likely made this redundant
rootSession.getResult().addException( e );
break;
}
}
- // cancel outstanding builds (if any) - this can happen if an exception is thrown in above block
+ // cancel outstanding builds (if any) - this can happen if an exception is thrown in above block
Future<ProjectSegment> unprocessed;
while ( ( unprocessed = service.poll() ) != null )
[2/4] maven git commit: fixed typos
Posted by kh...@apache.org.
fixed typos
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/24b9ef48
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/24b9ef48
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/24b9ef48
Branch: refs/heads/MNG-6057
Commit: 24b9ef48f6045c3cca7297f4b7b94d3ee71b3718
Parents: 7cdff43
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sat Mar 11 18:19:02 2017 +0100
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Sat Mar 11 18:19:02 2017 +0100
----------------------------------------------------------------------
.../lifecycle/internal/DefaultLifecycleMappingDelegate.java | 2 +-
.../maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java | 4 ++--
.../src/site/resources/design/2.1-lifecycle-refactor.graffle | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/24b9ef48/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
index 8348530..db974bc 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
@@ -79,7 +79,7 @@ public class DefaultLifecycleMappingDelegate
/*
* Grab plugin executions that are bound to the selected lifecycle phases from project. The effective model of
* the project already contains the plugin executions induced by the project's packaging type. Remember, all
- * phases of interest and only those are in the lifecyle mapping, if a phase has no value in the map, we are not
+ * phases of interest and only those are in the lifecycle mapping, if a phase has no value in the map, we are not
* interested in any of the executions bound to it.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/24b9ef48/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
index 9e402e6..aec785f 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
@@ -73,7 +73,7 @@ public class DefaultLifecyclePluginAnalyzer
// together and this really shows the problem of constructing a sensible default configuration but
// it's all encapsulated here so it appears normalized to the POM builder.
- // We are going to take the project packaging and find all plugin in the default lifecycle and create
+ // We are going to take the project packaging and find all plugins in the default lifecycle and create
// fully populated Plugin objects, including executions with goals and default configuration taken
// from the plugin.xml inside a plugin.
//
@@ -82,7 +82,7 @@ public class DefaultLifecyclePluginAnalyzer
{
if ( logger.isDebugEnabled() )
{
- logger.debug( "Looking up lifecyle mappings for packaging " + packaging + " from "
+ logger.debug( "Looking up lifecycle mappings for packaging " + packaging + " from "
+ Thread.currentThread().getContextClassLoader() );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/24b9ef48/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle
----------------------------------------------------------------------
diff --git a/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle b/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle
index 722bc03..58811ba 100755
--- a/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle
+++ b/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle
@@ -3548,7 +3548,7 @@ uses plugin prefix}</string>
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-\f0\b\fs24 \cf0 \ul \ulc0 LifecyleBindingManager}</string>
+\f0\b\fs24 \cf0 \ul \ulc0 LifecycleBindingManager}</string>
</dict>
</dict>
</array>
[4/4] maven git commit: [MNG-6090] CI friendly properties break
submodule builds [MNG-6057] Problem with CI friendly usage of ${..} reactor
order is changed o Based on the missing replacement of the versions
${revision} ${changelist} or ${sha1} withi
Posted by kh...@apache.org.
[MNG-6090] CI friendly properties break submodule builds
[MNG-6057] Problem with CI friendly usage of ${..} reactor order is changed
o Based on the missing replacement of the versions ${revision}
${changelist} or ${sha1} within the parent element the order
of the reactor changes.
[MNG-5895] Problem with CI friendly usage of ${..} which is already
defined via property in pom file.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/9d1fce53
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9d1fce53
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9d1fce53
Branch: refs/heads/MNG-6057
Commit: 9d1fce536e49fa7492078905957057ca39b92f18
Parents: ab2e24f
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Tue Sep 29 11:46:48 2015 +0200
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Sat Mar 11 18:46:04 2017 +0100
----------------------------------------------------------------------
.../resolver/DefaultArtifactResolver.java | 46 ++++++++------------
.../model/building/DefaultModelBuilder.java | 35 +++++++++++++--
.../AbstractStringBasedModelInterpolator.java | 33 +++++++++++---
3 files changed, 77 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/9d1fce53/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index b78846b..93a5919 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -22,10 +22,12 @@ package org.apache.maven.artifact.resolver;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
@@ -149,21 +151,21 @@ public class DefaultArtifactResolver
public void resolve( Artifact artifact, List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository, TransferListener resolutionListener )
- throws ArtifactResolutionException, ArtifactNotFoundException
+ throws ArtifactResolutionException, ArtifactNotFoundException
{
resolve( artifact, remoteRepositories, getSession( localRepository ) );
}
public void resolveAlways( Artifact artifact, List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository )
- throws ArtifactResolutionException, ArtifactNotFoundException
+ throws ArtifactResolutionException, ArtifactNotFoundException
{
resolve( artifact, remoteRepositories, getSession( localRepository ) );
}
private void resolve( Artifact artifact, List<ArtifactRepository> remoteRepositories,
RepositorySystemSession session )
- throws ArtifactResolutionException, ArtifactNotFoundException
+ throws ArtifactResolutionException, ArtifactNotFoundException
{
if ( artifact == null )
{
@@ -255,8 +257,7 @@ public class DefaultArtifactResolver
ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter )
- throws ArtifactResolutionException,
- ArtifactNotFoundException
+ throws ArtifactResolutionException, ArtifactNotFoundException
{
return resolveTransitively( artifacts, originatingArtifact, Collections.EMPTY_MAP, localRepository,
remoteRepositories, source, filter );
@@ -268,8 +269,7 @@ public class DefaultArtifactResolver
ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source )
- throws ArtifactResolutionException,
- ArtifactNotFoundException
+ throws ArtifactResolutionException, ArtifactNotFoundException
{
return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository,
remoteRepositories, source, null );
@@ -280,8 +280,7 @@ public class DefaultArtifactResolver
ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter )
- throws ArtifactResolutionException,
- ArtifactNotFoundException
+ throws ArtifactResolutionException, ArtifactNotFoundException
{
return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository,
remoteRepositories, source, filter, null );
@@ -291,8 +290,7 @@ public class DefaultArtifactResolver
List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository,
ArtifactMetadataSource source )
- throws ArtifactResolutionException,
- ArtifactNotFoundException
+ throws ArtifactResolutionException, ArtifactNotFoundException
{
return resolveTransitively( artifacts, originatingArtifact, localRepository, remoteRepositories, source, null );
}
@@ -302,8 +300,7 @@ public class DefaultArtifactResolver
ArtifactRepository localRepository,
ArtifactMetadataSource source,
List<ResolutionListener> listeners )
- throws ArtifactResolutionException,
- ArtifactNotFoundException
+ throws ArtifactResolutionException, ArtifactNotFoundException
{
return resolveTransitively( artifacts, originatingArtifact, Collections.EMPTY_MAP, localRepository,
remoteRepositories, source, null, listeners );
@@ -315,8 +312,7 @@ public class DefaultArtifactResolver
List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter,
List<ResolutionListener> listeners )
- throws ArtifactResolutionException,
- ArtifactNotFoundException
+ throws ArtifactResolutionException, ArtifactNotFoundException
{
return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository,
remoteRepositories, source, filter, listeners, null );
@@ -329,19 +325,12 @@ public class DefaultArtifactResolver
ArtifactMetadataSource source, ArtifactFilter filter,
List<ResolutionListener> listeners,
List<ConflictResolver> conflictResolvers )
- throws ArtifactResolutionException,
- ArtifactNotFoundException
+ throws ArtifactResolutionException, ArtifactNotFoundException
{
- ArtifactResolutionRequest request = new ArtifactResolutionRequest().
- setArtifact( originatingArtifact ).
- setResolveRoot( false ).
+ ArtifactResolutionRequest request =
+ new ArtifactResolutionRequest().setArtifact( originatingArtifact ).setResolveRoot( false ).
// This is required by the surefire plugin
- setArtifactDependencies( artifacts ).
- setManagedVersionMap( managedVersions ).
- setLocalRepository( localRepository ).
- setRemoteRepositories( remoteRepositories ).
- setCollectionFilter( filter ).
- setListeners( listeners );
+ setArtifactDependencies( artifacts ).setManagedVersionMap( managedVersions ).setLocalRepository( localRepository ).setRemoteRepositories( remoteRepositories ).setCollectionFilter( filter ).setListeners( listeners );
injectSession2( request, legacySupport.getSession() );
@@ -376,7 +365,7 @@ public class DefaultArtifactResolver
ArtifactFilter resolutionFilter = request.getResolutionFilter();
RepositorySystemSession session = getSession( request.getLocalRepository() );
- // TODO hack because metadata isn't generated in m2e correctly and i want to run the maven i have in the
+ // TODO: hack because metadata isn't generated in m2e correctly and i want to run the maven i have in the
// workspace
if ( source == null )
{
@@ -506,6 +495,7 @@ public class DefaultArtifactResolver
if ( result.hasMetadataResolutionExceptions() || result.hasVersionRangeViolations()
|| result.hasCircularDependencyExceptions() )
{
+ logger.info( "Failure detected." );
return result;
}
@@ -556,7 +546,7 @@ public class DefaultArtifactResolver
public void resolve( Artifact artifact, List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository )
- throws ArtifactResolutionException, ArtifactNotFoundException
+ throws ArtifactResolutionException, ArtifactNotFoundException
{
resolve( artifact, remoteRepositories, localRepository, null );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/9d1fce53/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 4ebb033..463bf1c 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
@@ -62,6 +62,8 @@ import org.apache.maven.model.superpom.SuperPomProvider;
import org.apache.maven.model.validation.ModelValidator;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
+import org.codehaus.plexus.interpolation.MapBasedValueSource;
+import org.codehaus.plexus.interpolation.StringSearchInterpolator;
import java.io.File;
import java.io.IOException;
@@ -766,13 +768,40 @@ public class DefaultModelBuilder
// save profile activations before interpolation, since they are evaluated with limited scope
Map<String, Activation> originalActivations = getProfileActivations( model, true );
- Model result = modelInterpolator.interpolateModel( model, model.getProjectDirectory(), request, problems );
- result.setPomFile( model.getPomFile() );
+ Model interpolatedModel =
+ modelInterpolator.interpolateModel( model, model.getProjectDirectory(), request, problems );
+ if ( interpolatedModel.getParent() != null )
+ {
+ StringSearchInterpolator ssi = new StringSearchInterpolator();
+ ssi.addValueSource( new MapBasedValueSource( request.getUserProperties() ) );
+
+ ssi.addValueSource( new MapBasedValueSource( model.getProperties() ) );
+
+ ssi.addValueSource( new MapBasedValueSource( request.getSystemProperties() ) );
+
+ try
+ {
+ String interpolated = ssi.interpolate( interpolatedModel.getParent().getVersion() );
+ interpolatedModel.getParent().setVersion( interpolated );
+ }
+ catch ( Exception e )
+ {
+ ModelProblemCollectorRequest mpcr =
+ new ModelProblemCollectorRequest( Severity.ERROR,
+ Version.BASE ).setMessage( "Failed to interpolate field: "
+ + interpolatedModel.getParent().getVersion()
+ + " on class: " ).setException( e );
+ problems.add( mpcr );
+ }
+
+
+ }
+ interpolatedModel.setPomFile( model.getPomFile() );
// restore profiles with file activation to their value before full interpolation
injectProfileActivations( model, originalActivations );
- return result;
+ return interpolatedModel;
}
private ModelData readParent( Model childModel, ModelSource childSource, ModelBuildingRequest request,
http://git-wip-us.apache.org/repos/asf/maven/blob/9d1fce53/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
index cee376f..aacf9d1 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
@@ -56,6 +56,12 @@ import org.codehaus.plexus.interpolation.ValueSource;
public abstract class AbstractStringBasedModelInterpolator
implements ModelInterpolator
{
+ private static final String SHA1_PROPERTY = "sha1";
+
+ private static final String CHANGELIST_PROPERTY = "changelist";
+
+ private static final String REVISION_PROPERTY = "revision";
+
private static final List<String> PROJECT_PREFIXES = Arrays.asList( "pom.", "project." );
private static final Collection<String> TRANSLATED_PATH_EXPRESSIONS;
@@ -165,9 +171,23 @@ public abstract class AbstractStringBasedModelInterpolator
valueSources.add( new MapBasedValueSource( config.getUserProperties() ) );
+ // Overwrite existing values in model properties. Otherwise it's not possible
+ // to define the version via command line: mvn -Drevision=6.5.7 ...
+ if ( config.getSystemProperties().containsKey( REVISION_PROPERTY ) )
+ {
+ modelProperties.put( REVISION_PROPERTY, config.getSystemProperties().get( REVISION_PROPERTY ) );
+ }
+ if ( config.getSystemProperties().containsKey( CHANGELIST_PROPERTY ) )
+ {
+ modelProperties.put( CHANGELIST_PROPERTY, config.getSystemProperties().get( CHANGELIST_PROPERTY ) );
+ }
+ if ( config.getSystemProperties().containsKey( SHA1_PROPERTY ) )
+ {
+ modelProperties.put( SHA1_PROPERTY, config.getSystemProperties().get( SHA1_PROPERTY ) );
+ }
valueSources.add( new MapBasedValueSource( modelProperties ) );
- valueSources.add( new MapBasedValueSource( config.getSystemProperties() ) );
+ valueSources.add( new MapBasedValueSource ( config.getSystemProperties() ) );
valueSources.add( new AbstractValueSource( false )
{
@@ -183,15 +203,14 @@ public abstract class AbstractStringBasedModelInterpolator
return valueSources;
}
- protected List<? extends InterpolationPostProcessor> createPostProcessors( final Model model,
- final File projectDir,
+ protected List<? extends InterpolationPostProcessor> createPostProcessors( final Model model, final File projectDir,
final ModelBuildingRequest config )
{
List<InterpolationPostProcessor> processors = new ArrayList<>( 2 );
if ( projectDir != null )
{
- processors.add( new PathTranslatingPostProcessor( PROJECT_PREFIXES, TRANSLATED_PATH_EXPRESSIONS,
- projectDir, pathTranslator ) );
+ processors.add( new PathTranslatingPostProcessor( PROJECT_PREFIXES, TRANSLATED_PATH_EXPRESSIONS, projectDir,
+ pathTranslator ) );
}
processors.add( new UrlNormalizingPostProcessor( urlNormalizer ) );
return processors;
@@ -228,8 +247,10 @@ public abstract class AbstractStringBasedModelInterpolator
}
catch ( InterpolationException e )
{
+ //@formatter:off
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
- .setMessage( e.getMessage() ).setException( e ) );
+ .setMessage( e.getMessage() ).setException( e ) );
+ //@formatter:on
}
interpolator.clearFeedback();
[3/4] maven git commit: Fixed checkstyle reported error.
Posted by kh...@apache.org.
Fixed checkstyle reported error.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab2e24fe
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab2e24fe
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab2e24fe
Branch: refs/heads/MNG-6057
Commit: ab2e24fe3612b4f12c66e698e398fcb2b908f1aa
Parents: 24b9ef4
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Sat Mar 11 18:40:24 2017 +0100
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Sat Mar 11 18:40:24 2017 +0100
----------------------------------------------------------------------
.../lifecycle/internal/DefaultLifecycleMappingDelegate.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ab2e24fe/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
index db974bc..c2bf919 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
@@ -79,8 +79,8 @@ public class DefaultLifecycleMappingDelegate
/*
* Grab plugin executions that are bound to the selected lifecycle phases from project. The effective model of
* the project already contains the plugin executions induced by the project's packaging type. Remember, all
- * phases of interest and only those are in the lifecycle mapping, if a phase has no value in the map, we are not
- * interested in any of the executions bound to it.
+ * phases of interest and only those are in the lifecycle mapping, if a phase has no value in the map, we are
+ * not interested in any of the executions bound to it.
*/
for ( Plugin plugin : project.getBuild().getPlugins() )