Author: ltheussl
Date: Mon Jul 17 22:42:51 2006
New Revision: 422975
URL: http://svn.apache.org/viewvc?rev=422975&view=rev
Log:
PR: MAVEN-1345
Upgrade dom4j to our custom version (see MAVENUPLOAD-953).
Modified:
maven/maven-1/plugins/trunk/changes/project.xml
maven/maven-1/plugins/trunk/dashboard/src/plugin-resources/templates/dashboard.jsl
maven/maven-1/plugins/trunk/html2xdoc/project.xml
maven/maven-1/plugins/trunk/jellydoc/project.xml
maven/maven-1/plugins/trunk/plugins-parent/project.properties
maven/maven-1/plugins/trunk/pom/project.xml
maven/maven-1/plugins/trunk/scm/project.xml
maven/maven-1/plugins/trunk/xdoc/project.xml
Modified: maven/maven-1/plugins/trunk/changes/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/changes/project.xml?rev=422975&r1=422974&r2=422975&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/changes/project.xml (original)
+++ maven/maven-1/plugins/trunk/changes/project.xml Mon Jul 17 22:42:51 2006
@@ -91,13 +91,18 @@
</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>
Modified:
maven/maven-1/plugins/trunk/dashboard/src/plugin-resources/templates/dashboard.jsl
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dashboard/src/plugin-resources/templates/dashboard.jsl?rev=422975&r1=422974&r2=422975&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/dashboard/src/plugin-resources/templates/dashboard.jsl
(original)
+++
maven/maven-1/plugins/trunk/dashboard/src/plugin-resources/templates/dashboard.jsl
Mon Jul 17 22:42:51 2006
@@ -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>
Modified: maven/maven-1/plugins/trunk/html2xdoc/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/html2xdoc/project.xml?rev=422975&r1=422974&r2=422975&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/html2xdoc/project.xml (original)
+++ maven/maven-1/plugins/trunk/html2xdoc/project.xml Mon Jul 17 22:42:51 2006
@@ -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>
Modified: maven/maven-1/plugins/trunk/jellydoc/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/jellydoc/project.xml?rev=422975&r1=422974&r2=422975&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jellydoc/project.xml (original)
+++ maven/maven-1/plugins/trunk/jellydoc/project.xml Mon Jul 17 22:42:51 2006
@@ -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>
Modified: maven/maven-1/plugins/trunk/plugins-parent/project.properties
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/plugins-parent/project.properties?rev=422975&r1=422974&r2=422975&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugins-parent/project.properties (original)
+++ maven/maven-1/plugins/trunk/plugins-parent/project.properties Mon Jul 17
22:42:51 2006
@@ -71,7 +71,8 @@
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
Modified: maven/maven-1/plugins/trunk/pom/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/pom/project.xml?rev=422975&r1=422974&r2=422975&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/pom/project.xml (original)
+++ maven/maven-1/plugins/trunk/pom/project.xml Mon Jul 17 22:42:51 2006
@@ -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>
Modified: maven/maven-1/plugins/trunk/scm/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/scm/project.xml?rev=422975&r1=422974&r2=422975&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/scm/project.xml (original)
+++ maven/maven-1/plugins/trunk/scm/project.xml Mon Jul 17 22:42:51 2006
@@ -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>
Modified: maven/maven-1/plugins/trunk/xdoc/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/project.xml?rev=422975&r1=422974&r2=422975&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/project.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/project.xml Mon Jul 17 22:42:51 2006
@@ -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>
