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 2016/05/28 23:16:16 UTC
maven-wagon git commit: [WAGON-447] Remove Commons Lang 2 for a few
cases
Repository: maven-wagon
Updated Branches:
refs/heads/master 6df8f317f -> f341bf76f
[WAGON-447] Remove Commons Lang 2 for a few cases
This closes #20
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/f341bf76
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/f341bf76
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/f341bf76
Branch: refs/heads/master
Commit: f341bf76f368b8a088b048eef727a48d75dbad20
Parents: 6df8f31
Author: Michael Osipov <mi...@apache.org>
Authored: Sun May 29 01:15:17 2016 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun May 29 01:15:17 2016 +0200
----------------------------------------------------------------------
pom.xml | 5 -----
wagon-providers/wagon-file/pom.xml | 6 ------
.../org/apache/maven/wagon/providers/file/FileWagon.java | 7 +++----
wagon-providers/wagon-http-shared/pom.xml | 4 ----
.../org/apache/maven/wagon/shared/http/EncodingUtil.java | 4 +---
.../apache/maven/wagon/shared/http/HtmlFileListParser.java | 5 ++---
wagon-providers/wagon-http/pom.xml | 5 -----
wagon-providers/wagon-webdav-jackrabbit/pom.xml | 4 ----
.../wagon/providers/webdav/AbstractHttpClientWagon.java | 8 ++++----
9 files changed, 10 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f341bf76/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f49dc11..2010573 100644
--- a/pom.xml
+++ b/pom.xml
@@ -315,11 +315,6 @@ under the License.
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.2</version>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f341bf76/wagon-providers/wagon-file/pom.xml
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-file/pom.xml b/wagon-providers/wagon-file/pom.xml
index a039625..7deaa9b 100644
--- a/wagon-providers/wagon-file/pom.xml
+++ b/wagon-providers/wagon-file/pom.xml
@@ -32,10 +32,4 @@ under the License.
<description>
Wagon provider that gets and puts artifacts using file system protocol
</description>
- <dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f341bf76/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java b/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
index 2776657..a1da2b8 100644
--- a/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
+++ b/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
@@ -30,7 +30,6 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
import org.apache.maven.wagon.ConnectionException;
import org.apache.maven.wagon.InputData;
import org.apache.maven.wagon.LazyFileOutputStream;
@@ -44,7 +43,7 @@ import org.codehaus.plexus.util.FileUtils;
/**
* Wagon Provider for Local File System
- *
+ *
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
*
* @plexus.component role="org.apache.maven.wagon.Wagon" role-hint="file" instantiation-strategy="per-lookup"
@@ -203,7 +202,7 @@ public class FileWagon
{
String basedir = getRepository().getBasedir();
- destinationPath = StringUtils.replace( destinationPath, "\\", "/" );
+ destinationPath = destinationPath.replace( "\\", "/" );
File path;
@@ -268,7 +267,7 @@ public class FileWagon
{
return file.isDirectory();
}
-
+
return file.exists();
}
}
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f341bf76/wagon-providers/wagon-http-shared/pom.xml
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-http-shared/pom.xml b/wagon-providers/wagon-http-shared/pom.xml
index 12ebd5b..a69dc5d 100644
--- a/wagon-providers/wagon-http-shared/pom.xml
+++ b/wagon-providers/wagon-http-shared/pom.xml
@@ -40,10 +40,6 @@ under the License.
<version>1.7.2</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f341bf76/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/EncodingUtil.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/EncodingUtil.java b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/EncodingUtil.java
index 9136553..1794288 100644
--- a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/EncodingUtil.java
+++ b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/EncodingUtil.java
@@ -19,8 +19,6 @@ package org.apache.maven.wagon.shared.http;
* under the License.
*/
-import org.apache.commons.lang.StringUtils;
-
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -90,7 +88,7 @@ public class EncodingUtil
String[] parts = paths == null ? //
new String[0] : //
- paths.length == 1 ? StringUtils.split( paths[0], "/" ) : paths;
+ paths.length == 1 ? paths[0].split( "/" ) : paths;
for ( String part : parts )
{
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f341bf76/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HtmlFileListParser.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HtmlFileListParser.java b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HtmlFileListParser.java
index 5ff34d9..e27696a 100644
--- a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HtmlFileListParser.java
+++ b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/HtmlFileListParser.java
@@ -20,7 +20,6 @@ package org.apache.maven.wagon.shared.http;
*/
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
import org.apache.maven.wagon.TransferFailedException;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
@@ -109,7 +108,7 @@ public class HtmlFileListParser
private static String cleanLink( URI baseURI, String link )
{
- if ( StringUtils.isEmpty( link ) )
+ if ( link == null || link.length() == 0 )
{
return "";
}
@@ -146,7 +145,7 @@ public class HtmlFileListParser
private static boolean isAcceptableLink( String link )
{
- if ( StringUtils.isEmpty( link ) )
+ if ( link == null || link.length() == 0 )
{
return false;
}
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f341bf76/wagon-providers/wagon-http/pom.xml
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-http/pom.xml b/wagon-providers/wagon-http/pom.xml
index d0c5d96..618cf74 100644
--- a/wagon-providers/wagon-http/pom.xml
+++ b/wagon-providers/wagon-http/pom.xml
@@ -86,7 +86,6 @@ under the License.
<include>org.apache.httpcomponents:httpcore</include>
<include>commons-logging:commons-logging</include>
<include>commons-codec:commons-codec</include>
- <include>commons-lang:commons-lang</include>
<include>commons-io:commons-io</include>
<include>org.jsoup:jsoup</include>
<include>org.apache.maven.wagon:wagon-http-shared</include>
@@ -100,10 +99,6 @@ under the License.
<shadedPattern>org.apache.maven.wagon.providers.http.commons.codec</shadedPattern>
</relocation>
<relocation>
- <pattern>org.apache.commons.lang</pattern>
- <shadedPattern>org.apache.maven.wagon.providers.http.commons.lang</shadedPattern>
- </relocation>
- <relocation>
<pattern>org.apache.commons.io</pattern>
<shadedPattern>org.apache.maven.wagon.providers.http.commons.io</shadedPattern>
</relocation>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f341bf76/wagon-providers/wagon-webdav-jackrabbit/pom.xml
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-webdav-jackrabbit/pom.xml b/wagon-providers/wagon-webdav-jackrabbit/pom.xml
index 73b1fc6..0450961 100644
--- a/wagon-providers/wagon-webdav-jackrabbit/pom.xml
+++ b/wagon-providers/wagon-webdav-jackrabbit/pom.xml
@@ -73,10 +73,6 @@ under the License.
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f341bf76/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/AbstractHttpClientWagon.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/AbstractHttpClientWagon.java b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/AbstractHttpClientWagon.java
index 7a500f8..3d20c61 100644
--- a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/AbstractHttpClientWagon.java
+++ b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/AbstractHttpClientWagon.java
@@ -40,7 +40,6 @@ import org.apache.commons.httpclient.params.HttpMethodParams;
import org.apache.commons.httpclient.util.DateParseException;
import org.apache.commons.httpclient.util.DateUtil;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
import org.apache.maven.wagon.InputData;
import org.apache.maven.wagon.OutputData;
import org.apache.maven.wagon.PathUtils;
@@ -214,7 +213,7 @@ public abstract class AbstractHttpClientWagon
{
username = authenticationInfo.getUserName();
- if ( StringUtils.contains( username, "\\" ) )
+ if ( username != null && username.contains( "\\" ) )
{
String[] domainAndUsername = username.split( "\\\\" );
domain = domainAndUsername[0];
@@ -228,7 +227,8 @@ public abstract class AbstractHttpClientWagon
String host = getRepository().getHost();
- if ( StringUtils.isNotEmpty( username ) && StringUtils.isNotEmpty( password ) )
+ if ( !( username == null || username.length() == 0 )
+ && !( password == null || password.length() == 0 ) )
{
Credentials creds;
if ( domain != null )
@@ -579,7 +579,7 @@ public abstract class AbstractHttpClientWagon
}
}
}
-
+
private static final String DEFAULT_USER_AGENT = getDefaultUserAgent();
private static String getDefaultUserAgent()