cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r394248 - in /cocoon/trunk/blocks: cocoon-axis/cocoon-axis-impl/ cocoon-batik/cocoon-batik-impl/ cocoon-chaperon/cocoon-chaperon-impl/ cocoon-cron/cocoon-cron-impl/ cocoon-cron/cocoon-cron-sample/ cocoon-deli/cocoon-deli-sample/ cocoon-face...
Date Sat, 15 Apr 2006 02:38:54 GMT
Author: antonio
Date: Fri Apr 14 19:38:49 2006
New Revision: 394248

URL: http://svn.apache.org/viewcvs?rev=394248&view=rev
Log:
Fix end lines, fix dependencies, fix namespaces.

Modified:
    cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/pom.xml
    cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml
    cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml
    cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/pom.xml
    cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/pom.xml
    cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/pom.xml
    cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml
    cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/pom.xml
    cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/pom.xml
    cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/pom.xml
    cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml
    cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/pom.xml
    cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-mocks/pom.xml
    cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/pom.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml
    cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/pom.xml
    cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/pom.xml
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml
    cocoon/trunk/blocks/cocoon-slide/cocoon-slide-impl/pom.xml
    cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/pom.xml
    cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-impl/pom.xml
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/pom.xml
    cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml

Modified: cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/pom.xml Fri Apr 14 19:38:49 2006
@@ -63,8 +63,8 @@
       <version>1.2.1</version>
     </dependency>
     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
       <version>2.3</version>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml Fri Apr 14 19:38:49 2006
@@ -18,7 +18,7 @@
     | @version $Id$
     |
     +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-batik</artifactId>
@@ -42,11 +42,11 @@
       <artifactId>batik-all</artifactId>
       <version>1.6</version>
     </dependency>
-    <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
-      <scope>provided</scope>
-    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.3</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml Fri Apr 14 19:38:49 2006
@@ -18,7 +18,7 @@
     | @version $Id$
     |
     +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-chaperon</artifactId>
@@ -47,43 +47,43 @@
       <artifactId>castor</artifactId>
       <version>0.9.7</version>
     </dependency>
-    <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
-      <scope>provided</scope>
-    </dependency>
-    <!--  test dependencies  -->
-    <dependency>
-      <groupId>xmlunit</groupId>
-      <artifactId>xmlunit</artifactId>
-      <version>0.8</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>jmock</groupId>
-      <artifactId>jmock</artifactId>
-      <version>1.0.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-core</artifactId>
-      <version>2.2.0-SNAPSHOT</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.3</version>
+      <scope>provided</scope>
+    </dependency>
+    <!--  test dependencies  -->
+    <dependency>
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
+      <version>0.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>jmock</groupId>
+      <artifactId>jmock</artifactId>
+      <version>1.0.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-core</artifactId>
+      <version>2.2.0-SNAPSHOT</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/pom.xml Fri Apr 14 19:38:49 2006
@@ -18,7 +18,7 @@
     | @version $Id$
     |
     +-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-cron</artifactId>

Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/pom.xml Fri Apr 14 19:38:49 2006
@@ -45,5 +45,4 @@
       <version>1.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
-
 </project>

Modified: cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/pom.xml Fri Apr 14 19:38:49 2006
@@ -35,7 +35,7 @@
   <version>1.0-SNAPSHOT</version>
     
   <packaging>jar</packaging>
-  <name>deli Block Samples</name>
+  <name>Deli Block Samples</name>
   <description></description>
   
   <dependencies>
@@ -45,5 +45,4 @@
       <version>1.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
-
 </project>

Modified: cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml Fri Apr 14 19:38:49 2006
@@ -18,7 +18,7 @@
     | @version $Id$
     |
     +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-faces</artifactId>

Modified: cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/pom.xml Fri Apr 14 19:38:49 2006
@@ -18,7 +18,7 @@
     | @version $Id$
     |
     +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-jms</artifactId>
@@ -47,10 +47,8 @@
       <artifactId>hsqldb</artifactId>
       <version>1.8.0.2</version>
     </dependency>
