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 2017/03/12 18:31:37 UTC
[1/2] maven git commit: removed noisy formatting changes from
previous commit (to be squashed)
Repository: maven
Updated Branches:
refs/heads/MNG-6057 9d1fce536 -> 3c00dd10e
removed noisy formatting changes from previous commit (to be squashed)
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/959ca0c2
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/959ca0c2
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/959ca0c2
Branch: refs/heads/MNG-6057
Commit: 959ca0c258503ece2a9d813e27c57d3b04d71612
Parents: 9d1fce5
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sun Mar 12 19:31:01 2017 +0100
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Sun Mar 12 19:31:01 2017 +0100
----------------------------------------------------------------------
.../resolver/DefaultArtifactResolver.java | 43 ++++++++++++--------
.../AbstractStringBasedModelInterpolator.java | 19 ++++-----
2 files changed, 36 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/959ca0c2/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 93a5919..7fcc290 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,12 +22,10 @@ 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;
@@ -151,21 +149,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 )
{
@@ -257,7 +255,8 @@ 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 );
@@ -269,7 +268,8 @@ 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,7 +280,8 @@ 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 );
@@ -290,7 +291,8 @@ public class DefaultArtifactResolver
List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository,
ArtifactMetadataSource source )
- throws ArtifactResolutionException, ArtifactNotFoundException
+ throws ArtifactResolutionException,
+ ArtifactNotFoundException
{
return resolveTransitively( artifacts, originatingArtifact, localRepository, remoteRepositories, source, null );
}
@@ -300,7 +302,8 @@ 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 );
@@ -312,7 +315,8 @@ 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 );
@@ -325,12 +329,19 @@ 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() );
@@ -546,7 +557,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/959ca0c2/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 aacf9d1..b47edbe 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,11 +56,11 @@ import org.codehaus.plexus.interpolation.ValueSource;
public abstract class AbstractStringBasedModelInterpolator
implements ModelInterpolator
{
- private static final String SHA1_PROPERTY = "sha1";
+ public static final String SHA1_PROPERTY = "sha1";
- private static final String CHANGELIST_PROPERTY = "changelist";
+ public static final String CHANGELIST_PROPERTY = "changelist";
- private static final String REVISION_PROPERTY = "revision";
+ public static final String REVISION_PROPERTY = "revision";
private static final List<String> PROJECT_PREFIXES = Arrays.asList( "pom.", "project." );
@@ -187,7 +187,7 @@ public abstract class AbstractStringBasedModelInterpolator
}
valueSources.add( new MapBasedValueSource( modelProperties ) );
- valueSources.add( new MapBasedValueSource ( config.getSystemProperties() ) );
+ valueSources.add( new MapBasedValueSource( config.getSystemProperties() ) );
valueSources.add( new AbstractValueSource( false )
{
@@ -203,14 +203,15 @@ 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;
@@ -247,10 +248,8 @@ public abstract class AbstractStringBasedModelInterpolator
}
catch ( InterpolationException e )
{
- //@formatter:off
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
- .setMessage( e.getMessage() ).setException( e ) );
- //@formatter:on
+ .setMessage( e.getMessage() ).setException( e ) );
}
interpolator.clearFeedback();
[2/2] maven git commit: marked new constants public and used it in
validator
Posted by hb...@apache.org.
marked new constants public and used it in validator
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3c00dd10
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3c00dd10
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3c00dd10
Branch: refs/heads/MNG-6057
Commit: 3c00dd10e3f443540bb79bc30ef4fc8ce1ac076d
Parents: 959ca0c
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sun Mar 12 19:31:35 2017 +0100
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Sun Mar 12 19:31:35 2017 +0100
----------------------------------------------------------------------
.../apache/maven/model/validation/DefaultModelValidator.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/3c00dd10/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 59b0532..e790f21 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
@@ -53,6 +53,7 @@ import org.apache.maven.model.building.ModelProblem.Severity;
import org.apache.maven.model.building.ModelProblem.Version;
import org.apache.maven.model.building.ModelProblemCollector;
import org.apache.maven.model.building.ModelProblemCollectorRequest;
+import org.apache.maven.model.interpolation.AbstractStringBasedModelInterpolator;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils;
@@ -806,8 +807,10 @@ public class DefaultModelValidator
// revision
// sha1
//
- if ( string.trim().contains( "${changelist}" ) || string.trim().contains( "${revision}" )
- || string.trim().contains( "${sha1}" ) )
+ string = string.trim();
+ if ( string.contains( "${" + AbstractStringBasedModelInterpolator.CHANGELIST_PROPERTY + "}" )
+ || string.contains( "${" + AbstractStringBasedModelInterpolator.REVISION_PROPERTY + "}" )
+ || string.contains( "${" + AbstractStringBasedModelInterpolator.SHA1_PROPERTY + "}" ) )
{
return true;
}