From 4eee93171001d6984c171586a275d54ad1bfdb23 Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 14 Oct 2005 12:00:34 +0000
Subject: [PATCH] Use recent releases of dependencies to allow developers to
 use them in plugins : * commons-logging v1.0.3 -> v1.0.4 * log4j v1.2.8 ->
 v1.2.12

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@321081 13f79535-47bb-0310-9956-ffa450edef68
---
 ant/src/plugin-test/project.xml                           | 2 +-
 artifact/project.xml                                      | 2 +-
 artifact/src/plugin-test/maven.xml                        | 4 ++--
 artifact/src/plugin-test/project.xml                      | 2 +-
 artifact/xdocs/changes.xml                                | 1 +
 changelog/project.xml                                     | 2 +-
 changelog/xdocs/changes.xml                               | 1 +
 dist/project.xml                                          | 2 +-
 dist/xdocs/changes.xml                                    | 1 +
 ear/src/plugin-test/bundlePropertiesTest/maven.xml        | 2 +-
 ear/src/plugin-test/bundlePropertiesTest/project.xml      | 4 ++--
 ear/src/plugin-test/simpleTest/maven.xml                  | 2 +-
 ear/src/plugin-test/simpleTest/project.xml                | 2 +-
 eclipse/src/plugin-test/maintest/maven.xml                | 2 +-
 eclipse/src/plugin-test/maintest/project.properties       | 2 +-
 ejb/project.xml                                           | 2 +-
 ejb/xdocs/changes.xml                                     | 1 +
 examples/exampleear-1.0/project.xml                       | 2 +-
 examples/exampleejb-1.0/project.xml                       | 2 +-
 .../template-resources/components/ejbs/ejb/project.xml    | 2 +-
 .../template-resources/components/wars/web/project.xml    | 2 +-
 .../plugin-resources/ejb/template-resources/project.xml   | 2 +-
 .../struts-jstl/template-resources/project.xml            | 2 +-
 .../struts/template-resources/project.xml                 | 2 +-
 .../web-jstl/template-resources/project.xml               | 2 +-
 .../web-velocity/template-resources/project.xml           | 2 +-
 .../plugin-resources/web/template-resources/project.xml   | 2 +-
 genapp/xdocs/changes.xml                                  | 7 ++++++-
 hibernate/project.xml                                     | 4 ++--
 hibernate/xdocs/changes.xml                               | 2 ++
 html2xdoc/project.xml                                     | 8 +++++++-
 html2xdoc/xdocs/changes.xml                               | 1 +
 j2ee/project.xml                                          | 2 +-
 j2ee/xdocs/changes.xml                                    | 1 +
 jalopy/project.xml                                        | 2 +-
 jalopy/xdocs/changes.xml                                  | 1 +
 jcoverage/project.xml                                     | 2 +-
 jcoverage/xdocs/changes.xml                               | 1 +
 jira/project.xml                                          | 4 ++--
 jira/xdocs/changes.xml                                    | 2 +-
 jxr/project.xml                                           | 2 +-
 jxr/xdocs/changes.xml                                     | 1 +
 linkcheck/project.xml                                     | 4 ++--
 linkcheck/xdocs/changes.xml                               | 2 ++
 plugin-parent/project.properties                          | 4 ++--
 plugin/project.xml                                        | 2 +-
 plugin/xdocs/changes.xml                                  | 1 +
 rar/src/plugin-test/maven.xml                             | 2 +-
 rar/src/plugin-test/project.xml                           | 2 +-
 simian/project.xml                                        | 2 +-
 simian/xdocs/changes.xml                                  | 1 +
 war/src/plugin-test/test01/maven.xml                      | 4 ++--
 war/src/plugin-test/test01/project.xml                    | 2 +-
 xdoc/project.xml                                          | 2 +-
 xdoc/xdocs/changes.xml                                    | 3 ++-
 55 files changed, 76 insertions(+), 49 deletions(-)

diff --git a/ant/src/plugin-test/project.xml b/ant/src/plugin-test/project.xml
index 4fe56d61..cb8ab4af 100644
--- a/ant/src/plugin-test/project.xml
+++ b/ant/src/plugin-test/project.xml
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</version>
       <type>jar</type>
       <properties/>
     </dependency>
