Author: ptahchiev
Date: Tue Jan  8 09:09:18 2008
New Revision: 610069

URL: http://svn.apache.org/viewvc?rev=610069&view=rev
Log:
Changed the version of the artifacts from 1.18-SNAPSHOT to 1.8.0-SNAPSHOT

Removed:
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/samples-ejb-javaEE-12/
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/samples-ejb-javaEE-13/
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/samples-ejb-share/
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-uberjars/
Modified:
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/build-tools/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-maven-skin/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/pom.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-12-13-14/pom.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-13-14/pom.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-12-uberjar/pom.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-13-uberjar/pom.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/pom.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/pom.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/pom.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/pom.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-12/pom.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-13/pom.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-14/pom.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-15/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/pom.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/pom.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/pom.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven/pom.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven2/pom.xml
    
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-shared-api/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/pom.xml

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/build-tools/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/build-tools/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/build-tools/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/build-tools/pom.xml Tue Jan  8 
09:09:18 2008
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>cactus</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <artifactId>build-tools</artifactId>
        <name>Cactus Build Tools</name>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-maven-skin/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-maven-skin/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-maven-skin/pom.xml 
(original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-maven-skin/pom.xml Tue 
Jan  8 09:09:18 2008
@@ -28,6 +28,6 @@
     <parent>
         <groupId>org.apache.cactus</groupId>
         <artifactId>cactus</artifactId>
-        <version>1.18-SNAPSHOT</version>
+       <version>1.8.0-SNAPSHOT</version>
     </parent>
 </project>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/pom.xml Tue Jan  8 
09:09:18 2008
@@ -21,7 +21,7 @@
        <parent>
                <artifactId>cactus</artifactId>
                <groupId>org.apache.cactus</groupId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.apache.cactus</groupId>

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-12-13-14/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-12-13-14/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-12-13-14/pom.xml
 (original)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-12-13-14/pom.xml
 Tue Jan  8 09:09:18 2008
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>framework</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <name>Cactus Framework - shared all versions</name>
        <description>Shared classes of Cactus Framework for all Java 
EE</description>
@@ -35,10 +35,10 @@
                        <scope>provided</scope>
                </dependency>
                <dependency>
-            <groupId>aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-            <version>1.5.2a</version>
-        </dependency>
+                       <groupId>aspectj</groupId>
+                       <artifactId>aspectjrt</artifactId>
+                       <version>1.5.2a</version>
+               </dependency>
        </dependencies>
        <build>
                <plugins>
@@ -54,16 +54,16 @@
                                </executions>
                        </plugin>
                        <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>aspectj-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-               </executions>
-           </plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>aspectj-maven-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <goals>
+                                                       <goal>compile</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
                </plugins>
        </build>
 </project>

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-13-14/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-13-14/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-13-14/pom.xml 
(original)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-13-14/pom.xml 
Tue Jan  8 09:09:18 2008
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>framework</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <name>Cactus Framework - shared Java EE 1.3 and 1.4</name>
        <description>Shared classes of Cactus Framework for Java EE 1.3 and 
1.4</description>

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-12-uberjar/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-12-uberjar/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-12-uberjar/pom.xml
 (original)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-12-uberjar/pom.xml
 Tue Jan  8 09:09:18 2008
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>framework-uberjars</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <artifactId>javaEE-12-uberjar</artifactId>
        <name>Cactus Uberjar - Java EE 1.2</name>

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-13-uberjar/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-13-uberjar/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-13-uberjar/pom.xml
 (original)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-13-uberjar/pom.xml
 Tue Jan  8 09:09:18 2008
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>framework-uberjars</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <artifactId>javaEE-13-uberjar</artifactId>
        <name>Cactus Uberjar - Java EE 1.3</name>

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/pom.xml
 (original)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/pom.xml
 Tue Jan  8 09:09:18 2008
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>framework-uberjars</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <artifactId>javaEE-14-uberjar</artifactId>
        <name>Cactus Uberjar - Java EE 1.4</name>

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/pom.xml
 (original)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-15-uberjar/pom.xml
 Tue Jan  8 09:09:18 2008
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>framework-uberjars</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <artifactId>javaEE-15-uberjar</artifactId>
        <name>Cactus Uberjar - Java EE 1.5</name>

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/pom.xml
 (original)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/pom.xml
 Tue Jan  8 09:09:18 2008
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>framework</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <artifactId>framework-uberjars</artifactId>
        <name>Cactus Uberjars - Parent Projcet</name>

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/pom.xml
 (original)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/pom.xml
 Tue Jan  8 09:09:18 2008
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>framework</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <packaging>pom</packaging>
     <name>Cactus Wrappers - Parent Project</name>

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-12/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-12/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-12/pom.xml
 (original)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-12/pom.xml
 Tue Jan  8 09:09:18 2008
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>framework-wrappers</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <artifactId>wrapper-javaEE-12</artifactId>
        <packaging>jar</packaging>

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-13/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-13/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-13/pom.xml
 (original)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-13/pom.xml
 Tue Jan  8 09:09:18 2008
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
        <artifactId>framework-wrappers</artifactId>
-               <version>1.18-SNAPSHOT</version>
+       <version>1.8.0-SNAPSHOT</version>
        </parent>
        <name>Cactus Wrappers - Java EE 1.3</name>
        <description>Cactus Wrappers and JSP redirector for Java EE 
1.3</description>

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-14/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-14/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-14/pom.xml
 (original)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-14/pom.xml
 Tue Jan  8 09:09:18 2008
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>framework-wrappers</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <name>Cactus Wrappers - Java EE 1.4</name>
        <description>Cactus Wrappers and JSP redirector for Java EE 
1.4</description>

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-15/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-15/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-15/pom.xml
 (original)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-wrappers/wrapper-javaEE-15/pom.xml
 Tue Jan  8 09:09:18 2008
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>framework-wrappers</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <name>Cactus Wrappers - Java EE 1.5</name>
        <description>Cactus Wrappers and JSP redirector for Java EE 
1.5</description>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/pom.xml Tue Jan  8 
09:09:18 2008
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>cactus</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
     <name>Cactus Framework - Parent Project</name>
        <description>Parent project for Cactus framework</description>

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/pom.xml
 (original)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-ant/pom.xml
 Tue Jan  8 09:09:18 2008
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>integration</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <artifactId>integration-ant</artifactId>
        <name>Cactus Ant Integration</name>

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/pom.xml
 (original)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-eclipse/pom.xml
 Tue Jan  8 09:09:18 2008
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>integration</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <artifactId>integration-eclipse</artifactId>
        <name>Cactus Eclipse Integration</name>

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven/pom.xml
 (original)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven/pom.xml
 Tue Jan  8 09:09:18 2008
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>integration</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <artifactId>integration-eclipse</artifactId>
        <name>Cactus Maven 1 Plugin</name>

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven2/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven2/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven2/pom.xml
 (original)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-maven2/pom.xml
 Tue Jan  8 09:09:18 2008
@@ -22,7 +22,7 @@
   <parent>
    <groupId>org.apache.cactus</groupId>
    <artifactId>integration</artifactId>
-   <version>1.18-SNAPSHOT</version>
+   <version>1.8.0-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.cactus.integration.m2</groupId>
   <artifactId>cactus-m2-plugin</artifactId>
@@ -33,7 +33,7 @@
   <contributors>
     <contributor>
       <name>Petar Tahchiev</name>
-      <email>[EMAIL PROTECTED]</email>
+      <email>[EMAIL PROTECTED]</email>
     </contributor>
   </contributors>
   <dependencies>
@@ -121,7 +121,7 @@
     <dependency>
            <groupId>org.apache.cactus</groupId>
            <artifactId>integration-ant</artifactId>
-           <version>1.18-SNAPSHOT</version>
+           <version>1.8.0-SNAPSHOT</version>
            <scope>provided</scope>
     </dependency>
     
@@ -157,12 +157,12 @@
             <artifactId>maven-plugin-tools-ant</artifactId>
             <version>2.0.1</version>
           </dependency>
-               <dependency>
-                        <groupId>org.apache.cactus</groupId>
-                        <artifactId>integration-ant</artifactId>
-                        <version>1.18-SNAPSHOT</version>
-                        <scope>provided</scope>
-               </dependency>
+               <dependency>
+                       <groupId>org.apache.cactus</groupId>
+                       <artifactId>integration-ant</artifactId>
+                       <version>1.8.0-SNAPSHOT</version>
+                       <scope>provided</scope>
+               </dependency>
         </dependencies>
         
         <!-- Tell the plugin-plugin which prefix we will use.

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-shared-api/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-shared-api/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-shared-api/pom.xml
 (original)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/integration-shared-api/pom.xml
 Tue Jan  8 09:09:18 2008
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>integration</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <artifactId>integration-shared-api</artifactId>
        <name>Cactus Shared API for the integration </name>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/integration/pom.xml Tue Jan  8 
09:09:18 2008
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>cactus</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <artifactId>integration</artifactId>
        <name>Cactus Integration - Parent Project</name>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml Tue Jan  8 09:09:18 
2008
@@ -22,7 +22,7 @@
        <groupId>org.apache.cactus</groupId>
        <artifactId>cactus</artifactId>
        <name>Cactus Parent Project</name>
-       <version>1.18-SNAPSHOT</version>
+       <version>1.8.0-SNAPSHOT</version>
        <packaging>pom</packaging>
        <url>http://jakarta.apache.org/cactus/</url>
        <scm>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml Tue Jan  8 
09:09:18 2008
@@ -22,18 +22,58 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>cactus</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <artifactId>samples</artifactId>
        <name>Cactus Samples - Parent Project</name>
        <description>Cactus Sample Projects</description>
        <packaging>pom</packaging>
        
-       <modules>
+       <!--modules>
                <module>samples-servlet</module>
                <module>samples-ejb</module>
-               <module>samples-uberjars</module>
-       </modules>
+       </modules-->
+       <build>
+       <plugins>
+
+               <plugin>
+                       <artifactId>maven-antrun-plugin</artifactId>
+                       <dependencies>  
+                               <dependency>
+                                       <groupId>org.apache.ivy</groupId>
+                                       <artifactId>ivy</artifactId>
+                                       <version>2.0.0-beta1</version>
+                               </dependency>
+                       </dependencies>
+                       <executions>
+                               <execution>
+                                       <phase>test</phase>
+                                       <configuration>
+                                               <tasks>
+                                                       <!--
+                                                           Place any ant task 
here. You can add anything
+                                                           you can add between 
<target> and </target> in a
+                                                           build.xml.
+                                                           -->
+                                                           <ant 
antfile="build.xml">
+                                                                   <property 
name="cactus.sample.app.type" value="servlet"/>
+                                                                   <property 
name="cactus.sample.archive.type" value="war"/>
+                                                           </ant>
+                                                           <ant 
antfile="build.xml" inheritAll="false">
+                                                                   <property 
name="cactus.sample.app.type" value="ejb"/>
+                                                                   <property 
name="cactus.sample.archive.type" value="ear"/>
+                                                           </ant>
+
+                                                   </tasks>
+                                           </configuration>
+                                           <goals>
+                                                   <goal>run</goal>
+                                           </goals>
+                                   </execution>
+                       </executions>
+                  </plugin>
+       </plugins>
+       </build>
 </project>
 
 

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/pom.xml 
(original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-ejb/pom.xml 
Tue Jan  8 09:09:18 2008
@@ -22,16 +22,10 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>samples</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <artifactId>samples-ejb</artifactId>
        <name>Cactus Ejb Samples - Parent Project</name>
        <description>Cactus Ejb Samples - the parent project</description>
        <packaging>pom</packaging>
-       
-       <modules>
-               <module>samples-ejb-javaEE-12</module>
-               <module>samples-ejb-javaEE-13</module>
-               <module>samples-ejb-share</module>
-       </modules>
 </project> 

Modified: 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/pom.xml?rev=610069&r1=610068&r2=610069&view=diff
==============================================================================
--- 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/pom.xml 
(original)
+++ 
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/pom.xml 
Tue Jan  8 09:09:18 2008
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.apache.cactus</groupId>
                <artifactId>samples</artifactId>
-               <version>1.18-SNAPSHOT</version>
+               <version>1.8.0-SNAPSHOT</version>
        </parent>
        <artifactId>samples-servlet</artifactId>
        <name>Cactus Servlet Samples - Parent Project</name>
@@ -37,7 +37,7 @@
                <dependency>
                        <groupId>org.apache.cactus</groupId>
                        <artifactId>javaEE-14-uberjar</artifactId>
-                       <version>1.18-SNAPSHOT</version>
+                       <version>${version}</version>
                </dependency>
                <dependency>
                        <groupId>xerces</groupId>
@@ -64,7 +64,11 @@
                        <artifactId>standard</artifactId>
                        <version>1.1.2</version>
                </dependency>
-
+               <dependency>
+                       <groupId>org.apache.ivy</groupId>
+                       <artifactId>ivy</artifactId>
+                       <version>2.0.0-beta1</version>
+               </dependency>
        </dependencies>
        <properties>
                <container.id>tomcat5x</container.id>
@@ -72,7 +76,7 @@
        </properties>
        <build>
                <plugins>
-                       <plugin>
+                       <!--plugin>
                                
<groupId>org.apache.cactus.integration.m2</groupId>
                                <artifactId>cactus-m2-plugin</artifactId>
                                <version>1.0-SNAPSHOT</version>
@@ -85,12 +89,12 @@
                                        <dependency>
                                                
<groupId>org.apache.cactus</groupId>
                                                
<artifactId>javaEE-14-uberjar</artifactId>
-                                               <version>1.18-SNAPSHOT</version>
+                                               <version>${version}</version>
                                        </dependency>
                                        <dependency>
                                                
<groupId>org.apache.cactus</groupId>
                                                
<artifactId>integration-ant</artifactId>
-                                               <version>1.18-SNAPSHOT</version>
+                                               <version>${version}</version>
                                        </dependency>
                                        <dependency>
                                                <groupId>xerces</groupId>
@@ -113,6 +117,43 @@
                                                <version>1.6</version>
                                        </dependency>
                                </dependencies>
+                               <executions>
+                                       <execution>
+                                               <phase>test</phase>
+                                               <goals>
+                                                       <goal>cactus:test</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin-->
+                       <plugin>
+                               <artifactId>maven-antrun-plugin</artifactId>
+                               <dependencies>  
+                                       <dependency>
+                                               
<groupId>org.apache.ivy</groupId>
+                                               <artifactId>ivy</artifactId>
+                                               <version>2.0.0-beta1</version>
+                                       </dependency>
+                               </dependencies>
+                               <executions>
+                                       <execution>
+                                               <phase>test</phase>
+                                               <configuration>
+                                                       <tasks>
+                                                               
+                                                               <!--
+                                                                   Place any 
ant task here. You can add anything
+                                                                   you can add 
between <target> and </target> in a
+                                                                   build.xml.
+                                                                   -->
+                                                               <ant 
antfile="build.xml"/>
+                                                           </tasks>
+                                               </configuration>
+                                                   <goals>
+                                                           <goal>run</goal>
+                                                   </goals>
+                                           </execution>
+                                   </executions>
                        </plugin>
                </plugins>
        </build>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to