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:52:08 UTC
svn commit: r1748618 - in
/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform:
EclipseAetherFilterTransformer.java SonatypeAetherFilterTransformer.java
Author: rfscholte
Date: Wed Jun 15 18:52:07 2016
New Revision: 1748618
URL: http://svn.apache.org/viewvc?rev=1748618&view=rev
Log:
Pattern[MSHARED-599] Allow classifier in PatternInclusionsFilter
pattern ends with the version
Modified:
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/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=1748618&r1=1748617&r2=1748618&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:52:07 2016
@@ -56,7 +56,7 @@ public class EclipseAetherFilterTransfor
* 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 = "(.*:.*:.*):(.+)(:.*)";
+ private static final String GAE_C_V = "(.*:.*:.*):(.+)(:.*)";
@Override
public AndDependencyFilter transform( AndFilter andFilter )
@@ -107,7 +107,7 @@ public class EclipseAetherFilterTransfor
for ( String include : filter.getIncludes() )
{
- if ( include.matches( GAV_C_E ) )
+ if ( include.matches( GAE_C_V ) )
{
return newAdvancedPatternInclusionFilter( filter.getIncludes() );
}
@@ -133,7 +133,7 @@ public class EclipseAetherFilterTransfor
{
List<DependencyFilter> filters = new ArrayList<DependencyFilter>( includes.size() );
- Pattern pattern = Pattern.compile( GAV_C_E );
+ Pattern pattern = Pattern.compile( GAE_C_V );
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=1748618&r1=1748617&r2=1748618&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:52:07 2016
@@ -56,7 +56,7 @@ public class SonatypeAetherFilterTransfo
* 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 = "(.*:.*:.*):(.+)(:.*)";
+ private static final String GAE_C_V = "(.*:.*:.*):(.+)(:.*)";
@Override
public AndDependencyFilter transform( AndFilter filter )
@@ -107,7 +107,7 @@ public class SonatypeAetherFilterTransfo
for ( String include : filter.getIncludes() )
{
- if ( include.matches( GAV_C_E ) )
+ if ( include.matches( GAE_C_V ) )
{
return newAdvancedPatternInclusionFilter( filter.getIncludes() );
}
@@ -133,7 +133,7 @@ public class SonatypeAetherFilterTransfo
{
List<DependencyFilter> filters = new ArrayList<DependencyFilter>( includes.size() );
- Pattern pattern = Pattern.compile( GAV_C_E );
+ Pattern pattern = Pattern.compile( GAE_C_V );
for ( String include : includes )
{
Matcher matcher = pattern.matcher( include );