diff --git a/artifact/project.xml b/artifact/project.xml
index 35277d50..ed849486 100644
--- a/artifact/project.xml
+++ b/artifact/project.xml
@@ -125,7 +125,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</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>
diff --git a/artifact/src/plugin-test/maven.xml b/artifact/src/plugin-test/maven.xml
index 4eb916bf..a84dd0ed 100644
--- a/artifact/src/plugin-test/maven.xml
+++ b/artifact/src/plugin-test/maven.xml
@@ -30,7 +30,7 @@
       excludes="commons-logging" />
 
     <!-- check that an exclude with just id works -->
-    <assert:assertFileNotFound file="${maven.build.dir}/commons-logging-1.0.3.jar"/>
+    <assert:assertFileNotFound file="${maven.build.dir}/commons-logging-1.0.4.jar"/>
     <assert:assertFileExists file="${maven.build.dir}/commons-lang-2.0.jar"/>
 
     <attainGoal name="clean"/>
@@ -40,7 +40,7 @@
       todir="${maven.build.dir}"
       excludes="commons-lang:commons-lang" />
     <assert:assertFileNotFound file="${maven.build.dir}/commons-lang-2.0.jar"/>  
-    <assert:assertFileExists file="${maven.build.dir}/commons-logging-1.0.3.jar"/>
+    <assert:assertFileExists file="${maven.build.dir}/commons-logging-1.0.4.jar"/>
     
   </goal>
 </project>
\ No newline at end of file
diff --git a/artifact/src/plugin-test/project.xml b/artifact/src/plugin-test/project.xml
index f0c30247..58a5b126 100644
--- a/artifact/src/plugin-test/project.xml
+++ b/artifact/src/plugin-test/project.xml
@@ -56,7 +56,7 @@ http://maven.apache.org/maven-v3_0_0.xsd">
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</version>
       <url>http://jakarta.apache.org/commons/logging.html</url>
     </dependency>
     <dependency>
diff --git a/artifact/xdocs/changes.xml b/artifact/xdocs/changes.xml
index f922c266..cd044674 100644
--- a/artifact/xdocs/changes.xml
+++ b/artifact/xdocs/changes.xml
@@ -31,6 +31,7 @@
           <li>commons-httpclient v2.0 -> v2.0.2</li>
           <li>commons-jelly v1.0-beta-4 -> v1.0</li>
           <li>commons-jexl v1.0-beta-1 -> v1.0</li>
+          <li>commons-logging v1.0.3 -> v1.0.4</li>
           <li>commons-net v1.1.0 -> v1.4.0</li>
           <li>plexus-utils v1.0-alpha-3 -> v1.0.3</li>
         </ul>
diff --git a/changelog/project.xml b/changelog/project.xml
index 63d1d889..399b3d1a 100644
--- a/changelog/project.xml
+++ b/changelog/project.xml
@@ -178,7 +178,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</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>
diff --git a/changelog/xdocs/changes.xml b/changelog/xdocs/changes.xml
index 517e3e70..c1271c67 100644
--- a/changelog/xdocs/changes.xml
+++ b/changelog/xdocs/changes.xml
@@ -29,6 +29,7 @@
         <ul>
           <li>ant v1.5.3-1 -> v1.6.5</li>
           <li>commons-jelly-tags-xml v1.0 -> v1.1</li>
+          <li>commons-logging v1.0.3 -> v1.0.4</li>
           <li>maven v1.0 -> v1.0.2</li>
           <li>maven-model v3.0.0 -> v3.0.1</li>
           <li>xercesImpl v 2.4.0 -> v2.6.2</li>
diff --git a/dist/project.xml b/dist/project.xml
index 0c2ca51c..dc10f816 100644
--- a/dist/project.xml
+++ b/dist/project.xml
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</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>
diff --git a/dist/xdocs/changes.xml b/dist/xdocs/changes.xml
index 6b24af75..a7797698 100644
--- a/dist/xdocs/changes.xml
+++ b/dist/xdocs/changes.xml
@@ -27,6 +27,7 @@
     <release version="1.7-SNAPSHOT" date="in SVN">
       <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : 
         <ul>
