cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1359672 - in /cocoon/trunk: ./ blocks/ blocks/cocoon-forms/cocoon-forms-impl/ blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/ commons/ commons/legal/ core/ core/cocoon-expression-language/cocoon-expression-languag...
Date Tue, 10 Jul 2012 13:55:43 GMT
Author: ilgrosso
Date: Tue Jul 10 13:55:42 2012
New Revision: 1359672

URL: http://svn.apache.org/viewvc?rev=1359672&view=rev
Log:
Bringing back C2.2 to the 'compilable' world: don't know, though, if everything is still working
as expected COCOON-2316 COCOON-2302 COCOON-2184

Modified:
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml
    cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/profiler.xsamples
    cocoon/trunk/blocks/pom.xml
    cocoon/trunk/commons/legal/pom.xml
    cocoon/trunk/commons/pom.xml
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/pom.xml
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml
    cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml
    cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/pom.xml
    cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/src/test/java/org/apache/cocoon/thread/impl/AbstractTestCase.java
    cocoon/trunk/core/cocoon-webapp/pom.xml
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml
    cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml
    cocoon/trunk/core/pom.xml
    cocoon/trunk/dists/pom.xml
    cocoon/trunk/parent/pom.xml
    cocoon/trunk/pom.xml
    cocoon/trunk/tools/cocoon-maven-docs-cleaner-plugin/pom.xml
    cocoon/trunk/tools/cocoon-maven-javadocs-script-report/pom.xml
    cocoon/trunk/tools/cocoon-sitemaptags2daisy-plugin/pom.xml
    cocoon/trunk/tools/pom.xml
    cocoon/trunk/tools/sitemaptags2daisy/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?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml Tue Jul 10 13:55:42 2012
@@ -85,6 +85,7 @@
     <dependency>
       <groupId>org.outerj.daisy</groupId>
       <artifactId>daisy-htmlcleaner</artifactId>
+      <version>1.4.1</version>
     </dependency>
     <dependency>
       <groupId>com.ibm.icu</groupId>

Modified: cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/profiler.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/profiler.xsamples?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/profiler.xsamples
(original)
+++ cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/profiler.xsamples
Tue Jul 10 13:55:42 2012
@@ -1,31 +1,21 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed  under the  License is distributed on an "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.core.container.spring.avalon;
 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<!--
-  - $Id$
-  -->
-<xsamples>
-
-  <group name="Unsorted And Miscellaneous">
-    <sample name="Profiler Block" href="/cocoon-profiler-sample/">
-      This example shows the usage of the Profiler component for
-      profiling and debugging of pipelines.
-    </sample>
-  </group>
-
-</xsamples>
+import org.apache.avalon.framework.c
\ No newline at end of file

Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Tue Jul 10 13:55:42 2012
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>10-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>cocoon-blocks-modules</artifactId>

Modified: cocoon/trunk/commons/legal/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/commons/legal/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/commons/legal/pom.xml (original)
+++ cocoon/trunk/commons/legal/pom.xml Tue Jul 10 13:55:42 2012
@@ -27,8 +27,8 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../parent</relativePath>
+    <version>9</version>
+    <relativePath/>
   </parent>
   <artifactId>cocoon-licenses</artifactId>
   <version>1.0.0-M2-SNAPSHOT</version>

Modified: cocoon/trunk/commons/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/commons/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/commons/pom.xml (original)
+++ cocoon/trunk/commons/pom.xml Tue Jul 10 13:55:42 2012
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>10-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/pom.xml Tue
Jul 10 13:55:42 2012
@@ -53,10 +53,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-expression-language-api</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-util</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml Tue Jul 10 13:55:42
2012
@@ -56,14 +56,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-impl</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-util</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-api</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -74,12 +77,14 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-impl</artifactId>
+      <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-impl</artifactId>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml
Tue Jul 10 13:55:42 2012
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>cocoon</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
+    <version>10-SNAPSHOT</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-servlet-service-components-sample</artifactId>

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml Tue
Jul 10 13:55:42 2012
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>cocoon</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
+    <version>10-SNAPSHOT</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-servlet-service-components</artifactId>

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml Tue Jul 10 13:55:42 2012
@@ -58,6 +58,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-api</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <!-- Excalibur -->
     <dependency>

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml Tue Jul 10 13:55:42
2012
@@ -56,10 +56,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-sitemap-impl</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-components</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml Tue Jul 10 13:55:42 2012
@@ -68,10 +68,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-sitemap-api</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-expression-language-impl</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -80,18 +82,22 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-impl</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-thread-api</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-api</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-expression-language-api</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <!-- Excalibur -->
     <dependency>

Modified: cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml Tue Jul 10 13:55:42 2012
@@ -60,10 +60,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-thread-api</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-util</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <!--  Commons -->
     <dependency>

Modified: cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/pom.xml Tue Jul 10 13:55:42 2012
@@ -54,6 +54,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-thread-api</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <!--  Commons logging -->
     <dependency>

