From 996521b9a01088dd5a0c7aaff7811c4d9693ccbb Mon Sep 17 00:00:00 2001
From: ltheussl <ltheussl@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 18 Jul 2006 05:42:51 +0000
Subject: [PATCH] PR: MAVEN-1345 Upgrade dom4j to our custom version (see
 MAVENUPLOAD-953).

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@422975 13f79535-47bb-0310-9956-ffa450edef68
---
 changes/project.xml                                    | 9 +++++++--
 dashboard/src/plugin-resources/templates/dashboard.jsl | 2 +-
 html2xdoc/project.xml                                  | 4 ++--
 jellydoc/project.xml                                   | 4 ++--
 plugins-parent/project.properties                      | 3 ++-
 pom/project.xml                                        | 4 ++--
 scm/project.xml                                        | 4 ++--
 xdoc/project.xml                                       | 4 ++--
 8 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/changes/project.xml b/changes/project.xml
index 0b9756ac..943ae330 100644
--- a/changes/project.xml
+++ b/changes/project.xml
@@ -91,14 +91,19 @@
   </developers>
   <dependencies>
     <dependency>
-      <groupId>dom4j</groupId>
+      <groupId>maven</groupId>
       <artifactId>dom4j</artifactId>
-      <version>1.4</version>
+      <version>1.7-20060614</version>
       <url>http://www.dom4j.org/</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>jaxen</groupId>
+      <artifactId>jaxen</artifactId>
+      <version>1.1-beta-9</version>
+    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
diff --git a/dashboard/src/plugin-resources/templates/dashboard.jsl b/dashboard/src/plugin-resources/templates/dashboard.jsl
index f4b0539c..39c21f03 100644
--- a/dashboard/src/plugin-resources/templates/dashboard.jsl
+++ b/dashboard/src/plugin-resources/templates/dashboard.jsl
@@ -27,7 +27,7 @@
   xmlns:x="jelly:xml"
   xmlns:u="jelly:util"
   xmlns:a="jelly:ant"  
-  xmlns="dummy" trim="false">
+  xmlns="dummy" trim="true">
 
   <jsl:template match="dashboard">
     <document>
diff --git a/html2xdoc/project.xml b/html2xdoc/project.xml
index 308e0728..77e3e19d 100644
--- a/html2xdoc/project.xml
+++ b/html2xdoc/project.xml
@@ -91,9 +91,9 @@
       </properties>
     </dependency>
     <dependency>
-      <groupId>dom4j</groupId>
+      <groupId>maven</groupId>
       <artifactId>dom4j</artifactId>
-      <version>1.4</version>
+      <version>1.7-20060614</version>
       <url>http://www.dom4j.org/</url>
     </dependency>
     <dependency>
diff --git a/jellydoc/project.xml b/jellydoc/project.xml
index ce672601..9e34d5ed 100644
--- a/jellydoc/project.xml
+++ b/jellydoc/project.xml
@@ -76,9 +76,9 @@
     </dependency>
     <!-- core dependencies which i'd have thought Maven introduced -->
     <dependency>
-      <groupId>dom4j</groupId>
+      <groupId>maven</groupId>
       <artifactId>dom4j</artifactId>
-      <version>1.4</version>
+      <version>1.7-20060614</version>
       <url>http://www.dom4j.org/</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/plugins-parent/project.properties b/plugins-parent/project.properties
index 1a7fc28f..756876da 100644
--- a/plugins-parent/project.properties
+++ b/plugins-parent/project.properties
@@ -71,7 +71,8 @@ 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.4
-maven.jar.dom4j=1.4
+maven.jar.dom4j=1.7-20060614
+maven.jar.jaxen=1.1-beta-9
 maven.jar.forehead=1.0-beta-5
 maven.jar.log4j=1.2.13
 maven.jar.maven-model=3.0.1
diff --git a/pom/project.xml b/pom/project.xml
index ac1d0c43..13937b62 100644
--- a/pom/project.xml
+++ b/pom/project.xml
@@ -87,9 +87,9 @@
   </developers>
   <dependencies>
     <dependency>
-      <groupId>dom4j</groupId>
+      <groupId>maven</groupId>
       <artifactId>dom4j</artifactId>
-      <version>1.4</version>
+      <version>1.7-20060614</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/scm/project.xml b/scm/project.xml
index c4183173..47006097 100644
--- a/scm/project.xml
+++ b/scm/project.xml
@@ -141,9 +141,9 @@
       </properties>
     </dependency>
     <dependency>
-      <groupId>dom4j</groupId>
+      <groupId>maven</groupId>
       <artifactId>dom4j</artifactId>
-      <version>1.4</version>
+      <version>1.7-20060614</version>
       <url>http://www.dom4j.org/</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/xdoc/project.xml b/xdoc/project.xml
index c6b52acd..3e5041a3 100644
--- a/xdoc/project.xml
+++ b/xdoc/project.xml
@@ -175,9 +175,9 @@
   </developers>
   <dependencies>
     <dependency>
-      <groupId>dom4j</groupId>
+      <groupId>maven</groupId>
       <artifactId>dom4j</artifactId>
-      <version>1.4</version>
+      <version>1.7-20060614</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>