+          <li>commons-logging v1.0.3 -> v1.0.4</li>
           <li>maven v1.0 -> v1.0.2</li>
           <li>maven-model v3.0.0 -> v3.0.1</li>
         </ul>
diff --git a/ear/src/plugin-test/bundlePropertiesTest/maven.xml b/ear/src/plugin-test/bundlePropertiesTest/maven.xml
index 3c3bc9b5..f2d9ddd0 100644
--- a/ear/src/plugin-test/bundlePropertiesTest/maven.xml
+++ b/ear/src/plugin-test/bundlePropertiesTest/maven.xml
@@ -37,7 +37,7 @@
     <unzip src="${earFile}" dest="${unzipDir}"/>
 
     <!-- check for commons-logging -->
-    <j:set var="commonsExpectedPath" value="/APP-INF/lib/commons-logging-1.0.3.jar"/>
+    <j:set var="commonsExpectedPath" value="/APP-INF/lib/commons-logging-1.0.4.jar"/>
     <assert:assertFileExists file="${unzipDir}${commonsExpectedPath}"
       msg="commons-logging was not bundled"/>
     
diff --git a/ear/src/plugin-test/bundlePropertiesTest/project.xml b/ear/src/plugin-test/bundlePropertiesTest/project.xml
index f888052a..0e4feb3e 100644
--- a/ear/src/plugin-test/bundlePropertiesTest/project.xml
+++ b/ear/src/plugin-test/bundlePropertiesTest/project.xml
@@ -52,7 +52,7 @@ http://maven.apache.org/maven-v3_0_0.xsd">
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</version>
       <properties>
         <ear.bundle.dir>/APP-INF/lib</ear.bundle.dir>
         <ear.module>true</ear.module>
@@ -78,7 +78,7 @@ http://maven.apache.org/maven-v3_0_0.xsd">
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.12</version>
       <properties>
         <ear.bundle>true</ear.bundle>
         <ear.bundle.name>LOG4J.JAR</ear.bundle.name>
diff --git a/ear/src/plugin-test/simpleTest/maven.xml b/ear/src/plugin-test/simpleTest/maven.xml
index 5a973e19..a78ffa0a 100644
--- a/ear/src/plugin-test/simpleTest/maven.xml
+++ b/ear/src/plugin-test/simpleTest/maven.xml
@@ -38,7 +38,7 @@
     <unzip src="${earFile}" dest="${unzipDir}"/>
 
     <!-- check for commons-logging -->
-    <assert:assertFileExists file="${unzipDir}/commons-logging-1.0.3.jar"
+    <assert:assertFileExists file="${unzipDir}/commons-logging-1.0.4.jar"
       msg="commons logging was not bundled"/>
     <!-- check for commons-collections -->
     <assert:assertFileExists file="${unzipDir}/commons-collections-3.0.jar"
diff --git a/ear/src/plugin-test/simpleTest/project.xml b/ear/src/plugin-test/simpleTest/project.xml
index 8e47fa6c..871282f6 100644
--- a/ear/src/plugin-test/simpleTest/project.xml
+++ b/ear/src/plugin-test/simpleTest/project.xml
@@ -45,7 +45,7 @@ http://maven.apache.org/maven-v3_0_0.xsd">
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</version>
       <url>http://jakarta.apache.org/commons/logging.html</url>
       <properties>
         <ear.bundle>true</ear.bundle>
diff --git a/eclipse/src/plugin-test/maintest/maven.xml b/eclipse/src/plugin-test/maintest/maven.xml
index f2a7f279..03697522 100644
--- a/eclipse/src/plugin-test/maintest/maven.xml
+++ b/eclipse/src/plugin-test/maintest/maven.xml
@@ -138,7 +138,7 @@
     <x:parse var="classpathDoc" xml="${classpathFile.toURL()}" />
     <x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/maven/jars/maven.jar')])"/>
     <assert:assertEquals expected="1" value="${count.intValue().toString()}" msg="override by jar tag not found"/>
-	<x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/commons-logging/jars/commons-logging-1.0.3.jar')])"/>
+	<x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar')])"/>
     <assert:assertEquals expected="1" value="${count.intValue().toString()}" msg="maven.jar.override didn't work"/>
 
   </goal>
