You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2016/06/15 18:27:57 UTC
svn commit: r1748615 - in
/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve:
./ transform/
Author: rfscholte
Date: Wed Jun 15 18:27:57 2016
New Revision: 1748615
URL: http://svn.apache.org/viewvc?rev=1748615&view=rev
Log:
Add documentation
Reuse regExp
Modified:
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/PatternInclusionsFilter.java
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformer.java
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/SonatypeAetherFilterTransformer.java
Modified: maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/PatternInclusionsFilter.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/PatternInclusionsFilter.java?rev=1748615&r1=1748614&r2=1748615&view=diff
==============================================================================
--- maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/PatternInclusionsFilter.java (original)
+++ maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/PatternInclusionsFilter.java Wed Jun 15 18:27:57 2016
@@ -27,6 +27,7 @@ import java.util.Collections;
*
* <pre>
* [groupId]:[artifactId]:[extension]:[version]
+ * [groupId]:[artifactId]:[extension]:[classifier]:[version]
* </pre>
* <p>
* Where each pattern segment is optional and supports full and partial <code>*</code> wildcards. An empty pattern
Modified: maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformer.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformer.java?rev=1748615&r1=1748614&r2=1748615&view=diff
==============================================================================
--- maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformer.java (original)
+++ maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformer.java Wed Jun 15 18:27:57 2016
@@ -52,6 +52,12 @@ import org.eclipse.aether.util.filter.Sc
public class EclipseAetherFilterTransformer
implements FilterTransformer<DependencyFilter>
{
+ /**
+ * When using as regular expression, group(1) + group(3) will be the coordinate,
+ * group(2) will be the classifier.
+ */
+ private static final String GAV_C_E = "(.*:.*:.*):(.+)(:.*)";
+
@Override
public AndDependencyFilter transform( AndFilter andFilter )
{
@@ -101,7 +107,7 @@ public class EclipseAetherFilterTransfor
for ( String include : filter.getIncludes() )
{
- if ( include.matches( ".*:.*:.*:.*:.*" ) )
+ if ( include.matches( GAV_C_E ) )
{
return newAdvancedPatternInclusionFilter( filter.getIncludes() );
}
@@ -127,7 +133,7 @@ public class EclipseAetherFilterTransfor
{
List<DependencyFilter> filters = new ArrayList<DependencyFilter>( includes.size() );
- Pattern pattern = Pattern.compile( "(.*:.*:.*):(.+)(:.*)" );
+ Pattern pattern = Pattern.compile( GAV_C_E );
for ( String include : includes )
{
Matcher matcher = pattern.matcher( include );
Modified: maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/SonatypeAetherFilterTransformer.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/SonatypeAetherFilterTransformer.java?rev=1748615&r1=1748614&r2=1748615&view=diff
==============================================================================
--- maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/SonatypeAetherFilterTransformer.java (original)
+++ maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/SonatypeAetherFilterTransformer.java Wed Jun 15 18:27:57 2016
@@ -52,6 +52,12 @@ import org.sonatype.aether.util.filter.S
public class SonatypeAetherFilterTransformer
implements FilterTransformer<DependencyFilter>
{
+ /**
+ * When using as regular expression, group(1) + group(3) will be the coordinate,
+ * group(2) will be the classifier.
+ */
+ private static final String GAV_C_E = "(.*:.*:.*):(.+)(:.*)";
+
@Override
public AndDependencyFilter transform( AndFilter filter )
{
@@ -101,7 +107,7 @@ public class SonatypeAetherFilterTransfo
for ( String include : filter.getIncludes() )
{
- if ( include.matches( ".*:.*:.*:.*:.*" ) )
+ if ( include.matches( GAV_C_E ) )
{
return newAdvancedPatternInclusionFilter( filter.getIncludes() );
}
@@ -127,7 +133,7 @@ public class SonatypeAetherFilterTransfo
{
List<DependencyFilter> filters = new ArrayList<DependencyFilter>( includes.size() );
- Pattern pattern = Pattern.compile( "(.*:.*:.*):(.+)(:.*)" );
+ Pattern pattern = Pattern.compile( GAV_C_E );
for ( String include : includes )
{
Matcher matcher = pattern.matcher( include );