Modified: cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/src/test/java/org/apache/cocoon/thread/impl/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/src/test/java/org/apache/cocoon/thread/impl/AbstractTestCase.java?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/src/test/java/org/apache/cocoon/thread/impl/AbstractTestCase.java
(original)
+++ cocoon/trunk/core/cocoon-thread/cocoon-thread-impl/src/test/java/org/apache/cocoon/thread/impl/AbstractTestCase.java
Tue Jul 10 13:55:42 2012
@@ -31,7 +31,7 @@ import junit.framework.TestCase;
  *
  * @version $Id$
  */
-public class AbstractTestCase
+public abstract class AbstractTestCase
     extends TestCase {
 
     //~ Instance fields --------------------------------------------------------

Modified: cocoon/trunk/core/cocoon-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/pom.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/pom.xml Tue Jul 10 13:55:42 2012
@@ -102,10 +102,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-servlet-service-impl-sample</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-components-sample</artifactId>
     </dependency>
 	

Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml Tue Jul 10 13:55:42 2012
@@ -54,6 +54,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-api</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>

Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml (original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml Tue Jul 10 13:55:42 2012
@@ -62,6 +62,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-impl</artifactId>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Tue Jul 10 13:55:42 2012
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>10-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

Modified: cocoon/trunk/dists/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/dists/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/dists/pom.xml (original)
+++ cocoon/trunk/dists/pom.xml Tue Jul 10 13:55:42 2012
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>10-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>cocoon-dists-modules</artifactId>

Modified: cocoon/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/parent/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/parent/pom.xml (original)
+++ cocoon/trunk/parent/pom.xml Tue Jul 10 13:55:42 2012
@@ -2168,7 +2168,7 @@
       </dependency>
 
       <!-- Cocoon SNAPSHOT dependencies -->
-      <!--<dependency>
+      <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-ajax-impl</artifactId>
         <version>1.1.0-SNAPSHOT</version>
@@ -3026,7 +3026,7 @@
         <groupId>org.apache.commons</groupId>
         <artifactId>javaflow</artifactId>
         <version>1.0-SNAPSHOT</version>
-      </dependency>-->
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Tue Jul 10 13:55:42 2012
@@ -41,8 +41,6 @@
     <module>commons</module>
     <module>core</module>
     <module>dists</module>
-    <!-- sub projects -->
-    <module>subprojects</module>
     <module>core/cocoon-servlet-service/cocoon-servlet-service-components</module>
     <module>core/cocoon-servlet-service/cocoon-servlet-service-components-sample</module>
   </modules>

Modified: cocoon/trunk/tools/cocoon-maven-docs-cleaner-plugin/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-maven-docs-cleaner-plugin/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-maven-docs-cleaner-plugin/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-maven-docs-cleaner-plugin/pom.xml Tue Jul 10 13:55:42 2012
@@ -58,10 +58,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
     </dependency>
     <!-- test libs -->

Modified: cocoon/trunk/tools/cocoon-maven-javadocs-script-report/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-maven-javadocs-script-report/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-maven-javadocs-script-report/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-maven-javadocs-script-report/pom.xml Tue Jul 10 13:55:42 2012
@@ -58,10 +58,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
     </dependency>
     <dependency>

Modified: cocoon/trunk/tools/cocoon-sitemaptags2daisy-plugin/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-sitemaptags2daisy-plugin/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-sitemaptags2daisy-plugin/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-sitemaptags2daisy-plugin/pom.xml Tue Jul 10 13:55:42 2012
@@ -35,52 +35,45 @@
   <name>Cocoon Sitemap Tags to Daisy Plugin</name>
 
   <repositories>
-    <!-- The cocoondev repository contains the needed Daisy artifacts -->
     <repository>
-      <id>cocoondev</id>
-      <name>Cocoondev Maven Repository</name>
-      <url>http://daisycms.org/maven/maven1/deploy</url>
-      <layout>legacy</layout>
-    </repository>
-    <repository>
-      <id>maven-snapshot</id>
-      <name>Maven snapshot Repository</name>
-      <url>http://snapshots.maven.codehaus.org/maven2/</url>
+      <id>daisy</id>
+      <url>http://daisycms.org/maven/maven2/deploy/</url>
     </repository>
   </repositories>
+
   <dependencies>
     <!-- utility libs -->
     <dependency>
       <groupId>daisy</groupId>
       <artifactId>daisy-repository-api</artifactId>
-      <version>1.5-dev</version>
+      <version>${daisy.version}</version>
     </dependency>
     <dependency>
       <groupId>daisy</groupId>
       <artifactId>daisy-repository-xmlschema-bindings</artifactId>
-      <version>1.5-dev</version>
+      <version>${daisy.version}</version>
     </dependency>
     <dependency>
       <groupId>daisy</groupId>
       <artifactId>daisy-repository-client-impl</artifactId>
-      <version>1.5-dev</version>
+      <version>${daisy.version}</version>
     </dependency>
     <dependency>
       <groupId>daisy</groupId>
       <artifactId>daisy-repository-common-impl</artifactId>
-      <version>1.5-dev</version>
+      <version>${daisy.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>daisy</groupId>
       <artifactId>daisy-repository-spi</artifactId>
-      <version>1.5-dev</version>
+      <version>${daisy.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>daisy</groupId>
       <artifactId>daisy-jmsclient-api</artifactId>
-      <version>1.5-dev</version>
+      <version>${daisy.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -121,12 +114,12 @@
     <dependency>
       <groupId>daisy</groupId>
       <artifactId>daisy-htmlcleaner</artifactId>
-      <version>1.5-dev</version>
+      <version>${daisy.version}</version>
     </dependency>
     <dependency>
       <groupId>daisy</groupId>
       <artifactId>daisy-util</artifactId>
-      <version>1.5-dev</version>
+      <version>${daisy.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -141,7 +134,7 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>nekodtd</groupId>
+      <groupId>nekohtml</groupId>
       <artifactId>nekodtd</artifactId>
       <version>0.1.11</version>
       <scope>runtime</scope>
@@ -204,6 +197,8 @@
   </reporting>
 
   <properties>
+    <daisy.version>2.4.1</daisy.version>
+
     <docs.name>${project.name}</docs.name>
     <docs.version>${docs.m.maven-sitemaptags2daisy-plugin.version}</docs.version>
   </properties>
@@ -233,4 +228,5 @@
       </build>
     </profile>
   </profiles>
+
 </project>

Modified: cocoon/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/tools/pom.xml (original)
+++ cocoon/trunk/tools/pom.xml Tue Jul 10 13:55:42 2012
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
-    <version>8</version>
+    <version>10-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>cocoon-tools-modules</artifactId>

Modified: cocoon/trunk/tools/sitemaptags2daisy/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/sitemaptags2daisy/pom.xml?rev=1359672&r1=1359671&r2=1359672&view=diff
==============================================================================
--- cocoon/trunk/tools/sitemaptags2daisy/pom.xml (original)
+++ cocoon/trunk/tools/sitemaptags2daisy/pom.xml Tue Jul 10 13:55:42 2012
@@ -28,6 +28,11 @@
   <version>1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Cocoon: Documentation: tool to sync the sitemap component info to the Daisy
CMS</name>
+
+  <properties>
+    <daisy.version>2.4.1</daisy.version>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
@@ -56,20 +61,6 @@ java org.apache.cocoon.documentation.dai
       </plugin>
     </plugins>
   </build>
-  <repositories>
-    <!-- The cocoondev repository contains the needed Daisy artifacts -->
-    <repository>
-      <id>cocoondev</id>
-      <name>Cocoondev Maven Repository</name>
-      <url>http://daisycms.org/maven/maven1/deploy</url>
-      <layout>legacy</layout>
-    </repository>
-    <repository>
-      <id>maven-snapshot</id>
-      <name>Maven snapshot Repository</name>
-      <url>http://snapshots.maven.codehaus.org/maven2/</url>
-    </repository>
-  </repositories>
   <!-- Seemingly long list of dependencies, but most are runtime dependencies.
        If/when Daisy is build using maven2 itself, transitive dependencies
        will probably allow to clean up this list -->
@@ -77,34 +68,34 @@ java org.apache.cocoon.documentation.dai
     <dependency>
       <groupId>daisy</groupId>
       <artifactId>daisy-repository-api</artifactId>
-      <version>1.5-dev</version>
+      <version>${daisy.version}</version>
     </dependency>
     <dependency>
       <groupId>daisy</groupId>
       <artifactId>daisy-repository-xmlschema-bindings</artifactId>
-      <version>1.5-dev</version>
+      <version>${daisy.version}</version>
     </dependency>
     <dependency>
       <groupId>daisy</groupId>
       <artifactId>daisy-repository-client-impl</artifactId>
-      <version>1.5-dev</version>
+      <version>${daisy.version}</version>
     </dependency>
     <dependency>
       <groupId>daisy</groupId>
       <artifactId>daisy-repository-common-impl</artifactId>
-      <version>1.5-dev</version>
+      <version>${daisy.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>daisy</groupId>
       <artifactId>daisy-repository-spi</artifactId>
-      <version>1.5-dev</version>
+      <version>${daisy.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>daisy</groupId>
       <artifactId>daisy-jmsclient-api</artifactId>
-      <version>1.5-dev</version>
+      <version>${daisy.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -145,12 +136,12 @@ java org.apache.cocoon.documentation.dai
     <dependency>
       <groupId>daisy</groupId>
       <artifactId>daisy-htmlcleaner</artifactId>
-      <version>1.5-dev</version>
+      <version>${daisy.version}</version>
     </dependency>
     <dependency>
       <groupId>daisy</groupId>
       <artifactId>daisy-util</artifactId>
-      <version>1.5-dev</version>
+      <version>${daisy.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -195,4 +186,12 @@ java org.apache.cocoon.documentation.dai
       <scope>runtime</scope>
     </dependency>
   </dependencies>
+
+  <repositories>
+    <repository>
+      <id>daisy</id>
+      <url>http://daisycms.org/maven/maven2/deploy/</url>
+    </repository>
+  <repositories>
+
 </project>



Mime
View raw message