diff --git a/eclipse/src/plugin-test/maintest/project.properties b/eclipse/src/plugin-test/maintest/project.properties
index c84e0a5e..5a7602e5 100644
--- a/eclipse/src/plugin-test/maintest/project.properties
+++ b/eclipse/src/plugin-test/maintest/project.properties
@@ -1,4 +1,4 @@
 cactus.src.dir=${basedir}/src/cactus-test
 maven.jar.override=on
-maven.jar.commons-dude=${maven.repo.local}/commons-logging/jars/commons-logging-1.0.3.jar
+maven.jar.commons-dude=${maven.repo.local}/commons-logging/jars/commons-logging-1.0.4.jar
 maven.eclipse.resources.addtoclasspath=true
\ No newline at end of file
diff --git a/ejb/project.xml b/ejb/project.xml
index d9e9b13d..25d924a2 100644
--- a/ejb/project.xml
+++ b/ejb/project.xml
@@ -101,7 +101,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</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>
diff --git a/ejb/xdocs/changes.xml b/ejb/xdocs/changes.xml
index b5c86b1e..025510fd 100644
--- a/ejb/xdocs/changes.xml
+++ b/ejb/xdocs/changes.xml
@@ -27,6 +27,7 @@
     <release version="1.8-SNAPSHOT" date="in SVN">
       <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : 
         <ul>
+          <li>commons-logging v1.0.3 -> v1.0.4</li>
           <li>maven v1.0 -> v1.0.2</li>
           <li>maven-model v3.0.0 -> v3.0.1</li>
         </ul>
diff --git a/examples/exampleear-1.0/project.xml b/examples/exampleear-1.0/project.xml
index 71c16645..059a7168 100644
--- a/examples/exampleear-1.0/project.xml
+++ b/examples/exampleear-1.0/project.xml
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.4</version>
       <url>http://jakarta.apache.org/commons/logging.html</url>
       <properties>
         <ear.bundle.jar>true</ear.bundle.jar>
diff --git a/examples/exampleejb-1.0/project.xml b/examples/exampleejb-1.0/project.xml
index 23e5c37e..c998e1ae 100644
--- a/examples/exampleejb-1.0/project.xml
+++ b/examples/exampleejb-1.0/project.xml
@@ -71,7 +71,7 @@
     
       <dependency>
         <id>commons-logging</id>
-        <version>1.0.2</version>
+        <version>1.0.4</version>
         <url>http://jakarta.apache.org/commons/logging.html</url>
         <properties>
           <ejb.manifest.classpath>true</ejb.manifest.classpath>
diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.xml b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.xml
index 2f021df8..b50b58dc 100644
--- a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.xml
+++ b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.xml
@@ -71,7 +71,7 @@
      <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</version>
       <properties>
         <ejb.bundle>true</ejb.bundle>
       </properties>
diff --git a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.xml b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.xml
index c5f93ffa..859dc665 100644
--- a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.xml
+++ b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.xml
@@ -60,7 +60,7 @@
      <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</version>
       <properties>
         <war.bundle>true</war.bundle>
       </properties>
diff --git a/genapp/src/plugin-resources/ejb/template-resources/project.xml b/genapp/src/plugin-resources/ejb/template-resources/project.xml
index 4c3a95b6..217a8e91 100644
--- a/genapp/src/plugin-resources/ejb/template-resources/project.xml
+++ b/genapp/src/plugin-resources/ejb/template-resources/project.xml
@@ -133,7 +133,7 @@
      <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</version>
       <properties>
         <ejb.bundle>true</ejb.bundle>
       </properties>
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml b/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml
index be033a43..13b18222 100644
--- a/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml
@@ -110,7 +110,7 @@
      <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</version>
       <properties>
         <war.bundle>true</war.bundle>
       </properties>
diff --git a/genapp/src/plugin-resources/struts/template-resources/project.xml b/genapp/src/plugin-resources/struts/template-resources/project.xml
index d0d130fe..4f73ec79 100644
--- a/genapp/src/plugin-resources/struts/template-resources/project.xml
+++ b/genapp/src/plugin-resources/struts/template-resources/project.xml
@@ -93,7 +93,7 @@
      <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</version>
       <properties>
         <war.bundle>true</war.bundle>
       </properties>
diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/project.xml b/genapp/src/plugin-resources/web-jstl/template-resources/project.xml
index b1f9d75c..6f08bd8b 100644
--- a/genapp/src/plugin-resources/web-jstl/template-resources/project.xml
+++ b/genapp/src/plugin-resources/web-jstl/template-resources/project.xml
@@ -110,7 +110,7 @@
      <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</version>
       <properties>
         <war.bundle>true</war.bundle>
       </properties>
diff --git a/genapp/src/plugin-resources/web-velocity/template-resources/project.xml b/genapp/src/plugin-resources/web-velocity/template-resources/project.xml
index b21d1bb1..70dc7147 100644
--- a/genapp/src/plugin-resources/web-velocity/template-resources/project.xml
+++ b/genapp/src/plugin-resources/web-velocity/template-resources/project.xml
@@ -111,7 +111,7 @@
       <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</version>
       <properties>
         <war.bundle>true</war.bundle>
       </properties>
diff --git a/genapp/src/plugin-resources/web/template-resources/project.xml b/genapp/src/plugin-resources/web/template-resources/project.xml
index fe4c159b..57f79171 100644
--- a/genapp/src/plugin-resources/web/template-resources/project.xml
+++ b/genapp/src/plugin-resources/web/template-resources/project.xml
@@ -93,7 +93,7 @@
      <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</version>
       <properties>
         <war.bundle>true</war.bundle>
       </properties>
diff --git a/genapp/xdocs/changes.xml b/genapp/xdocs/changes.xml
index a1bbacaa..5626440f 100644
--- a/genapp/xdocs/changes.xml
+++ b/genapp/xdocs/changes.xml
@@ -21,7 +21,12 @@
     <title>Changes</title>
   </properties>
   <body>
-    <release version="2.3" date="in SVN">
+    <release version="2.3-SNAPSHOT" date="in SVN">
+      <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : 
+        <ul>
+          <li>commons-logging v1.0.3 -> v1.0.4</li>
+        </ul>
+      </action>
       <action dev="felipeal" type="add" issue="MPGENAPP-20" due-to="Miguel Griffa">Added customization guide.</action>
       <action dev="felipeal" type="add" issue="MPGENAPP-19" due-to="Miguel Griffa">Added Velocity-based webapp template (named <code>web-velocity</code>).</action>
       <action dev="aheritier" type="add" issue="MPGENAPP-18" due-to="Archimedes Trajano">Use the project's name as display-name in web.xml.</action>
diff --git a/hibernate/project.xml b/hibernate/project.xml
index d6d5120b..47ec5bd4 100644
--- a/hibernate/project.xml
+++ b/hibernate/project.xml
@@ -157,7 +157,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</version>
       <type>jar</type>
       <properties>
         <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
@@ -172,7 +172,7 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.12</version>
       <type>jar</type>
       <properties>
         <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
diff --git a/hibernate/xdocs/changes.xml b/hibernate/xdocs/changes.xml
index 227e0ed0..72167036 100644
--- a/hibernate/xdocs/changes.xml
+++ b/hibernate/xdocs/changes.xml
@@ -30,6 +30,8 @@
           <li>ant v1.5.3-1 -> v1.6.5</li>
           <li>commons-collections v2.1 -> v3.0</li>
           <li>commons-jelly v1.0-beta-4 -> v1.0</li>
+          <li>commons-logging v1.0.3 -> v1.0.4</li>
+          <li>log4j v1.2.8 -> v1.2.12</li>
           <li>xercesImpl v 2.4.0 -> v2.6.2</li>
           <li>xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2</li>
         </ul>
diff --git a/html2xdoc/project.xml b/html2xdoc/project.xml
index 8bb9be6d..e45a0d5c 100644
--- a/html2xdoc/project.xml
+++ b/html2xdoc/project.xml
@@ -67,6 +67,9 @@
       <artifactId>commons-jelly-tags-xml</artifactId>
       <version>1.1</version>
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</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>
     </dependency>
     <dependency>
       <groupId>commons-jelly</groupId>
