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/22 07:55:28 UTC
[maven-scm] 01/01: shit
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 02c7d2a093a193127fd740c07f915dccb8bdd4db
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun May 22 01:17:00 2022 +0200
shit
---
.../maven-scm-provider-gitexe/pom.xml | 4 --
.../gitexe/command/status/GitStatusConsumer.java | 52 +++++++++++-----------
.../maven-scm-provider-svnexe/pom.xml | 4 --
.../command/checkout/SvnCheckOutConsumer.java | 2 +-
.../command/remoteinfo/SvnRemoteInfoCommand.java | 16 +++----
...=> AbstractSvnExeRemoteInfoCommandTckTest.java} | 20 ++++-----
.../remoteinfo/SvnExeRemoteInfoCommandTckTest.java | 12 +----
...nExeRemoteInfoCommandTrailingSlashTckTest.java} | 16 ++-----
pom.xml | 5 ---
9 files changed, 49 insertions(+), 82 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 03e378c85..5c9f5d183 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..f54a9e42d 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
@@ -151,19 +151,19 @@ public class GitStatusConsumer
*/
public void consumeLine( String line )
{
- if ( logger.isDebugEnabled() )
- {
- logger.debug( line );
- }
if ( StringUtils.isEmpty( line ) )
{
return;
}
+ if ( logger.isDebugEnabled() )
+ {
+ logger.debug( line );
+ }
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 e4958f4de..d9d930965 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 74de1ee0f..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,9 +54,9 @@ 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
- String baseUrl = StringUtils.endsWith( url, "/" )
- ? StringUtils.substringAfter( StringUtils.removeEnd( url, "/" ), "/" )
- : StringUtils.substringBeforeLast( url, "/" );
+ url = StringUtils.stripEnd( url, "/" );
+ int idx = url.lastIndexOf( "/" );
+ String baseUrl = url.substring( 0, idx );
Commandline cl = SvnCommandLineUtils.getBaseSvnCommandLine( fileSet == null ? null : fileSet.getBasedir(),
(SvnScmProviderRepository) repository );
@@ -67,7 +67,7 @@ public class SvnRemoteInfoCommand
CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
- LsConsumer consumer = new LsConsumer( baseUrl );
+ LsConsumer consumer = new LsConsumer( baseUrl + "/tags" );
int exitCode = 0;
@@ -94,11 +94,11 @@ public class SvnRemoteInfoCommand
cl.createArg().setValue( "ls" );
- cl.createArg().setValue( baseUrl + "/tags" + "@" );
+ cl.createArg().setValue( baseUrl + "/branches" + "@" );
stderr = new CommandLineUtils.StringStreamConsumer();
- consumer = new LsConsumer( baseUrl );
+ consumer = new LsConsumer( baseUrl + "/branches" );
Map<String, String> branchesInfos = null;
@@ -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/SvnExeRemoteInfoCommandTckTest.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
similarity index 72%
copy from maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/SvnExeRemoteInfoCommandTckTest.java
copy to 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 c06dc879f..3aa1bc4ae 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/SvnExeRemoteInfoCommandTckTest.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
@@ -20,28 +20,24 @@ package org.apache.maven.scm.provider.svn.svnexe.command.remoteinfo;
*/
import org.apache.maven.scm.command.remoteinfo.RemoteInfoScmResult;
-import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.svn.command.remoteinfo.AbstractSvnRemoteInfoCommandTckTest;
-import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
/**
* @author Bertrand Paquet
*/
-public class SvnExeRemoteInfoCommandTckTest
+public abstract class AbstractSvnExeRemoteInfoCommandTckTest
extends AbstractSvnRemoteInfoCommandTckTest
{
@Override
protected void checkResult( RemoteInfoScmResult result )
{
- assertTrue( result.getTags().keySet().contains( "maven-3.0" ) );
+ assertTrue( result.getTags().containsKey( "maven-3.0" ) );
+ String tagUrl = result.getTags().get( "maven-3.0" );
+ assertTrue( tagUrl.endsWith( "/tags/maven-3.0/" ) );
+ assertTrue( result.getBranches().containsKey( "MNG-3004" ) );
+ String branchUrl = result.getBranches().get( "MNG-3004" );
+ assertTrue( branchUrl.endsWith( "/branches/MNG-3004/" ) );
}
- @Override
- protected ScmProviderRepository getScmProviderRepository()
- throws Exception
- {
- return new SvnScmProviderRepository( "http://svn.apache.org/repos/asf/maven/maven-3/trunk" );
- }
-
-}
\ No newline at end of file
+}
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/SvnExeRemoteInfoCommandTckTest.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/SvnExeRemoteInfoCommandTckTest.java
index c06dc879f..458c70fc8 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/SvnExeRemoteInfoCommandTckTest.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/SvnExeRemoteInfoCommandTckTest.java
@@ -19,24 +19,16 @@ package org.apache.maven.scm.provider.svn.svnexe.command.remoteinfo;
* under the License.
*/
-import org.apache.maven.scm.command.remoteinfo.RemoteInfoScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.apache.maven.scm.provider.svn.command.remoteinfo.AbstractSvnRemoteInfoCommandTckTest;
import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
/**
* @author Bertrand Paquet
*/
public class SvnExeRemoteInfoCommandTckTest
- extends AbstractSvnRemoteInfoCommandTckTest
+ extends AbstractSvnExeRemoteInfoCommandTckTest
{
- @Override
- protected void checkResult( RemoteInfoScmResult result )
- {
- assertTrue( result.getTags().keySet().contains( "maven-3.0" ) );
- }
-
@Override
protected ScmProviderRepository getScmProviderRepository()
throws Exception
@@ -44,4 +36,4 @@ public class SvnExeRemoteInfoCommandTckTest
return new SvnScmProviderRepository( "http://svn.apache.org/repos/asf/maven/maven-3/trunk" );
}
-}
\ No newline at end of file
+}
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/SvnExeRemoteInfoCommandTckTest.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/SvnExeRemoteInfoCommandTrailingSlashTckTest.java
similarity index 72%
copy from maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/SvnExeRemoteInfoCommandTckTest.java
copy to maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/remoteinfo/SvnExeRemoteInfoCommandTrailingSlashTckTest.java
index c06dc879f..70bfd965a 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/SvnExeRemoteInfoCommandTckTest.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/SvnExeRemoteInfoCommandTrailingSlashTckTest.java
@@ -19,29 +19,21 @@ package org.apache.maven.scm.provider.svn.svnexe.command.remoteinfo;
* under the License.
*/
-import org.apache.maven.scm.command.remoteinfo.RemoteInfoScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.apache.maven.scm.provider.svn.command.remoteinfo.AbstractSvnRemoteInfoCommandTckTest;
import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
/**
* @author Bertrand Paquet
*/
-public class SvnExeRemoteInfoCommandTckTest
- extends AbstractSvnRemoteInfoCommandTckTest
+public class SvnExeRemoteInfoCommandTrailingSlashTckTest
+ extends AbstractSvnExeRemoteInfoCommandTckTest
{
- @Override
- protected void checkResult( RemoteInfoScmResult result )
- {
- assertTrue( result.getTags().keySet().contains( "maven-3.0" ) );
- }
-
@Override
protected ScmProviderRepository getScmProviderRepository()
throws Exception
{
- return new SvnScmProviderRepository( "http://svn.apache.org/repos/asf/maven/maven-3/trunk" );
+ return new SvnScmProviderRepository( "http://svn.apache.org/repos/asf/maven/maven-3/trunk/" );
}
-}
\ No newline at end of file
+}
diff --git a/pom.xml b/pom.xml
index 4e4a368da..082f4596a 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>