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/01/02 00:01:14 UTC
maven-wagon git commit: [WAGON-447] Replace Commons Lang with Plexus
Utils
Repository: maven-wagon
Updated Branches:
refs/heads/WAGON-447 [created] 5c8c8ed8c
[WAGON-447] Replace Commons Lang with Plexus Utils
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/5c8c8ed8
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/5c8c8ed8
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/5c8c8ed8
Branch: refs/heads/WAGON-447
Commit: 5c8c8ed8cfb5825987bb5b13e8ad4c9be4217b77
Parents: d4c1240
Author: Michael Osipov <19...@gmx.net>
Authored: Sat Jan 2 00:00:43 2016 +0100
Committer: Michael Osipov <19...@gmx.net>
Committed: Sat Jan 2 00:00:43 2016 +0100
----------------------------------------------------------------------
pom.xml | 5 -----
wagon-providers/wagon-file/pom.xml | 4 ++--
.../java/org/apache/maven/wagon/providers/file/FileWagon.java | 2 +-
wagon-providers/wagon-http-shared/pom.xml | 4 ++--
.../java/org/apache/maven/wagon/shared/http/EncodingUtil.java | 2 +-
.../org/apache/maven/wagon/shared/http/HtmlFileListParser.java | 2 +-
wagon-providers/wagon-http/pom.xml | 5 -----
wagon-providers/wagon-webdav-jackrabbit/pom.xml | 4 ++--
.../maven/wagon/providers/webdav/AbstractHttpClientWagon.java | 2 +-
9 files changed, 10 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5c8c8ed8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fc9b1f5..9ab38e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -312,11 +312,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/5c8c8ed8/wagon-providers/wagon-file/pom.xml
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-file/pom.xml b/wagon-providers/wagon-file/pom.xml
index a039625..aca7633 100644
--- a/wagon-providers/wagon-file/pom.xml
+++ b/wagon-providers/wagon-file/pom.xml
@@ -34,8 +34,8 @@ under the License.
</description>
<dependencies>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5c8c8ed8/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..ee70636 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;
@@ -41,6 +40,7 @@ import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.authorization.AuthorizationException;
import org.apache.maven.wagon.resource.Resource;
import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.StringUtils;
/**
* Wagon Provider for Local File System
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5c8c8ed8/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..533d320 100644
--- a/wagon-providers/wagon-http-shared/pom.xml
+++ b/wagon-providers/wagon-http-shared/pom.xml
@@ -40,8 +40,8 @@ under the License.
<version>1.7.2</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5c8c8ed8/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..0775fca 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,7 +19,7 @@ package org.apache.maven.wagon.shared.http;
* under the License.
*/
-import org.apache.commons.lang.StringUtils;
+import org.codehaus.plexus.util.StringUtils;
import java.net.MalformedURLException;
import java.net.URI;
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5c8c8ed8/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..42d2618 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,8 +20,8 @@ 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.codehaus.plexus.util.StringUtils;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5c8c8ed8/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/5c8c8ed8/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..0cfa477 100644
--- a/wagon-providers/wagon-webdav-jackrabbit/pom.xml
+++ b/wagon-providers/wagon-webdav-jackrabbit/pom.xml
@@ -73,8 +73,8 @@ under the License.
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5c8c8ed8/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 232e19b..709ba78 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;
@@ -55,6 +54,7 @@ import org.apache.maven.wagon.repository.Repository;
import org.apache.maven.wagon.resource.Resource;
import org.apache.maven.wagon.shared.http.EncodingUtil;
import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.StringUtils;
import java.io.ByteArrayInputStream;
import java.io.File;