@@ -83,7 +86,10 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</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>dom4j</groupId>
diff --git a/html2xdoc/xdocs/changes.xml b/html2xdoc/xdocs/changes.xml
index 1a6ce9b6..2fc74d0e 100644
--- a/html2xdoc/xdocs/changes.xml
+++ b/html2xdoc/xdocs/changes.xml
@@ -28,6 +28,7 @@
       <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : 
         <ul>
           <li>commons-jelly-tags-xml v1.0 -> v1.1</li>
+          <li>commons-logging v1.0.3 -> v1.0.4</li>
           <li>dom4j v1.4-dev-8 -> v1.4</li>
           <li>xercesImpl v 2.4.0 -> v2.6.2</li>
           <li>xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2</li>
diff --git a/j2ee/project.xml b/j2ee/project.xml
index 5a652e29..92907b76 100644
--- a/j2ee/project.xml
+++ b/j2ee/project.xml
@@ -97,7 +97,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</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>
diff --git a/j2ee/xdocs/changes.xml b/j2ee/xdocs/changes.xml
index 151d6c6d..b9341ef0 100644
--- a/j2ee/xdocs/changes.xml
+++ b/j2ee/xdocs/changes.xml
@@ -28,6 +28,7 @@
     <release version="1.6-SNAPSHOT" date="In SVN">
       <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : 
         <ul>
+          <li>commons-logging v1.0.3 -> v1.0.4</li>
           <li>dom4j v1.4-dev-8 -> v1.4</li>
         </ul>
       </action>
diff --git a/jalopy/project.xml b/jalopy/project.xml
index 570fdfec..06338080 100644
--- a/jalopy/project.xml
+++ b/jalopy/project.xml
@@ -113,7 +113,7 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.12</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>
diff --git a/jalopy/xdocs/changes.xml b/jalopy/xdocs/changes.xml
index d6995a04..c00ec967 100644
--- a/jalopy/xdocs/changes.xml
+++ b/jalopy/xdocs/changes.xml
@@ -26,6 +26,7 @@
       <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : 
         <ul>
           <li>jdom v1.0b8 -> v1.0</li>
+          <li>log4j v1.2.8 -> v1.2.12</li>
           <li>oro v2.0.7 -> v2.0.8</li>
         </ul>
       </action>
diff --git a/jcoverage/project.xml b/jcoverage/project.xml
index 49b817c9..1ffeaf13 100644
--- a/jcoverage/project.xml
+++ b/jcoverage/project.xml
@@ -122,7 +122,7 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.12</version>
       <url>http://jakarta.apache.org/log4j/</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>
diff --git a/jcoverage/xdocs/changes.xml b/jcoverage/xdocs/changes.xml
index 0a96641f..44987466 100644
--- a/jcoverage/xdocs/changes.xml
+++ b/jcoverage/xdocs/changes.xml
@@ -27,6 +27,7 @@
     <release version="1.1" date="In SVN">
       <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : 
         <ul>
+          <li>log4j v1.2.8 -> v1.2.12</li>        
           <li>oro v2.0.7 -> v2.0.8</li>
           <li>velocity v1.3 -> v1.4</li>
           <li>xercesImpl v 2.4.0 -> v2.6.2</li>
diff --git a/jira/project.xml b/jira/project.xml
index e00a315e..00d56aac 100644
--- a/jira/project.xml
+++ b/jira/project.xml
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</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>
@@ -64,7 +64,7 @@
       <!-- Required for commons-httpclient -->
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.12</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>
diff --git a/jira/xdocs/changes.xml b/jira/xdocs/changes.xml
index 73620a9c..eb492dda 100644
--- a/jira/xdocs/changes.xml
+++ b/jira/xdocs/changes.xml
@@ -27,7 +27,7 @@
     <release version="1.2-SNAPSHOT" date="in SVN">
       <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : 
         <ul>
-          <li>commons-logging v1.0.4 -> v1.0.3</li>
+          <li>log4j v1.2.8 -> v1.2.12</li>
         </ul>
       </action>
       <action dev="carlos" type="fix" issue="MPJIRA-11" due-to="Michael Franken">Enable retrieving component-specific issues.</action>
