You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2007/05/29 23:13:35 UTC

svn commit: r542654 - in /cocoon/trunk: blocks/cocoon-forms/cocoon-forms-impl/pom.xml pom.xml

Author: reinhard
Date: Tue May 29 14:13:34 2007
New Revision: 542654

URL: http://svn.apache.org/viewvc?view=rev&rev=542654
Log:
use latest release of xreporter

Modified:
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml
    cocoon/trunk/pom.xml

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml?view=diff&rev=542654&r1=542653&r2=542654
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml Tue May 29 14:13:34 2007
@@ -24,18 +24,18 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-  
+
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
     <version>5-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-forms-impl</artifactId>
   <name>Cocoon Forms Block Implementation</name>
   <version>1.0.0-RC1-SNAPSHOT</version>
-  <url>http://cocoon.apache.org/${docs.m.forms.relPath}</url>    
-  
+  <url>http://cocoon.apache.org/${docs.m.forms.relPath}</url>
+
   <build>
     <plugins>
       <plugin>
@@ -56,43 +56,25 @@
       </plugin>
     </plugins>
   </build>
-  
-  <repositories>
-    <!-- Repository for the xreporter -->
-    <repository>
-      <id>apache-cvs</id>
-      <name>Apache Maven 1 Repository</name>
-      <url>http://people.apache.org/repo/m1-snapshot-repository</url>
-      <layout>legacy</layout>
-    </repository>  
-  </repositories>  
-  
+
   <dependencies>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
+    <!-- Cocoon dependencies -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
+      <artifactId>cocoon-ajax-impl</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-flowscript-impl</artifactId>
     </dependency>
+    <!-- other dependencies -->
     <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-ajax-impl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-servlet-service-components</artifactId>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
     </dependency>
     <dependency>
       <groupId>org.outerj.daisy</groupId>
@@ -107,16 +89,16 @@
       <artifactId>oro</artifactId>
     </dependency>
     <dependency>
-      <groupId>jakarta-regexp</groupId>
-      <artifactId>jakarta-regexp</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xreporter</groupId>
+      <groupId>org.outerj.xreporter</groupId>
       <artifactId>xreporter-expression</artifactId>
+      <version>1.2.1.1</version>
     </dependency>
+    <!-- test dependencies -->
     <dependency>
-      <groupId>xreporter</groupId>
-      <artifactId>xreporter-grouping</artifactId>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-core</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -128,24 +110,20 @@
       <artifactId>xmlunit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-sourceresolve</artifactId>
-    </dependency>
   </dependencies>
-  
+
   <distributionManagement>
     <site>
       <id>website</id>
       <url>${docs.deploymentBaseUrl}/${docs.m.forms.relPath}</url>
     </site>
   </distributionManagement>
-  
+
   <properties>
     <docs.name>Cocoon Forms</docs.name>
     <docs.version>${docs.m.forms.version}</docs.version>
   </properties>
-  
+
   <profiles>
     <profile>
       <id>daisy</id>
@@ -161,8 +139,8 @@
             </configuration>
           </plugin>
         </plugins>
-      </build>      
+      </build>
     </profile>
-  </profiles>  
-  
+  </profiles>
+
 </project>

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?view=diff&rev=542654&r1=542653&r2=542654
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Tue May 29 14:13:34 2007
@@ -2906,14 +2906,14 @@
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>xreporter</groupId>
+        <groupId>org.outerj.xreporter</groupId>
         <artifactId>xreporter-expression</artifactId>
-        <version>1.3-SNAPSHOT</version>
+        <version>1.2.1.1</version>
       </dependency>
       <dependency>
-        <groupId>xreporter</groupId>
+        <groupId>org.outerj.xreporter</groupId>
         <artifactId>xreporter-grouping</artifactId>
-        <version>1.3-SNAPSHOT</version>
+        <version>1.2.1.1</version>
       </dependency>
     </dependencies>
   </dependencyManagement>