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 2014/02/25 18:24:14 UTC
[5/8] git commit: Replace jakarta-regexp with java.util.regexp for
maven-scm-provider-clearcase
Replace jakarta-regexp with java.util.regexp for maven-scm-provider-clearcase
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/0a069f8d
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/0a069f8d
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/0a069f8d
Branch: refs/heads/master
Commit: 0a069f8d535d38c389efe06df7a38cabe769ff3a
Parents: 2122138
Author: Emmanuel Bourg <eb...@apache.org>
Authored: Mon Feb 24 18:06:45 2014 +0100
Committer: Emmanuel Bourg <eb...@apache.org>
Committed: Mon Feb 24 18:06:45 2014 +0100
----------------------------------------------------------------------
.../maven-scm-provider-clearcase/pom.xml | 7 -------
.../command/blame/ClearCaseBlameConsumer.java | 17 ++++++++---------
2 files changed, 8 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0a069f8d/maven-scm-providers/maven-scm-provider-clearcase/pom.xml
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-clearcase/pom.xml b/maven-scm-providers/maven-scm-provider-clearcase/pom.xml
index 3da953a..d97d4e4 100644
--- a/maven-scm-providers/maven-scm-provider-clearcase/pom.xml
+++ b/maven-scm-providers/maven-scm-provider-clearcase/pom.xml
@@ -33,13 +33,6 @@
<name>Maven SCM Clearcase Provider</name>
<description>SCM Provider implementation for Clearcase (http://www-306.ibm.com/software/awdtools/clearcase/).</description>
- <dependencies>
- <dependency>
- <groupId>regexp</groupId>
- <artifactId>regexp</artifactId>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0a069f8d/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumer.java b/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumer.java
index d5a54b2..f98c5fb 100644
--- a/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/blame/ClearCaseBlameConsumer.java
@@ -22,11 +22,12 @@ package org.apache.maven.scm.provider.clearcase.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 Jérémie Lagarde
@@ -39,26 +40,24 @@ public class ClearCaseBlameConsumer
private static final String CLEARCASE_TIMESTAMP_PATTERN = "yyyyMMdd.HHmmss";
- private static final String LINE_PATTERN = "VERSION:(.*)@@@USER:(.*)@@@DATE:(.*)@@@(.*)";
-
- private RE lineRegexp;
+ private static final Pattern LINE_PATTERN = Pattern.compile( "VERSION:(.*)@@@USER:(.*)@@@DATE:(.*)@@@(.*)" );
private List<BlameLine> lines = new ArrayList<BlameLine>();
public ClearCaseBlameConsumer( 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.matches() )
{
- String revision = lineRegexp.getParen( 1 );
+ String revision = matcher.group( 1 );
// SCM-613
- String author = lineRegexp.getParen( 2 ).toLowerCase();
- String dateTimeStr = lineRegexp.getParen( 3 );
+ String author = matcher.group( 2 ).toLowerCase();
+ String dateTimeStr = matcher.group( 3 );
Date dateTime = parseDate( dateTimeStr, null, CLEARCASE_TIMESTAMP_PATTERN );
lines.add( new BlameLine( dateTime, revision, author ) );