diff --git a/jxr/project.xml b/jxr/project.xml
index 1735e201..2761d694 100644
--- a/jxr/project.xml
+++ b/jxr/project.xml
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</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>
diff --git a/jxr/xdocs/changes.xml b/jxr/xdocs/changes.xml
index 66778707..edc85475 100644
--- a/jxr/xdocs/changes.xml
+++ b/jxr/xdocs/changes.xml
@@ -28,6 +28,7 @@
       <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : 
         <ul>
           <li>commons-collections v3.1 -> v3.0</li>
+          <li>commons-logging v1.0.3 -> v1.0.4</li>
           <li>oro v2.0.7 -> v2.0.8</li>
         </ul>
       </action>
diff --git a/linkcheck/project.xml b/linkcheck/project.xml
index 5687ccde..2e5ef5fd 100644
--- a/linkcheck/project.xml
+++ b/linkcheck/project.xml
@@ -157,7 +157,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</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>
@@ -174,7 +174,7 @@
       <!-- Required for commons-httpclient -->
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.12</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>
diff --git a/linkcheck/xdocs/changes.xml b/linkcheck/xdocs/changes.xml
index 100aa6de..c4249094 100644
--- a/linkcheck/xdocs/changes.xml
+++ b/linkcheck/xdocs/changes.xml
@@ -33,7 +33,9 @@
           <li>commons-jelly v1.0-beta-4 -> v1.0</li>
           <li>commons-jelly-tags-ant v1.0 -> v1.1</li>
           <li>commons-jelly-tags-xml v1.0 -> v1.1</li>
+          <li>commons-logging v1.0.3 -> v1.0.4</li>
           <li>dom4j v1.4-dev-8 -> v1.4</li>
+          <li>log4j v1.2.8 -> v1.2.12</li>          
           <li>maven-model v3.0.0-SNAPSHOT -> v3.0.1</li>
         </ul>
       </action>
diff --git a/plugin-parent/project.properties b/plugin-parent/project.properties
index 5729c07f..8e001549 100644
--- a/plugin-parent/project.properties
+++ b/plugin-parent/project.properties
@@ -103,10 +103,10 @@ maven.jar.commons-jelly-tags-util=1.1.1
 maven.jar.commons-jelly-tags-xml=1.1
 maven.jar.commons-jexl=1.0
 maven.jar.commons-lang=2.0
-maven.jar.commons-logging=1.0.3
+maven.jar.commons-logging=1.0.4
 maven.jar.dom4j=1.4
 maven.jar.forehead=1.0-beta-5
-maven.jar.log4j=1.2.8
+maven.jar.log4j=1.2.12
 maven.jar.maven-model=3.0.1
 maven.jar.plexus-utils=1.0.3
 maven.jar.wagon-file=1.0-alpha-4
diff --git a/plugin/project.xml b/plugin/project.xml
index 06f1248e..a09de18e 100644
--- a/plugin/project.xml
+++ b/plugin/project.xml
@@ -151,7 +151,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</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>
diff --git a/plugin/xdocs/changes.xml b/plugin/xdocs/changes.xml
index 19d39508..08101045 100644
--- a/plugin/xdocs/changes.xml
+++ b/plugin/xdocs/changes.xml
@@ -27,6 +27,7 @@
       <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : 
         <ul>
           <li>commons-jelly-tags-xml v1.0 -> v1.1</li>
+          <li>commons-logging v1.0.3 -> v1.0.4</li>
           <li>jdom v b10 -> v1.0</li>
           <li>xercesImpl v 2.4.0 -> v2.6.2</li>
           <li>xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2</li>
diff --git a/rar/src/plugin-test/maven.xml b/rar/src/plugin-test/maven.xml
index b33fa3b9..f6779d52 100644
--- a/rar/src/plugin-test/maven.xml
+++ b/rar/src/plugin-test/maven.xml
@@ -36,7 +36,7 @@
     <unzip src="${rarFile}" dest="${unzipDir}"/>
 
     <!-- check for commons-logging -->
-    <assert:assertFileExists file="${unzipDir}/commons-logging-1.0.3.jar"
+    <assert:assertFileExists file="${unzipDir}/commons-logging-1.0.4.jar"
       msg="commons logging was not bundled"/>
 
     <!-- check for the LICENSE -->
