Replace jakarta-regexp with java.util.regexp for maven-scm-provider-tfs
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/714c6b89 Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/714c6b89 Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/714c6b89 Branch: refs/heads/master Commit: 714c6b89afc51d46f03ee29f5c94503a638953ee Parents: 5e8173d Author: Emmanuel Bourg <ebo...@apache.org> Authored: Mon Feb 24 17:54:27 2014 +0100 Committer: Emmanuel Bourg <ebo...@apache.org> Committed: Mon Feb 24 17:54:27 2014 +0100 ---------------------------------------------------------------------- .../maven-scm-provider-tfs/pom.xml | 7 ------- .../tfs/command/blame/TfsBlameConsumer.java | 20 ++++++++------------ 2 files changed, 8 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-scm/blob/714c6b89/maven-scm-providers/maven-scm-provider-tfs/pom.xml ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-tfs/pom.xml b/maven-scm-providers/maven-scm-provider-tfs/pom.xml index d3c2e99..a61cb51 100644 --- a/maven-scm-providers/maven-scm-provider-tfs/pom.xml +++ b/maven-scm-providers/maven-scm-provider-tfs/pom.xml @@ -61,13 +61,6 @@ </developer> </developers> - <dependencies> - <dependency> - <groupId>regexp</groupId> - <artifactId>regexp</artifactId> - </dependency> - </dependencies> - <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/maven-scm/blob/714c6b89/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/blame/TfsBlameConsumer.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/blame/TfsBlameConsumer.java b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/blame/TfsBlameConsumer.java index 1b911d8..a6a0380 100644 --- a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/blame/TfsBlameConsumer.java +++ b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/blame/TfsBlameConsumer.java @@ -22,11 +22,12 @@ package org.apache.maven.scm.provider.tfs.command.blame; import org.apache.maven.scm.command.blame.BlameLine; import org.apache.maven.scm.log.ScmLogger; import org.apache.maven.scm.util.AbstractConsumer; -import org.apache.regexp.RE; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * @author Evgeny Mandrikov @@ -40,28 +41,23 @@ public class TfsBlameConsumer /* 3 username 3/13/2006 line */ // TODO simplify - private static final String LINE_PATTERN = "([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)"; - - /** - * @see #LINE_PATTERN - */ - private RE lineRegexp; + private static final Pattern LINE_PATTERN = Pattern.compile( "([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)" ); private List<BlameLine> lines = new ArrayList<BlameLine>(); public TfsBlameConsumer( ScmLogger logger ) { super( logger ); - lineRegexp = new RE( LINE_PATTERN ); } public void consumeLine( String line ) { - if ( lineRegexp.match( line ) ) + Matcher matcher = LINE_PATTERN.matcher( line ); + if ( matcher.find() ) { - String revision = lineRegexp.getParen( 1 ).trim(); - String author = lineRegexp.getParen( 2 ).trim(); - String dateStr = lineRegexp.getParen( 3 ).trim(); + String revision = matcher.group( 1 ).trim(); + String author = matcher.group( 2 ).trim(); + String dateStr = matcher.group( 3 ).trim(); Date date = parseDate( dateStr, null, TFS_TIMESTAMP_PATTERN );
