diff --git a/httpclient-benchmark/pom.xml b/httpclient-benchmark/pom.xml index c4041dfdc..e21c9bd80 100644 --- a/httpclient-benchmark/pom.xml +++ b/httpclient-benchmark/pom.xml @@ -62,7 +62,7 @@ org.apache.httpcomponents httpcore - 4.1 + 4.1.1 compile diff --git a/httpclient-cache/pom.xml b/httpclient-cache/pom.xml index 1c3b6b51d..3509ba099 100644 --- a/httpclient-cache/pom.xml +++ b/httpclient-cache/pom.xml @@ -40,17 +40,6 @@ http://hc.apache.org/httpcomponents-client jar - - - spy - Spy Repository - default - http://bleu.west.spy.net/~dustin/m2repo/ - - false - - - org.apache.httpcomponents @@ -61,47 +50,41 @@ commons-logging commons-logging - ${commons-logging.version} compile - - junit - junit - ${junit.version} - test - - - org.easymock - easymock - ${easymock.version} - test - - - org.easymock - easymockclassextension - ${easymock.version} - test - net.sf.ehcache ehcache-core - ${ehcache.version} compile true org.slf4j slf4j-jcl - ${slf4j.version} compile true spy - memcached - 2.5 + spymemcached + compile true + + junit + junit + test + + + org.easymock + easymock + test + + + org.easymock + easymockclassextension + test + @@ -111,13 +94,6 @@ 1.5 true true - - 4.1-alpha2 - - ${comparisonVersion} @@ -166,7 +142,7 @@ org.codehaus.mojo clirr-maven-plugin - ${cache.comparisonVersion} + ${comparisonVersion} diff --git a/httpclient/pom.xml b/httpclient/pom.xml index 8decf82fc..7583e4d22 100644 --- a/httpclient/pom.xml +++ b/httpclient/pom.xml @@ -44,31 +44,26 @@ org.apache.httpcomponents httpcore - ${httpcore.version} compile commons-logging commons-logging - ${commons-logging.version} compile commons-codec commons-codec - ${commons-codec.version} compile junit junit - ${junit.version} test org.mockito mockito-core - ${mockito.version} test diff --git a/httpmime/pom.xml b/httpmime/pom.xml index 34914fd26..cc7f65a4f 100644 --- a/httpmime/pom.xml +++ b/httpmime/pom.xml @@ -50,13 +50,11 @@ commons-logging commons-logging - ${commons-logging.version} compile junit junit - ${junit.version} test diff --git a/pom.xml b/pom.xml index af12621fd..b8354826b 100644 --- a/pom.xml +++ b/pom.xml @@ -68,17 +68,89 @@ UTF-8 UTF-8 - 4.1 + 4.1.1 1.1.1 1.4 2.2.0 + 2.6 1.5.11 4.8.2 2.5.2 1.8.5 - 4.0 + 4.1 + + + spy + Spy Repository + default + http://files.couchbase.com/maven2/ + + false + + + + + + + + org.apache.httpcomponents + httpcore + ${httpcore.version} + + + commons-logging + commons-logging + ${commons-logging.version} + + + commons-codec + commons-codec + ${commons-codec.version} + + + net.sf.ehcache + ehcache-core + ${ehcache.version} + + + org.slf4j + slf4j-jcl + ${slf4j.version} + + + spy + spymemcached + ${memcached.version} + + + junit + junit + ${junit.version} + test + + + org.mockito + mockito-core + ${mockito.version} + test + + + org.easymock + easymock + ${easymock.version} + test + + + org.easymock + easymockclassextension + ${easymock.version} + test + + + + httpclient httpmime