-    <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-jms</artifactId>
-      <version>1.1-rc3</version>
-    </dependency>
+    <groupId>org.apache.geronimo.specs</groupId>
+    <artifactId>geronimo-jms_1.1_spec</artifactId>
+    <version>1.0</version>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/pom.xml Fri Apr 14 19:38:49 2006
@@ -18,7 +18,7 @@
     | @version $Id$
     |
     +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-jsp</artifactId>
@@ -43,8 +43,8 @@
       <version>2.2-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
       <version>2.3</version>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/pom.xml Fri Apr 14 19:38:49 2006
@@ -18,7 +18,7 @@
     | @version $Id$
     |
     +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-jsp</artifactId>
@@ -33,8 +33,8 @@
   <description/>
   <dependencies>
     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
       <version>2.3</version>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml Fri Apr 14 19:38:49 2006
@@ -18,7 +18,7 @@
     | @version $Id$
     |
     +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-mail</artifactId>
@@ -38,14 +38,14 @@
       <version>2.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-activation</artifactId>
-      <version>1.0.2-rc4</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+      <version>1.0</version>
     </dependency>
     <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-javamail</artifactId>
-      <version>1.3.1-rc5</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>servletapi</groupId>

Modified: cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/pom.xml Fri Apr 14 19:38:49 2006
@@ -18,7 +18,7 @@
     | @version $Id$
     |
     +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-ojb</artifactId>
@@ -52,12 +52,12 @@
       <groupId>excalibur-datasource</groupId>
       <artifactId>excalibur-datasource</artifactId>
       <version>2.1</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>d-haven-managed-pool</artifactId>
-          <groupId>d-haven-managed-pool</groupId>
-        </exclusion>
-      </exclusions>
+      <exclusions>
+        <exclusion>
+          <artifactId>d-haven-managed-pool</artifactId>
+          <groupId>d-haven-managed-pool</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-mocks/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-mocks/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-mocks/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-mocks/pom.xml Fri Apr 14 19:38:49 2006
@@ -18,7 +18,7 @@
     | @version $Id$
     |
     +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-ojb</artifactId>

Modified: cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/pom.xml Fri Apr 14 19:38:49 2006
@@ -18,7 +18,7 @@
     | @version $Id$
     |
     +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-poi</artifactId>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>poi</groupId>
       <artifactId>poi</artifactId>
-      <version>2.5.1</version>
+      <version>2.5.1-final-20040804</version>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml Fri Apr 14 19:38:49 2006
@@ -18,7 +18,7 @@
     | @version $Id$
     |
     +-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-portal</artifactId>
@@ -56,12 +56,12 @@
       <version>1.3</version>
       <exclusions>
         <exclusion>
-          <artifactId>mail</artifactId>
           <groupId>javax.mail</groupId>
+          <artifactId>mail</artifactId>
         </exclusion>
         <exclusion>
-          <artifactId>activation</artifactId>
           <groupId>javax.activation</groupId>
+          <artifactId>activation</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -107,8 +107,8 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
       <version>2.3</version>
       <scope>provided</scope>
     </dependency>

Modified: cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/pom.xml Fri Apr 14 19:38:49 2006
@@ -18,7 +18,7 @@
     | @version $Id$
     |
     +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-python</artifactId>

Modified: cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/pom.xml Fri Apr 14 19:38:49
2006
@@ -18,7 +18,7 @@
     | @version $Id$
     |
     +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-repository</artifactId>
@@ -46,12 +46,12 @@
       <groupId>excalibur-datasource</groupId>
       <artifactId>excalibur-datasource</artifactId>
       <version>2.1</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>d-haven-managed-pool</artifactId>
-          <groupId>d-haven-managed-pool</groupId>
-        </exclusion>
-      </exclusions>
+      <exclusions>
+        <exclusion>
+          <artifactId>d-haven-managed-pool</artifactId>
+          <groupId>d-haven-managed-pool</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml Fri Apr 14 19:38:49
2006
@@ -18,7 +18,7 @@
     | @version $Id$
     |
     +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-scratchpad</artifactId>
@@ -62,59 +62,59 @@
       <artifactId>commons-betwixt</artifactId>
       <version>0.6</version>
     </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-jelly</groupId>
