diff --git a/httpclient-benchmark/pom.xml b/httpclient-benchmark/pom.xml
index bac3bbdb6..6e8b06363 100644
--- a/httpclient-benchmark/pom.xml
+++ b/httpclient-benchmark/pom.xml
@@ -30,7 +30,7 @@
   <parent>
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpcomponents-client</artifactId>
-    <version>4.1-alpha2-SNAPSHOT</version>
+    <version>4.1-alpha2</version>
   </parent>
   <artifactId>httpclient-benchmark</artifactId>
   <name>HttpClient Benchmarks</name>
@@ -53,21 +53,19 @@
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
       <version>${project.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore</artifactId>
-      <version>4.1-alpha2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
-      <version>3.1</version>
+      <version>4.1-beta1</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
       <version>3.1</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
diff --git a/httpclient-cache/pom.xml b/httpclient-cache/pom.xml
index d576936b3..b4172a00d 100644
--- a/httpclient-cache/pom.xml
+++ b/httpclient-cache/pom.xml
@@ -30,7 +30,7 @@
   <parent>
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpcomponents-client</artifactId>
-    <version>4.1-alpha2-SNAPSHOT</version>
+    <version>4.1-alpha2</version>
   </parent>
   <artifactId>httpclient-cache</artifactId>
   <name>HttpClient Cache</name>
diff --git a/httpclient-contrib/pom.xml b/httpclient-contrib/pom.xml
index 3851cef1b..c7e1f28b9 100644
--- a/httpclient-contrib/pom.xml
+++ b/httpclient-contrib/pom.xml
@@ -30,7 +30,7 @@
   <parent>
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpcomponents-client</artifactId>
-    <version>4.1-alpha2-SNAPSHOT</version>
+    <version>4.1-alpha2</version>
   </parent>
   <artifactId>httpclient-contrib</artifactId>
   <name>HttpClient Contrib</name>
diff --git a/httpclient-osgi/pom.xml b/httpclient-osgi/pom.xml
index f9fa28c84..175aa42ff 100644
--- a/httpclient-osgi/pom.xml
+++ b/httpclient-osgi/pom.xml
@@ -30,7 +30,7 @@
   <parent>
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpcomponents-client</artifactId>
-    <version>4.1-alpha2-SNAPSHOT</version>
+    <version>4.1-alpha2</version>
   </parent>
   <artifactId>httpclient-osgi</artifactId>
   <name>HttpClient OSGi bundle</name>
@@ -54,16 +54,25 @@
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
       <version>${project.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
       <version>${commons-codec.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
       <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient-cache</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
 
diff --git a/httpclient/pom.xml b/httpclient/pom.xml
index d5f061e3f..51a58f402 100644
--- a/httpclient/pom.xml
+++ b/httpclient/pom.xml
@@ -30,7 +30,7 @@
   <parent>
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpcomponents-client</artifactId>
-    <version>4.1-alpha2-SNAPSHOT</version>
+    <version>4.1-alpha2</version>
   </parent>
   <artifactId>httpclient</artifactId>
   <name>HttpClient</name>
@@ -53,16 +53,19 @@
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore</artifactId>
       <version>${httpcore.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>${commons-logging.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
       <version>${commons-codec.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -73,7 +76,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
+      <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/httpmime/pom.xml b/httpmime/pom.xml
index 59b7092d2..c90966438 100644
--- a/httpmime/pom.xml
+++ b/httpmime/pom.xml
@@ -30,7 +30,7 @@
   <parent>
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpcomponents-client</artifactId>
-    <version>4.1-alpha2-SNAPSHOT</version>
+    <version>4.1-alpha2</version>
   </parent>
   <artifactId>httpmime</artifactId>
   <name>HttpMime</name>
@@ -53,11 +53,13 @@
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore</artifactId>
       <version>${httpcore.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>${commons-logging.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml
index 88590a661..d4f2cfdcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
   <groupId>org.apache.httpcomponents</groupId>
   <artifactId>httpcomponents-client</artifactId>
   <name>HttpComponents Client</name>
-  <version>4.1-alpha2-SNAPSHOT</version>
+  <version>4.1-alpha2</version>
   <description>Components to build client side HTTP services</description>
   <url>http://hc.apache.org/httpcomponents-client</url>
   <inceptionYear>1999</inceptionYear>
@@ -60,9 +60,9 @@
   </issueManagement>
 
   <scm>
-    <connection>scm:svn:https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk</developerConnection>
-    <url>https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk</url>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/httpcomponents/httpclient/tags/4.1-alpha2</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/httpcomponents/httpclient/tags/4.1-alpha2</developerConnection>
+    <url>https://svn.apache.org/repos/asf/httpcomponents/httpclient/tags/4.1-alpha2</url>
   </scm>
 
   <properties>
@@ -73,6 +73,7 @@
     <commons-codec.version>1.4</commons-codec.version>
     <junit.version>4.8.1</junit.version>
     <easymock.version>2.5.2</easymock.version>
+    <mockito.version>1.8.4</mockito.version>
   </properties>
 
   <modules>