diff --git a/rar/src/plugin-test/project.xml b/rar/src/plugin-test/project.xml
index b5e7d5ae..bdbd2c70 100644
--- a/rar/src/plugin-test/project.xml
+++ b/rar/src/plugin-test/project.xml
@@ -56,7 +56,7 @@ http://maven.apache.org/maven-v3_0_0.xsd">
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</version>
       <url>http://jakarta.apache.org/commons/logging.html</url>
       <properties>
         <rar.bundle>true</rar.bundle>
diff --git a/simian/project.xml b/simian/project.xml
index f3e2ef26..da3d6edb 100644
--- a/simian/project.xml
+++ b/simian/project.xml
@@ -128,7 +128,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</version>
       <url>http://jakarta.apache.org/commons/logging/</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>
diff --git a/simian/xdocs/changes.xml b/simian/xdocs/changes.xml
index 35e2319a..2eba205f 100644
--- a/simian/xdocs/changes.xml
+++ b/simian/xdocs/changes.xml
@@ -30,6 +30,7 @@
         <ul>
           <li>ant v1.5.3-1 -> v1.6.5</li>
           <li>commons-jelly v1.0-beta-4 -> v1.0</li>
+          <li>commons-logging v1.0.3 -> v1.0.4</li>
         </ul>
       </action>
       <action dev="epugh" type="fix" issue="MPSIMIAN-15">Tag library warning when using simian 1.5</action>
diff --git a/war/src/plugin-test/test01/maven.xml b/war/src/plugin-test/test01/maven.xml
index 4a6dd627..4b84e77c 100644
--- a/war/src/plugin-test/test01/maven.xml
+++ b/war/src/plugin-test/test01/maven.xml
@@ -28,7 +28,7 @@
     <j:set var="warFile" value="${maven.build.dir}/${pom.artifactId}.war"/>
     <j:set var="warDir" value="${maven.build.dir}/${pom.artifactId}"/>
     <assert:assertFileExists file="${warFile}"/>
-    <assert:assertFileExists file="${warDir}/WEB-INF/lib/commons-logging-1.0.3.jar"/>
+    <assert:assertFileExists file="${warDir}/WEB-INF/lib/commons-logging-1.0.4.jar"/>
 
     <!-- check for manifest contents -->
     <!-- a) Make sure existing manifest gets merged -->
@@ -41,7 +41,7 @@
       <fail>Manifest not merged</fail>
     </j:if>
     <!-- b) Make sure Class-Path entry is created -->
-    <j:set var="found" value='${manifest.indexOf("Class-Path:  commons-logging-1.0.3.jar") ge 0}'/>
+    <j:set var="found" value='${manifest.indexOf("Class-Path:  commons-logging-1.0.4.jar") ge 0}'/>
     <j:if test="${!found}">
       <fail>Class-Path not generated</fail>
     </j:if>
diff --git a/war/src/plugin-test/test01/project.xml b/war/src/plugin-test/test01/project.xml
index 5ee056f4..a14c1e07 100644
--- a/war/src/plugin-test/test01/project.xml
+++ b/war/src/plugin-test/test01/project.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</version>
       <url>http://jakarta.apache.org/commons/logging.html</url>
       <properties>
         <war.bundle>true</war.bundle>
diff --git a/xdoc/project.xml b/xdoc/project.xml
index 7887db89..030b594e 100644
--- a/xdoc/project.xml
+++ b/xdoc/project.xml
@@ -219,7 +219,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4</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>
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index 57741f0b..f2896df4 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -22,7 +22,7 @@
     <title>Changes</title>
     <author email="dion@multitask.com.au">dIon Gillard</author>
     <author email="vmassol@apache.org">Vincent Massol</author>
-    <author email="aheritier@apache.org">Arnaud HERITIER</author>
+    <author email="aheritier@apache.org">Arnaud Heritier</author>
     <author email="vincent.siveton@gmail.org">Vincent Siveton</author>
   </properties>
   <body>
@@ -30,6 +30,7 @@
       <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : 
         <ul>
           <li>commons-jelly v1.0-RC1 -> v1.0</li>
+          <li>commons-logging v1.0.3 -> v1.0.4</li>
           <li>maven-model v3.0.0 -> v3.0.1</li>
         </ul>
       </action>