diff --git a/artifact/project.xml b/artifact/project.xml
index ea78c3dc..9b0bef0a 100644
--- a/artifact/project.xml
+++ b/artifact/project.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -22,7 +21,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-artifact-plugin</id>
   <name>Maven Artifact Plugin</name>
-  <currentVersion>1.7</currentVersion>
+  <currentVersion>1.8-SNAPSHOT</currentVersion>
   <description>Tools to manage artifacts and deployment. *WARNING*: This version of the artifact-plugin requires Maven 1.1. People using Maven 1.0 should NOT use this version of the plugin.</description>
   <shortDescription>Tools to manage artifacts and deployment</shortDescription>
   <url>http://maven.apache.org/maven-1.x/reference/plugins/artifact/</url>
@@ -144,7 +143,16 @@
     <dependency>
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
-      <version>2.0.2</version>
+      <version>3.0</version>
+      <properties>
+        <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.2</version>
+      <url>http://jakarta.apache.org/commons/codec/</url>
       <properties>
         <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
       </properties>
diff --git a/artifact/xdocs/changes.xml b/artifact/xdocs/changes.xml
index 99491f81..433f6305 100644
--- a/artifact/xdocs/changes.xml
+++ b/artifact/xdocs/changes.xml
@@ -24,6 +24,9 @@
     <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
   <body>
+    <release version="1.8-SNAPSHOT" date="In SVN">
+      <action dev="aheritier" type="update" issue="MAVEN-1739">Upgrade to HttpClient 3.0.</action>
+    </release>
     <release version="1.7" date="2005-12-12">
       <action dev="ltheussl" type="add" issue="MPARTIFACT-57" due-to="Neil Crow">New attribute
         <code>artifactIdOverride</code>that allows to specify custom names for deployed/installed artifacts.
diff --git a/jira/project.xml b/jira/project.xml
index 3662c1a0..852850d7 100644
--- a/jira/project.xml
+++ b/jira/project.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -45,7 +44,16 @@
     <dependency>
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
-      <version>2.0.2</version>
+      <version>3.0</version>
+      <properties>
+        <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.2</version>
+      <url>http://jakarta.apache.org/commons/codec/</url>
       <properties>
         <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
       </properties>
diff --git a/jira/xdocs/changes.xml b/jira/xdocs/changes.xml
index 28d8065d..802ec01a 100644
--- a/jira/xdocs/changes.xml
+++ b/jira/xdocs/changes.xml
@@ -24,6 +24,7 @@
   </properties>
   <body>
     <release version="1.3-SNAPSHOT" date="in SVN">
+      <action dev="aheritier" type="update" issue="MAVEN-1739">Upgrade to HttpClient 3.0.</action>
       <action dev="ltheussl" type="fix" issue="MPJIRA-17">Plugin uses deprecated API to retrieve JIRA issues. Now requires at least JIRA 3.3.</action>
       <action dev="ltheussl" type="add">Add a jira-roadmap report.</action>
       <action dev="ltheussl" type="update">Layout changes: mimic default JIRA appearance, also show votes.</action>
diff --git a/plugin-parent/project.properties b/plugin-parent/project.properties
index 1279f873..cd9fc584 100644
--- a/plugin-parent/project.properties
+++ b/plugin-parent/project.properties
@@ -96,8 +96,9 @@ maven.jar.ant-launcher=1.6.5
 maven.jar.ant-trax=1.6.5
 maven.jar.commons-beanutils=1.6.1
 maven.jar.commons-cli=1.0-beta-2
+maven.jar.commons-codec=1.2
 maven.jar.commons-collections=3.0
-maven.jar.commons-httpclient=2.0.2
+maven.jar.commons-httpclient=3.0
 maven.jar.commons-io=1.0
 maven.jar.commons-jelly=1.0
 maven.jar.commons-jelly-tags-ant=1.1
@@ -116,4 +117,4 @@ maven.jar.wagon-file=1.0-alpha-4
 maven.jar.wagon-http=1.0-alpha-3
 maven.jar.wagon-provider-api=1.0-alpha-3
 
-maven.jar.maven = ${maven.home}/lib/maven.jar
\ No newline at end of file
+maven.jar.maven = ${maven.home}/lib/maven.jar
