cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r1195161 - in /cocoon/cocoon3/trunk: cocoon-all/pom.xml cocoon-cli/pom.xml cocoon-rest-optional/pom.xml parent/pom.xml pom.xml
Date Sun, 30 Oct 2011 14:08:00 GMT
Author: thorsten
Date: Sun Oct 30 14:07:59 2011
New Revision: 1195161

URL: http://svn.apache.org/viewvc?rev=1195161&view=rev
Log:
Fixing cocoon-all adding recently developed modules. The firebugs profiling was not in the
root and the build is failing when activated, but it should be managed by the root.

Modified:
    cocoon/cocoon3/trunk/cocoon-all/pom.xml
    cocoon/cocoon3/trunk/cocoon-cli/pom.xml
    cocoon/cocoon3/trunk/cocoon-rest-optional/pom.xml
    cocoon/cocoon3/trunk/parent/pom.xml
    cocoon/cocoon3/trunk/pom.xml

Modified: cocoon/cocoon3/trunk/cocoon-all/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-all/pom.xml?rev=1195161&r1=1195160&r2=1195161&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-all/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-all/pom.xml Sun Oct 30 14:07:59 2011
@@ -39,10 +39,18 @@
 
   <dependencies>
     <dependency>
+      <groupId>org.apache.cocoon.cli</groupId>
+      <artifactId>cocoon-cli</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.cocoon.controller</groupId>
       <artifactId>cocoon-controller</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.cocoon.databases</groupId>
+      <artifactId>cocoon-databases</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.cocoon.monitoring</groupId>
       <artifactId>cocoon-monitoring</artifactId>
     </dependency>
@@ -51,22 +59,22 @@
       <artifactId>cocoon-optional</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.cocoon.databases</groupId>
-      <artifactId>cocoon-databases</artifactId>
+      <groupId>org.apache.cocoon.pipeline</groupId>
+      <artifactId>cocoon-pipeline</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon.profiling</groupId>
       <artifactId>cocoon-profiling</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.cocoon.pipeline</groupId>
-      <artifactId>cocoon-pipeline</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.cocoon.rest</groupId>
       <artifactId>cocoon-rest</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.cocoon.rest.optional</groupId>
+      <artifactId>cocoon-rest-optional</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.cocoon.sax</groupId>
       <artifactId>cocoon-sax</artifactId>
     </dependency>
@@ -75,6 +83,10 @@
       <artifactId>cocoon-servlet</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.cocoon.shiro</groupId>
+      <artifactId>cocoon-shiro</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.cocoon.sitemap</groupId>
       <artifactId>cocoon-sitemap</artifactId>
     </dependency>

Modified: cocoon/cocoon3/trunk/cocoon-cli/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-cli/pom.xml?rev=1195161&r1=1195160&r2=1195161&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-cli/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-cli/pom.xml Sun Oct 30 14:07:59 2011
@@ -30,9 +30,8 @@
     <relativePath>../parent</relativePath>
   </parent>
 
-  <groupId>org.apache.cocoon</groupId>
+  <groupId>org.apache.cocoon.cli</groupId>
   <artifactId>cocoon-cli</artifactId>
-  <version>3.0.0-beta-1-SNAPSHOT</version>
   <name>Apache Cocoon 3: CLI</name>
   <description>Cocoon 3 SAX pipeline components from CLI.</description>
 

Modified: cocoon/cocoon3/trunk/cocoon-rest-optional/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest-optional/pom.xml?rev=1195161&r1=1195160&r2=1195161&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest-optional/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-rest-optional/pom.xml Sun Oct 30 14:07:59 2011
@@ -28,6 +28,7 @@
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-rest-optional</artifactId>
+  <groupId>org.apache.cocoon.rest.optional</groupId>
   <name>Apache cocoon 3: Optional REST components</name>
   <description>org.cocooon.rest.optional:cocoon-rest-optional:3.0.0-beta-1-SNAPSHOT</description>
    <build>

Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=1195161&r1=1195160&r2=1195161&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Sun Oct 30 14:07:59 2011
@@ -492,6 +492,11 @@
 
             <!-- Cocoon internal dependencies -->
             <dependency>
+                <groupId>org.apache.cocoon.cli</groupId>
+                <artifactId>cocoon-cli</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.cocoon.controller</groupId>
                 <artifactId>cocoon-controller</artifactId>
                 <version>${project.version}</version>
@@ -522,6 +527,11 @@
                 <version>${project.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.cocoon.rest.optional</groupId>
+                <artifactId>cocoon-rest-optional</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.cocoon.sample</groupId>
                 <artifactId>cocoon-sample</artifactId>
                 <version>${project.version}</version>

Modified: cocoon/cocoon3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/pom.xml?rev=1195161&r1=1195160&r2=1195161&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/pom.xml (original)
+++ cocoon/cocoon3/trunk/pom.xml Sun Oct 30 14:07:59 2011
@@ -50,20 +50,21 @@
     <module>cocoon-optional</module>
     <module>cocoon-pipeline</module>
     <module>cocoon-profiling</module>
+    <!-- <module>cocoon-profiling-firebug</module> -->
     <module>cocoon-rest</module>
+    <module>cocoon-rest-optional</module>
     <module>cocoon-sample</module>
     <module>cocoon-sax</module>
     <module>cocoon-cli</module>
     <module>cocoon-servlet</module>
     <module>cocoon-shiro</module>
+    <module>cocoon-shiro-sample</module>
     <module>cocoon-sitemap</module>
     <module>cocoon-stax</module>
     <module>cocoon-stringtemplate</module>
     <module>cocoon-util</module>
     <module>cocoon-wicket</module>
     <module>parent</module>
-    <module>cocoon-rest-optional</module>
-    <module>cocoon-shiro-sample</module>
   </modules>
 
   <build>
@@ -134,4 +135,4 @@
       </build>
     </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>



Mime
View raw message