You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/05/25 09:13:25 UTC
[maven-scm] branch remove-commons-lang updated (8f567ec34 -> 087c1b350)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch remove-commons-lang
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
discard 8f567ec34 Fix
new 087c1b350 [SCM-985] Drop/replace usage of Commons Lang 2
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (8f567ec34)
\
N -- N -- N refs/heads/remove-commons-lang (087c1b350)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[maven-scm] 01/01: [SCM-985] Drop/replace usage of Commons Lang 2
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch remove-commons-lang
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit 087c1b350a92cfa8537b0d9d0b0993dc2bd66873
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun May 22 01:17:00 2022 +0200
[SCM-985] Drop/replace usage of Commons Lang 2
This closes #148
---
.../maven-scm-provider-gitexe/pom.xml | 4 --
.../gitexe/command/status/GitStatusConsumer.java | 44 +++++++++++-----------
.../maven-scm-provider-svnexe/pom.xml | 4 --
.../command/checkout/SvnCheckOutConsumer.java | 2 +-
.../command/remoteinfo/SvnRemoteInfoCommand.java | 6 +--
.../AbstractSvnExeRemoteInfoCommandTckTest.java | 1 +
pom.xml | 5 ---
7 files changed, 27 insertions(+), 39 deletions(-)
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml
index 5cbfee271..128dbab75 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml
@@ -46,10 +46,6 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
index a575527e4..dd90a9676 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
@@ -28,11 +28,11 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.lang.StringUtils;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.util.AbstractConsumer;
+import org.codehaus.plexus.util.StringUtils;
/**
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
@@ -71,14 +71,14 @@ public class GitStatusConsumer
private final List<ScmFile> changedFiles = new ArrayList<>();
private URI relativeRepositoryPath;
-
+
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
/**
* Consumer when workingDirectory and repositoryRootDirectory are the same
- *
+ *
* @param workingDirectory the working directory
*/
public GitStatusConsumer( File workingDirectory )
@@ -92,7 +92,7 @@ public class GitStatusConsumer
* <pre>
* URI.create( repositoryRoot ).relativize( fileSet.getBasedir().toURI() )
* </pre>
- *
+ *
* @param workingDirectory the working directory
* @param relativeRepositoryPath the working directory relative to the repository root
* @since 1.9
@@ -163,7 +163,7 @@ public class GitStatusConsumer
ScmFileStatus status = null;
List<String> files = new ArrayList<String>();
-
+
Matcher matcher;
if ( ( matcher = ADDED_PATTERN.matcher( line ) ).find() )
{
@@ -294,7 +294,7 @@ public class GitStatusConsumer
}
/**
- *
+ *
* @param fileEntry the fileEntry, must not be {@code null}
* @param path the path, must not be {@code null}
* @return TODO
@@ -310,7 +310,7 @@ public class GitStatusConsumer
/**
* Create an URI whose getPath() returns the given path and getScheme() returns null. The path may contain spaces,
* colons, and other special characters.
- *
+ *
* @param path the path.
* @return the new URI
*/
@@ -352,10 +352,10 @@ public class GitStatusConsumer
? unescape( str.substring( 1, strLen - 1 ) )
: str;
}
-
+
/**
* Dequote a quoted string generated by git status --porcelain.
- * The leading and trailing quotes have already been removed.
+ * The leading and trailing quotes have already been removed.
* @param fileEntry
* @return TODO
*/
@@ -367,13 +367,13 @@ public class GitStatusConsumer
{
return fileEntry;
}
-
+
// We have escaped characters
byte[] inba = fileEntry.getBytes();
int inSub = 0; // Input subscript into fileEntry
byte[] outba = new byte[fileEntry.length()];
int outSub = 0; // Output subscript into outba
-
+
while ( true )
{
System.arraycopy( inba, inSub, outba, outSub, pos - inSub );
@@ -384,39 +384,39 @@ public class GitStatusConsumer
case '"':
outba[outSub++] = '"';
break;
-
+
case 'a':
outba[outSub++] = 7; // Bell
break;
-
+
case 'b':
outba[outSub++] = '\b';
break;
-
+
case 't':
outba[outSub++] = '\t';
break;
-
+
case 'n':
outba[outSub++] = '\n';
break;
-
+
case 'v':
outba[outSub++] = 11; // Vertical tab
break;
-
+
case 'f':
outba[outSub++] = '\f';
break;
-
+
case 'r':
outba[outSub++] = '\f';
break;
-
+
case '\\':
outba[outSub++] = '\\';
break;
-
+
case '0':
case '1':
case '2':
@@ -427,7 +427,7 @@ public class GitStatusConsumer
b |= (byte) ( inba[inSub++] - '0' );
outba[outSub++] = b;
break;
-
+
default:
//This is an invalid escape in a string. Just copy it.
outba[outSub++] = '\\';
@@ -449,7 +449,7 @@ public class GitStatusConsumer
}
catch ( UnsupportedEncodingException e )
{
- throw new RuntimeException( e );
+ throw new RuntimeException( e );
}
}
}
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml
index 75565a572..c981de5d3 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml
@@ -48,10 +48,6 @@
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-svn-commons</artifactId>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutConsumer.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutConsumer.java
index 1984f5098..cea907645 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutConsumer.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutConsumer.java
@@ -19,10 +19,10 @@ package org.apache.maven.scm.provider.svn.svnexe.command.checkout;
* under the License.
*/
-import org.apache.commons.lang.StringUtils;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.provider.svn.svnexe.command.AbstractFileCheckingConsumer;
+import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.util.ArrayList;
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/SvnRemoteInfoCommand.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/SvnRemoteInfoCommand.java
index 1f577123f..ccc083213 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/SvnRemoteInfoCommand.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/SvnRemoteInfoCommand.java
@@ -19,7 +19,6 @@ package org.apache.maven.scm.provider.svn.svnexe.command.remoteinfo;
* under the License.
*/
-import org.apache.commons.lang.StringUtils;
import org.apache.maven.scm.CommandParameters;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
@@ -30,6 +29,7 @@ import org.apache.maven.scm.provider.svn.command.SvnCommand;
import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
import org.apache.maven.scm.provider.svn.svnexe.command.SvnCommandLineUtils;
import org.apache.maven.scm.util.AbstractConsumer;
+import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
@@ -54,7 +54,7 @@ public class SvnRemoteInfoCommand
String url = ( (SvnScmProviderRepository) repository ).getUrl();
// use a default svn layout, url is here http://svn.apache.org/repos/asf/maven/maven-3/trunk
// so as we presume we have good users using standard svn layout, we calculate tags and branches url
- url = StringUtils.removeEnd( url, "/" );
+ url = StringUtils.stripEnd( url, "/" );
int idx = url.lastIndexOf( "/" );
String baseUrl = url.substring( 0, idx );
@@ -176,7 +176,7 @@ public class SvnRemoteInfoCommand
public void consumeLine( String s )
{
- infos.put( StringUtils.removeEnd( s, "/" ), url + "/" + s );
+ infos.put( StringUtils.stripEnd( s, "/" ), url + "/" + s );
}
Map<String, String> getInfos()
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/AbstractSvnExeRemoteInfoCommandTckTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/AbstractSvnExeRemoteInfoCommandTckTest.java
index 7f1e5612f..bf550f815 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/AbstractSvnExeRemoteInfoCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/AbstractSvnExeRemoteInfoCommandTckTest.java
@@ -23,6 +23,7 @@ import org.apache.maven.scm.command.remoteinfo.RemoteInfoScmResult;
import org.apache.maven.scm.provider.svn.command.remoteinfo.AbstractSvnRemoteInfoCommandTckTest;
import static org.apache.maven.scm.provider.svn.SvnScmTestUtils.SVN_COMMAND_LINE;
+
import static org.junit.Assert.assertTrue;
/**
diff --git a/pom.xml b/pom.xml
index c871f61d0..122a94d8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -237,11 +237,6 @@
<version>2.0</version>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>