-      <artifactId>commons-jelly</artifactId>
-      <version>1.0</version>
-    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-jelly</groupId>
+      <artifactId>commons-jelly</artifactId>
+      <version>1.0</version>
+    </dependency>
     <dependency>
       <groupId>excalibur-sourceresolve</groupId>
       <artifactId>excalibur-sourceresolve</artifactId>
       <version>2.1</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>d-haven-managed-pool</artifactId>
-          <groupId>d-haven-managed-pool</groupId>
-        </exclusion>
-      </exclusions>
+      <exclusions>
+        <exclusion>
+          <artifactId>d-haven-managed-pool</artifactId>
+          <groupId>d-haven-managed-pool</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>castor</groupId>
       <artifactId>castor</artifactId>
       <version>0.9.7</version>
     </dependency>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.3.02</version>
-    </dependency>
-<!-- 
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>1.3.02</version>
+    </dependency>
+<!-- 
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-test-core</artifactId>
       <version>2.2-SNAPSHOT</version>
     </dependency>
- -->
+ -->
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>**/*TestCase.class</include>
-            <include>**/*Test.class</include>
-          </includes>
-          <excludes>
-            <exclude>**/CachingSourceTestCase.class</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>**/*TestCase.class</include>
+            <include>**/*Test.class</include>
+          </includes>
+          <excludes>
+            <exclude>**/CachingSourceTestCase.class</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

Modified: cocoon/trunk/blocks/cocoon-slide/cocoon-slide-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-slide/cocoon-slide-impl/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-slide/cocoon-slide-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-slide/cocoon-slide-impl/pom.xml Fri Apr 14 19:38:49 2006
@@ -18,7 +18,7 @@
     | @version $Id$
     |
     +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-slide</artifactId>
@@ -68,9 +68,9 @@
       <version>1.0</version>
     </dependency>
     <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-jta</artifactId>
-      <version>1.0.1B-rc3</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+      <version>1.0</version>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/pom.xml Fri Apr 14 19:38:49 2006
@@ -18,7 +18,7 @@
     | @version $Id$
     |
     +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-taglib</artifactId>
@@ -38,7 +38,7 @@
       <version>2.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>jspapi</groupId>
+      <groupId>javax.servlet</groupId>
       <artifactId>jsp-api</artifactId>
       <version>2.0</version>
     </dependency>

Modified: cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-impl/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-impl/pom.xml Fri Apr 14 19:38:49 2006
@@ -18,7 +18,7 @@
     | @version $Id$
     |
     +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-velocity</artifactId>
@@ -42,11 +42,11 @@
       <artifactId>velocity</artifactId>
       <version>1.4</version>
     </dependency>
-    <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
-      <scope>provided</scope>
-    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.3</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/pom.xml Fri Apr 14 19:38:49 2006
@@ -18,7 +18,7 @@
     | @version $Id$
     |
     +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-webdav</artifactId>

Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml?rev=394248&r1=394247&r2=394248&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml Fri Apr 14 19:38:49 2006
@@ -18,7 +18,7 @@
     | @version $Id$
     |
     +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-xsp</artifactId>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-session-fw-impl</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -48,28 +48,28 @@
       <artifactId>jdtcore</artifactId>
       <version>3.1.0</version>
     </dependency>
-    <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
-      <version>2.0.2</version>
-    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>2.0.2</version>
+    </dependency>
     <dependency>
       <groupId>excalibur-datasource</groupId>
       <artifactId>excalibur-datasource</artifactId>
       <version>2.1</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>d-haven-managed-pool</artifactId>
-          <groupId>d-haven-managed-pool</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>sun.jdk</groupId>
-      <artifactId>tools</artifactId>
-      <version>1.4.0</version>
-      <scope>system</scope>
-      <systemPath>${java.home}/../lib/tools.jar</systemPath>
-    </dependency>
+      <exclusions>
+        <exclusion>
+          <artifactId>d-haven-managed-pool</artifactId>
+          <groupId>d-haven-managed-pool</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>sun.jdk</groupId>
+      <artifactId>tools</artifactId>
+      <version>1.4.0</version>
+      <scope>system</scope>
+      <systemPath>${java.home}/../lib/tools.jar</systemPath>
+    </dependency>
   </dependencies>
 </project>



Mime
View raw message