Author: hboutemy Date: Thu Oct 30 07:27:46 2014 New Revision: 1635412 URL: http://svn.apache.org/r1635412 Log: upgraded parent pom
Modified: maven/shared/trunk/maven-common-artifact-filters/pom.xml maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/StatisticsReportingArtifactFilter.java maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactsFilter.java maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactFilterException.java maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactIdFilter.java maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ClassifierFilter.java maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/GroupIdFilter.java maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ScopeFilter.java maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/TypeFilter.java Modified: maven/shared/trunk/maven-common-artifact-filters/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/pom.xml?rev=1635412&r1=1635411&r2=1635412&view=diff ============================================================================== --- maven/shared/trunk/maven-common-artifact-filters/pom.xml (original) +++ maven/shared/trunk/maven-common-artifact-filters/pom.xml Thu Oct 30 07:27:46 2014 @@ -23,7 +23,7 @@ <parent> <artifactId>maven-shared-components</artifactId> <groupId>org.apache.maven.shared</groupId> - <version>20</version> + <version>21</version> <relativePath>../maven-shared-components/pom.xml</relativePath> </parent> Modified: maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java?rev=1635412&r1=1635411&r2=1635412&view=diff ============================================================================== --- maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java (original) +++ maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java Thu Oct 30 07:27:46 2014 @@ -171,9 +171,9 @@ public abstract class AbstractStrictPatt matches = token.startsWith( prefix ); } // support versions range - else if ( pattern.startsWith( "[" ) || pattern.startsWith( "(" )) + else if ( pattern.startsWith( "[" ) || pattern.startsWith( "(" ) ) { - matches = isVersionIncludedInRange(token, pattern); + matches = isVersionIncludedInRange( token, pattern ); } // support exact match else @@ -183,13 +183,17 @@ public abstract class AbstractStrictPatt return matches; } - - private boolean isVersionIncludedInRange(final String version, final String range) { - try { - return VersionRange.createFromVersionSpec(range).containsVersion(new DefaultArtifactVersion(version)); - } catch (InvalidVersionSpecificationException e) { - return false; - } - } + + private boolean isVersionIncludedInRange( final String version, final String range ) + { + try + { + return VersionRange.createFromVersionSpec( range ).containsVersion( new DefaultArtifactVersion( version ) ); + } + catch ( InvalidVersionSpecificationException e ) + { + return false; + } + } } Modified: maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java?rev=1635412&r1=1635411&r2=1635412&view=diff ============================================================================== --- maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java (original) +++ maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java Thu Oct 30 07:27:46 2014 @@ -162,8 +162,9 @@ public class ScopeArtifactFilter public String toString() { - return "Scope filter [null-scope=" + includeNullScope + ", compile=" + includeCompileScope + ", runtime=" + includeRuntimeScope + ", test=" + includeTestScope - + ", provided=" + includeProvidedScope + ", system=" + includeSystemScope + "]"; + return "Scope filter [null-scope=" + includeNullScope + ", compile=" + includeCompileScope + ", runtime=" + + includeRuntimeScope + ", test=" + includeTestScope + ", provided=" + includeProvidedScope + ", system=" + + includeSystemScope + "]"; } public void reportFilteredArtifacts( Logger logger ) Modified: maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/StatisticsReportingArtifactFilter.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/StatisticsReportingArtifactFilter.java?rev=1635412&r1=1635411&r2=1635412&view=diff ============================================================================== --- maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/StatisticsReportingArtifactFilter.java (original) +++ maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/StatisticsReportingArtifactFilter.java Thu Oct 30 07:27:46 2014 @@ -21,6 +21,9 @@ package org.apache.maven.shared.artifact import org.codehaus.plexus.logging.Logger; +/** + * + */ public interface StatisticsReportingArtifactFilter { Modified: maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java?rev=1635412&r1=1635411&r2=1635412&view=diff ============================================================================== --- maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java (original) +++ maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java Thu Oct 30 07:27:46 2014 @@ -44,7 +44,7 @@ public abstract class AbstractArtifactFe */ private List<String> excludes; - public AbstractArtifactFeatureFilter( String include, String exclude) + public AbstractArtifactFeatureFilter( String include, String exclude ) { setExcludes( exclude ); setIncludes( include ); @@ -58,7 +58,7 @@ public abstract class AbstractArtifactFe */ public Set<Artifact> filter( Set<Artifact> artifacts ) { - Set<Artifact>results = artifacts; + Set<Artifact> results = artifacts; if ( this.includes != null && !this.includes.isEmpty() ) { Modified: maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactsFilter.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactsFilter.java?rev=1635412&r1=1635411&r2=1635412&view=diff ============================================================================== --- maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactsFilter.java (original) +++ maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactsFilter.java Thu Oct 30 07:27:46 2014 @@ -24,6 +24,9 @@ import java.util.Set; import org.apache.maven.artifact.Artifact; +/** + * + */ public abstract class AbstractArtifactsFilter implements ArtifactsFilter { @@ -32,7 +35,8 @@ public abstract class AbstractArtifactsF * @version $Id$ * @throws ArtifactFilterException */ - public boolean isArtifactIncluded( Artifact artifact ) throws ArtifactFilterException + public boolean isArtifactIncluded( Artifact artifact ) + throws ArtifactFilterException { Set<Artifact> set = new HashSet<Artifact>(); set.add( artifact ); Modified: maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactFilterException.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactFilterException.java?rev=1635412&r1=1635411&r2=1635412&view=diff ============================================================================== --- maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactFilterException.java (original) +++ maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactFilterException.java Thu Oct 30 07:27:46 2014 @@ -1,3 +1,5 @@ +package org.apache.maven.shared.artifact.filter.collection; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -16,7 +18,6 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.shared.artifact.filter.collection; /** * @author <a href="mailto:bri...@apache.org">Brian Fox</a> @@ -24,8 +25,6 @@ package org.apache.maven.shared.artifact public class ArtifactFilterException extends Exception { - - /** * */ Modified: maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactIdFilter.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactIdFilter.java?rev=1635412&r1=1635411&r2=1635412&view=diff ============================================================================== --- maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactIdFilter.java (original) +++ maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactIdFilter.java Thu Oct 30 07:27:46 2014 @@ -40,14 +40,9 @@ public class ArtifactIdFilter */ public ArtifactIdFilter( String include, String exclude ) { - super( include, exclude); + super( include, exclude ); } - /* - * (non-Javadoc) - * - * @see org.apache.maven.plugin.dependency.utils.filters.AbstractArtifactFeatureFilter#getArtifactFeature(org.apache.maven.artifact.Artifact) - */ protected String getArtifactFeature( Artifact artifact ) { return artifact.getArtifactId(); Modified: maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ClassifierFilter.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ClassifierFilter.java?rev=1635412&r1=1635411&r2=1635412&view=diff ============================================================================== --- maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ClassifierFilter.java (original) +++ maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ClassifierFilter.java Thu Oct 30 07:27:46 2014 @@ -31,14 +31,9 @@ public class ClassifierFilter { public ClassifierFilter( String include, String exclude ) { - super( include, exclude); + super( include, exclude ); } - /* - * (non-Javadoc) - * - * @see org.apache.maven.plugin.dependency.utils.filters.AbstractArtifactFeatureFilter#getArtifactFeature(org.apache.maven.artifact.Artifact) - */ protected String getArtifactFeature( Artifact artifact ) { return artifact.getClassifier(); Modified: maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/GroupIdFilter.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/GroupIdFilter.java?rev=1635412&r1=1635411&r2=1635412&view=diff ============================================================================== --- maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/GroupIdFilter.java (original) +++ maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/GroupIdFilter.java Thu Oct 30 07:27:46 2014 @@ -41,7 +41,7 @@ public class GroupIdFilter */ public GroupIdFilter( String include, String exclude ) { - super( include, exclude); + super( include, exclude ); } /* Modified: maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ScopeFilter.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ScopeFilter.java?rev=1635412&r1=1635411&r2=1635412&view=diff ============================================================================== --- maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ScopeFilter.java (original) +++ maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ScopeFilter.java Thu Oct 30 07:27:46 2014 @@ -55,7 +55,7 @@ public class ScopeFilter * @return a Set of filtered dependencies. * @throws ArtifactFilterException */ - public Set<Artifact> filter( Set<Artifact> artifacts) + public Set<Artifact> filter( Set<Artifact> artifacts ) throws ArtifactFilterException { Set<Artifact> results = artifacts; Modified: maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/TypeFilter.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/TypeFilter.java?rev=1635412&r1=1635411&r2=1635412&view=diff ============================================================================== --- maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/TypeFilter.java (original) +++ maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/TypeFilter.java Thu Oct 30 07:27:46 2014 @@ -30,14 +30,9 @@ public class TypeFilter { public TypeFilter( String include, String exclude ) { - super( include, exclude); + super( include, exclude ); } - /* - * (non-Javadoc) - * - * @see org.apache.maven.plugin.dependency.utils.filters.AbstractArtifactFeatureFilter#getArtifactFeature(org.apache.maven.artifact.Artifact) - */ protected String getArtifactFeature( Artifact artifact ) { return artifact.getType();