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/12/18 22:16:56 UTC
maven-wagon git commit: [WAGON-471] Clean up dependency mess
(reported by dependency:analyze)
Repository: maven-wagon
Updated Branches:
refs/heads/master 269ad4b74 -> be9440073
[WAGON-471] Clean up dependency mess (reported by dependency:analyze)
* Clean up incorrectly used dependencies (dependency:analyze)
* Get rid of ancient ones (commons-logging, log4j)
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/be944007
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/be944007
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/be944007
Branch: refs/heads/master
Commit: be94400731575f54ff537ec90359460f42a561cc
Parents: 269ad4b
Author: Michael Osipov <mi...@apache.org>
Authored: Sun Dec 18 23:14:09 2016 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Dec 18 23:14:09 2016 +0100
----------------------------------------------------------------------
pom.xml | 19 +++-----
wagon-provider-api/pom.xml | 4 ++
wagon-provider-test/pom.xml | 22 +++++++--
.../org/apache/maven/wagon/WagonTestCase.java | 6 ++-
wagon-providers/wagon-file/pom.xml | 7 +++
wagon-providers/wagon-http-lightweight/pom.xml | 17 +++++++
wagon-providers/wagon-http-shared/pom.xml | 12 +++++
.../shared/http/HtmlFileListParserTest.java | 6 ++-
wagon-providers/wagon-http/pom.xml | 49 ++++++++++++++++----
.../http/ErrorWithReasonPhaseServlet.java | 7 +--
.../providers/http/WaitForeverServlet.java | 7 +--
wagon-providers/wagon-scm/pom.xml | 6 +--
wagon-providers/wagon-ssh-common-test/pom.xml | 18 +++++--
wagon-providers/wagon-ssh-common/pom.xml | 4 ++
wagon-providers/wagon-ssh-external/pom.xml | 17 +------
wagon-providers/wagon-ssh/pom.xml | 26 ++++++-----
wagon-providers/wagon-webdav-jackrabbit/pom.xml | 17 +++++--
wagon-tcks/wagon-tck-http/pom.xml | 22 ++++++++-
.../maven/wagon/tck/http/GetWagonTests.java | 8 ++--
.../maven/wagon/tck/http/HttpWagonTests.java | 12 +++--
.../tck/http/WagonTestCaseConfigurator.java | 6 ++-
.../wagon/tck/http/fixture/AuthSnoopFilter.java | 6 ++-
.../wagon/tck/http/fixture/LatencyServlet.java | 6 ++-
.../fixture/ProxyConnectionVerifierFilter.java | 5 +-
.../wagon/tck/http/fixture/ServerFixture.java | 8 ++--
.../maven/wagon/tck/http/util/TestUtil.java | 10 ++--
26 files changed, 226 insertions(+), 101 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index eefa01a..159fc51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,14 +224,6 @@ under the License.
<module>wagon-tcks</module>
</modules>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -258,6 +250,7 @@ under the License.
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -304,11 +297,6 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4jVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4jVersion}</version>
</dependency>
@@ -329,6 +317,11 @@ under the License.
<artifactId>jetty</artifactId>
<version>6.1.26</version>
</dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5-20081211</version>
+ </dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-provider-api/pom.xml
----------------------------------------------------------------------
diff --git a/wagon-provider-api/pom.xml b/wagon-provider-api/pom.xml
index c5cdbc4..a61196e 100644
--- a/wagon-provider-api/pom.xml
+++ b/wagon-provider-api/pom.xml
@@ -41,5 +41,9 @@ under the License.
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-provider-test/pom.xml
----------------------------------------------------------------------
diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml
index ee4abaa..e9b4645 100644
--- a/wagon-provider-test/pom.xml
+++ b/wagon-provider-test/pom.xml
@@ -33,10 +33,6 @@ under the License.
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
</dependency>
@@ -46,6 +42,10 @@ under the License.
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>compile</scope>
@@ -54,6 +54,18 @@ under the License.
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
----------------------------------------------------------------------
diff --git a/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java b/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
index d79c187..fb277c7 100644
--- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
+++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
@@ -19,7 +19,6 @@ package org.apache.maven.wagon;
* under the License.
*/
-import org.apache.log4j.Logger;
import org.apache.maven.wagon.authentication.AuthenticationException;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.authorization.AuthorizationException;
@@ -38,6 +37,9 @@ import org.easymock.IAnswer;
import static org.easymock.EasyMock.*;
//CHECKSTYLE_ON: AvoidStarImport
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.File;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
@@ -52,7 +54,7 @@ import java.util.List;
public abstract class WagonTestCase
extends PlexusTestCase
{
- protected static Logger logger = Logger.getLogger( WagonTestCase.class );
+ protected static Logger logger = LoggerFactory.getLogger( WagonTestCase.class );
static final class ProgressAnswer implements IAnswer
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-providers/wagon-file/pom.xml
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-file/pom.xml b/wagon-providers/wagon-file/pom.xml
index 7deaa9b..5b5c96a 100644
--- a/wagon-providers/wagon-file/pom.xml
+++ b/wagon-providers/wagon-file/pom.xml
@@ -32,4 +32,11 @@ under the License.
<description>
Wagon provider that gets and puts artifacts using file system protocol
</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-providers/wagon-http-lightweight/pom.xml
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-http-lightweight/pom.xml b/wagon-providers/wagon-http-lightweight/pom.xml
index eb7f1f2..69af15f 100644
--- a/wagon-providers/wagon-http-lightweight/pom.xml
+++ b/wagon-providers/wagon-http-lightweight/pom.xml
@@ -47,5 +47,22 @@ under the License.
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/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 a69dc5d..04bf67e 100644
--- a/wagon-providers/wagon-http-shared/pom.xml
+++ b/wagon-providers/wagon-http-shared/pom.xml
@@ -43,5 +43,17 @@ under the License.
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-providers/wagon-http-shared/src/test/java/org/apache/maven/wagon/shared/http/HtmlFileListParserTest.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-http-shared/src/test/java/org/apache/maven/wagon/shared/http/HtmlFileListParserTest.java b/wagon-providers/wagon-http-shared/src/test/java/org/apache/maven/wagon/shared/http/HtmlFileListParserTest.java
index 7e93d12..74df4d8 100644
--- a/wagon-providers/wagon-http-shared/src/test/java/org/apache/maven/wagon/shared/http/HtmlFileListParserTest.java
+++ b/wagon-providers/wagon-http-shared/src/test/java/org/apache/maven/wagon/shared/http/HtmlFileListParserTest.java
@@ -25,16 +25,18 @@ import java.util.List;
import junit.framework.TestCase;
-import org.apache.log4j.Logger;
import org.apache.maven.wagon.TransferFailedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Unit Tests for the HtmlFileListParser
*/
public class HtmlFileListParserTest
extends TestCase
{
- private static Logger logger = Logger.getLogger( HtmlFileListParserTest.class );
+ private static Logger logger = LoggerFactory.getLogger( HtmlFileListParserTest.class );
private void assertContainsExpected( List<String> links, String[] expected )
{
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-providers/wagon-http/pom.xml
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-http/pom.xml b/wagon-providers/wagon-http/pom.xml
index 618cf74..f89885d 100644
--- a/wagon-providers/wagon-http/pom.xml
+++ b/wagon-providers/wagon-http/pom.xml
@@ -43,16 +43,54 @@ under the License.
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.3</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- used for the TCK -->
<dependency>
@@ -84,7 +122,6 @@ under the License.
<includes>
<include>org.apache.httpcomponents:httpclient</include>
<include>org.apache.httpcomponents:httpcore</include>
- <include>commons-logging:commons-logging</include>
<include>commons-codec:commons-codec</include>
<include>commons-io:commons-io</include>
<include>org.jsoup:jsoup</include>
@@ -107,10 +144,6 @@ under the License.
<shadedPattern>org.apache.maven.wagon.providers.http.org.jsoup</shadedPattern>
</relocation>
<relocation>
- <pattern>org.apache.commons.logging</pattern>
- <shadedPattern>org.apache.maven.wagon.providers.http.commons.logging</shadedPattern>
- </relocation>
- <relocation>
<pattern>org.apache.http</pattern>
<shadedPattern>org.apache.maven.wagon.providers.http.httpclient</shadedPattern>
</relocation>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/ErrorWithReasonPhaseServlet.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/ErrorWithReasonPhaseServlet.java b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/ErrorWithReasonPhaseServlet.java
index 529c59d..6528c41 100644
--- a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/ErrorWithReasonPhaseServlet.java
+++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/ErrorWithReasonPhaseServlet.java
@@ -19,14 +19,15 @@ package org.apache.maven.wagon.providers.http;
* under the License.
*/
-import org.apache.log4j.Logger;
-
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* User: jdumay
* Date: 24/01/2008
@@ -37,7 +38,7 @@ public class ErrorWithReasonPhaseServlet
{
public static final String REASON = "it sucks!";
- private Logger logger = Logger.getLogger( ErrorWithReasonPhaseServlet.class );
+ private Logger logger = LoggerFactory.getLogger( ErrorWithReasonPhaseServlet.class );
public void service( HttpServletRequest request, HttpServletResponse response )
throws ServletException, IOException
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/WaitForeverServlet.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/WaitForeverServlet.java b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/WaitForeverServlet.java
index 9ca3b98..2900478 100644
--- a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/WaitForeverServlet.java
+++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/WaitForeverServlet.java
@@ -19,14 +19,15 @@ package org.apache.maven.wagon.providers.http;
* under the License.
*/
-import org.apache.log4j.Logger;
-
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* User: jdumay
* Date: 24/01/2008
@@ -36,7 +37,7 @@ public class WaitForeverServlet
extends HttpServlet
{
- private Logger logger = Logger.getLogger( WaitForeverServlet.class );
+ private Logger logger = LoggerFactory.getLogger( WaitForeverServlet.class );
public void service( HttpServletRequest request, HttpServletResponse response )
throws ServletException, IOException
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-providers/wagon-scm/pom.xml
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-scm/pom.xml b/wagon-providers/wagon-scm/pom.xml
index 60b8583..923b6bd 100644
--- a/wagon-providers/wagon-scm/pom.xml
+++ b/wagon-providers/wagon-scm/pom.xml
@@ -50,10 +50,8 @@ under the License.
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-test</artifactId>
- <version>${mavenScmVersion}</version>
- <scope>test</scope>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-providers/wagon-ssh-common-test/pom.xml
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ssh-common-test/pom.xml b/wagon-providers/wagon-ssh-common-test/pom.xml
index 5f97161..d2e9c4f 100644
--- a/wagon-providers/wagon-ssh-common-test/pom.xml
+++ b/wagon-providers/wagon-ssh-common-test/pom.xml
@@ -37,6 +37,10 @@ under the License.
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
@@ -49,13 +53,19 @@ under the License.
<artifactId>wagon-ssh-common</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-core</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.sshd</groupId>
- <artifactId>sshd-core</artifactId>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>2.0.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-providers/wagon-ssh-common/pom.xml
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ssh-common/pom.xml b/wagon-providers/wagon-ssh-common/pom.xml
index a281d5f..f9a15ad 100644
--- a/wagon-providers/wagon-ssh-common/pom.xml
+++ b/wagon-providers/wagon-ssh-common/pom.xml
@@ -45,5 +45,9 @@ under the License.
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-providers/wagon-ssh-external/pom.xml
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ssh-external/pom.xml b/wagon-providers/wagon-ssh-external/pom.xml
index 965b4ac..73d676f 100644
--- a/wagon-providers/wagon-ssh-external/pom.xml
+++ b/wagon-providers/wagon-ssh-external/pom.xml
@@ -52,24 +52,9 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.sshd</groupId>
- <artifactId>sshd-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
+ <artifactId>slf4j-simple</artifactId>
</dependency>
-
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>140</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-providers/wagon-ssh/pom.xml
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ssh/pom.xml b/wagon-providers/wagon-ssh/pom.xml
index fbfd592..9381c98 100644
--- a/wagon-providers/wagon-ssh/pom.xml
+++ b/wagon-providers/wagon-ssh/pom.xml
@@ -55,6 +55,10 @@ under the License.
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-interactivity-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-common</artifactId>
</dependency>
@@ -63,27 +67,25 @@ under the License.
<artifactId>wagon-ssh-common-test</artifactId>
<scope>test</scope>
</dependency>
-
-
<dependency>
- <groupId>org.apache.sshd</groupId>
- <artifactId>sshd-core</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>140</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/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 0450961..4eb0aa2 100644
--- a/wagon-providers/wagon-webdav-jackrabbit/pom.xml
+++ b/wagon-providers/wagon-webdav-jackrabbit/pom.xml
@@ -62,6 +62,10 @@ under the License.
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -70,6 +74,7 @@ under the License.
<dependency> <!-- required for commons-httpclient:commons-httpclient -->
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
@@ -96,9 +101,12 @@ under the License.
<!-- Test dependencies -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -110,8 +118,7 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
+ <artifactId>slf4j-simple</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-tcks/wagon-tck-http/pom.xml
----------------------------------------------------------------------
diff --git a/wagon-tcks/wagon-tck-http/pom.xml b/wagon-tcks/wagon-tck-http/pom.xml
index da280f9..823332d 100644
--- a/wagon-tcks/wagon-tck-http/pom.xml
+++ b/wagon-tcks/wagon-tck-http/pom.xml
@@ -38,14 +38,19 @@ under the License.
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
+ <version>2.2.2</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
</dependency>
<dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
<version>${project.version}</version>
@@ -55,6 +60,19 @@ under the License.
<artifactId>commons-codec</artifactId>
<version>1.4</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/GetWagonTests.java
----------------------------------------------------------------------
diff --git a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/GetWagonTests.java b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/GetWagonTests.java
index 01152a0..1562369 100644
--- a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/GetWagonTests.java
+++ b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/GetWagonTests.java
@@ -133,7 +133,7 @@ public class GetWagonTests
if ( getWagon() instanceof StreamWagon )
{
- LOGGER.info( "Connection timeout is: " + getWagon().getTimeout() );
+ logger.info( "Connection timeout is: " + getWagon().getTimeout() );
}
File target = newTempFile();
@@ -178,7 +178,7 @@ public class GetWagonTests
try
{
- LOGGER.info( "Waiting 60 seconds for wagon timeout." );
+ logger.info( "Waiting 60 seconds for wagon timeout." );
t.join( ONE_MINUTE );
}
catch ( InterruptedException e )
@@ -186,7 +186,7 @@ public class GetWagonTests
e.printStackTrace();
}
- LOGGER.info( "Interrupting thread." );
+ logger.info( "Interrupting thread." );
t.interrupt();
assertTrue( "TransferFailedException should have been thrown.", holder.getValue() );
@@ -519,7 +519,7 @@ public class GetWagonTests
if ( getWagon() instanceof StreamWagon )
{
- LOGGER.info( "Connection timeout is: " + getWagon().getTimeout() );
+ logger.info( "Connection timeout is: " + getWagon().getTimeout() );
}
File target = newTempFile();
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java
----------------------------------------------------------------------
diff --git a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java
index bad033c..5cdbbf5 100644
--- a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java
+++ b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
-import org.apache.log4j.Logger;
import org.apache.maven.wagon.ConnectionException;
import org.apache.maven.wagon.Wagon;
import org.apache.maven.wagon.authentication.AuthenticationException;
@@ -43,6 +42,9 @@ import org.junit.Before;
import org.junit.BeforeClass;
import static org.apache.maven.wagon.tck.http.util.TestUtil.getResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
*/
@@ -65,7 +67,9 @@ public abstract class HttpWagonTests
private final Set<Object> notificationTargets = new HashSet<Object>();
- protected static final Logger LOGGER = Logger.getLogger( HttpWagonTests.class );
+ // CHECKSTYLE_OFF: ConstantName
+ protected static final Logger logger = LoggerFactory.getLogger( HttpWagonTests.class );
+ // CHECKSTYLE_ON: ConstantName
@Before
public void beforeEach()
@@ -218,7 +222,7 @@ public abstract class HttpWagonTests
if ( testCaseId == null || !configurator.isSupported( testCaseId ) )
{
- LOGGER.error( "Cannot run test: " + testCaseId
+ logger.error( "Cannot run test: " + testCaseId
+ ". Wagon under test does not support this test case." );
return false;
}
@@ -253,7 +257,7 @@ public abstract class HttpWagonTests
if ( testCaseId == null || !configurator.configureWagonForTest( wagon, testCaseId ) )
{
- LOGGER.error( "Cannot run test: " + testCaseId
+ logger.error( "Cannot run test: " + testCaseId
+ ". Wagon under test does not support this test case." );
return false;
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/WagonTestCaseConfigurator.java
----------------------------------------------------------------------
diff --git a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/WagonTestCaseConfigurator.java b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/WagonTestCaseConfigurator.java
index 835e222..8d154cb 100644
--- a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/WagonTestCaseConfigurator.java
+++ b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/WagonTestCaseConfigurator.java
@@ -19,7 +19,6 @@ package org.apache.maven.wagon.tck.http;
* under the License.
*/
-import org.apache.log4j.Logger;
import org.apache.maven.wagon.Wagon;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
@@ -32,6 +31,9 @@ import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
*/
@@ -48,7 +50,7 @@ public class WagonTestCaseConfigurator
private String wagonHint;
- private static Logger logger = Logger.getLogger( WagonTestCaseConfigurator.class );
+ private static Logger logger = LoggerFactory.getLogger( WagonTestCaseConfigurator.class );
public boolean isSupported( final String useCaseId )
{
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/AuthSnoopFilter.java
----------------------------------------------------------------------
diff --git a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/AuthSnoopFilter.java b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/AuthSnoopFilter.java
index 233fe4d..dd23d9b 100644
--- a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/AuthSnoopFilter.java
+++ b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/AuthSnoopFilter.java
@@ -30,7 +30,9 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.codec.binary.Base64;
-import org.apache.log4j.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -38,7 +40,7 @@ import org.apache.log4j.Logger;
public class AuthSnoopFilter
implements Filter
{
- private static Logger logger = Logger.getLogger( AuthSnoopFilter.class );
+ private static Logger logger = LoggerFactory.getLogger( AuthSnoopFilter.class );
public void destroy()
{
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/LatencyServlet.java
----------------------------------------------------------------------
diff --git a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/LatencyServlet.java b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/LatencyServlet.java
index 80e6f38..1760a75 100644
--- a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/LatencyServlet.java
+++ b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/LatencyServlet.java
@@ -29,16 +29,18 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
import org.codehaus.plexus.util.IOUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
*/
public class LatencyServlet
extends HttpServlet
{
- private static Logger logger = Logger.getLogger( LatencyServlet.class );
+ private static Logger logger = LoggerFactory.getLogger( LatencyServlet.class );
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ProxyConnectionVerifierFilter.java
----------------------------------------------------------------------
diff --git a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ProxyConnectionVerifierFilter.java b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ProxyConnectionVerifierFilter.java
index 0c2bc39..4d869bc 100644
--- a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ProxyConnectionVerifierFilter.java
+++ b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ProxyConnectionVerifierFilter.java
@@ -31,7 +31,8 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -39,7 +40,7 @@ import org.apache.log4j.Logger;
public class ProxyConnectionVerifierFilter
implements Filter
{
- private static Logger logger = Logger.getLogger( ProxyConnectionVerifierFilter.class );
+ private static Logger logger = LoggerFactory.getLogger( ProxyConnectionVerifierFilter.class );
public void destroy()
{
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java
----------------------------------------------------------------------
diff --git a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java
index f73e7e7..9152e34 100644
--- a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java
+++ b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java
@@ -19,7 +19,6 @@ package org.apache.maven.wagon.tck.http.fixture;
* under the License.
*/
-import org.apache.log4j.Logger;
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Handler;
import org.mortbay.jetty.Server;
@@ -46,12 +45,15 @@ import java.net.URISyntaxException;
import static org.apache.maven.wagon.tck.http.util.TestUtil.getResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
*/
public class ServerFixture
{
- private static Logger logger = Logger.getLogger( ServerFixture.class );
+ private static Logger logger = LoggerFactory.getLogger( ServerFixture.class );
public static final String SERVER_ROOT_RESOURCE_PATH = "default-server-root";
@@ -84,7 +86,7 @@ public class ServerFixture
SslSocketConnector connector = new SslSocketConnector();
String keystore = getResource( SERVER_SSL_KEYSTORE_RESOURCE_PATH ).getAbsolutePath();
- Logger.getLogger( ServerFixture.class ).info( "TCK Keystore path: " + keystore );
+ LoggerFactory.getLogger( ServerFixture.class ).info( "TCK Keystore path: " + keystore );
System.setProperty( "javax.net.ssl.keyStore", keystore );
System.setProperty( "javax.net.ssl.trustStore", keystore );
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/be944007/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util/TestUtil.java
----------------------------------------------------------------------
diff --git a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util/TestUtil.java b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util/TestUtil.java
index 53748f2..dc619c7 100644
--- a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util/TestUtil.java
+++ b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util/TestUtil.java
@@ -32,15 +32,19 @@ import java.util.Map;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
-import org.apache.log4j.Logger;
import org.codehaus.plexus.util.IOUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
*
*/
public final class TestUtil
{
- private static final Logger LOGGER = Logger.getLogger( TestUtil.class );
+ // CHECKSTYLE_OFF: ConstantName
+ private static final Logger logger = LoggerFactory.getLogger( TestUtil.class );
+ // CHECKSTYLE_ON: ConstantName
private static final Map<String, File> BASES = new HashMap<String, File>();
@@ -75,7 +79,7 @@ public final class TestUtil
base = new File( "target/tck-resources/" + urlFile.getName() );
base.getParentFile().mkdirs();
- LOGGER.info( "unpacking test resources in jar: " + url );
+ logger.info( "unpacking test resources in jar: " + url );
JarFile jf = null;
try
{