From 75a1b667e1d45cdf25a3b507e07a1aeacc114492 Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 9 May 2003 10:59:27 +0000
Subject: [PATCH] Updated to use the Cactus/Ant integration built on 26th of
 April 2003. This makes the <code>web.xml</code> merge works.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113417 13f79535-47bb-0310-9956-ffa450edef68
---
 cactus/project.properties | 2 +-
 cactus/project.xml        | 2 +-
 cactus/xdocs/changes.xml  | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cactus/project.properties b/cactus/project.properties
index d31c4e91..8f729ba5 100644
--- a/cactus/project.properties
+++ b/cactus/project.properties
@@ -12,6 +12,6 @@ maven.license.licenseFile=${basedir}/../../../LICENSE.txt
 # mechanism is finalized.
 
 maven.cactus.artifacts.zips.dir = ${maven.repo.local}/cactus/zips
-maven.cactus.antintegration.version = 13-1.5dev-20030407
+maven.cactus.antintegration.version = 13-1.5dev-20030426
 maven.cactus.antintegration.name = jakarta-cactus-integration-ant-${maven.cactus.antintegration.version}
 maven.cactus.antintegration.zip = ${maven.cactus.artifacts.zips.dir}/${maven.cactus.antintegration.name}.zip
diff --git a/cactus/project.xml b/cactus/project.xml
index 300f3f6b..c04f581c 100644
--- a/cactus/project.xml
+++ b/cactus/project.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>cactus</groupId>
       <artifactId>jakarta-cactus-integration-ant</artifactId>
-      <version>13-1.5dev-20030407</version>
+      <version>13-1.5dev-20030426</version>
       <type>zip</type>
     </dependency>
     <!-- Runtime dependencies -->
diff --git a/cactus/xdocs/changes.xml b/cactus/xdocs/changes.xml
index bf024581..43709e88 100644
--- a/cactus/xdocs/changes.xml
+++ b/cactus/xdocs/changes.xml
@@ -8,6 +8,10 @@
   <body>
 
     <release version="2.1" date="in CVS">
+      <action dev="vmassol" type="update">
+        Updated to use the Cactus/Ant integration built on 26th of April 2003.
+        This makes the <code>web.xml</code> merge works.
+      </action>              
       <action dev="bwalding" type="fix">
         Fix bug where generation of the Cactus report was failing in some
         cases.