cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r538705 - in /cocoon/trunk: ./ core/ core/cocoon-configuration/cocoon-configuration-api/ core/cocoon-configuration/cocoon-spring-configurator/ core/cocoon-core/ core/cocoon-pipeline/cocoon-pipeline-components/ core/cocoon-pipeline/cocoon-pi...
Date Wed, 16 May 2007 20:08:47 GMT
Author: reinhard
Date: Wed May 16 13:08:45 2007
New Revision: 538705

URL: http://svn.apache.org/viewvc?view=rev&rev=538705
Log:
fix versions after release

Modified:
    cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml
    cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/pom.xml
    cocoon/trunk/core/cocoon-core/pom.xml
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/pom.xml
    cocoon/trunk/core/cocoon-webapp/pom.xml
    cocoon/trunk/core/pom.xml
    cocoon/trunk/pom.xml
    cocoon/trunk/tools/pom.xml

Modified: cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml?view=diff&rev=538705&r1=538704&r2=538705
==============================================================================
--- cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml Wed May 16 13:08:45
2007
@@ -26,7 +26,7 @@
   <packaging>jar</packaging>
   
   <parent>
-    <artifactId>cocoon-core-modules</artifactId>
+    <artifactId>cocoon</artifactId>
     <groupId>org.apache.cocoon</groupId>
     <version>4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>

Modified: cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/pom.xml?view=diff&rev=538705&r1=538704&r2=538705
==============================================================================
--- cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/pom.xml (original)
+++ cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/pom.xml Wed May 16 13:08:45
2007
@@ -26,7 +26,7 @@
   <packaging>jar</packaging>
 
   <parent>
-    <artifactId>cocoon-core-modules</artifactId>
+    <artifactId>cocoon</artifactId>
     <groupId>org.apache.cocoon</groupId>
     <version>4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>

Modified: cocoon/trunk/core/cocoon-core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/pom.xml?view=diff&rev=538705&r1=538704&r2=538705
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Wed May 16 13:08:45 2007
@@ -128,12 +128,10 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      <version>1.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-configuration-api</artifactId>
-      <version>1.0.0</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?view=diff&rev=538705&r1=538704&r2=538705
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml Wed May 16 13:08:45
2007
@@ -7,7 +7,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cocoon-pipeline-components</artifactId>
-  <version> 1.0.0-RC2-SNAPSHOT</version>
+  <version>1.0.0-RC2-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Cocoon Pipeline Components</name>
   <description>
@@ -35,7 +35,6 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-configuration-api</artifactId>
-      <version>1.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml?view=diff&rev=538705&r1=538704&r2=538705
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml Wed May 16 13:08:45 2007
@@ -8,7 +8,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cocoon-pipeline-impl</artifactId>
-  <version> 1.0.0-RC2-SNAPSHOT</version>
+  <version>1.0.0-RC2-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Cocoon Pipeline Implementation</name>
   <description>
@@ -56,7 +56,6 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-configuration-api</artifactId>
-      <version>1.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

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?view=diff&rev=538705&r1=538704&r2=538705
==============================================================================
--- 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 Wed
May 16 13:08:45 2007
@@ -24,7 +24,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>cocoon-core-modules</artifactId>
+    <artifactId>cocoon</artifactId>
     <groupId>org.apache.cocoon</groupId>
     <version>4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/pom.xml?view=diff&rev=538705&r1=538704&r2=538705
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/pom.xml (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/pom.xml Wed May
16 13:08:45 2007
@@ -24,7 +24,7 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>cocoon-core-modules</artifactId>
+    <artifactId>cocoon</artifactId>
     <groupId>org.apache.cocoon</groupId>
     <version>4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>

Modified: cocoon/trunk/core/cocoon-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/pom.xml?view=diff&rev=538705&r1=538704&r2=538705
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/pom.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/pom.xml Wed May 16 13:08:45 2007
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>
-    <version>4-SNAPSHOT</version>
+    <version>5-SNAPSHOT</version>
   </parent>
   <artifactId>cocoon-webapp</artifactId>
   <version>2.2.0-M2-SNAPSHOT</version>

Modified: cocoon/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/pom.xml?view=diff&rev=538705&r1=538704&r2=538705
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Wed May 16 13:08:45 2007
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
-    <version>4</version>
+    <version>4-SNAPSHOT</version>
   </parent>
   <artifactId>cocoon-core-modules</artifactId>
   <version>5-SNAPSHOT</version>
@@ -79,7 +79,7 @@
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/trunk/core</developerConnection>
     <url>https://svn.apache.org/repos/asf/cocoon/trunk/core</url>
   </scm>
-  
+
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -193,7 +193,7 @@
           </plugin> 
         </plugins>
       </build>      
-    </profile>
+    </profile>   
   </profiles>  
   
 </project>

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?view=diff&rev=538705&r1=538704&r2=538705
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Wed May 16 13:08:45 2007
@@ -33,7 +33,7 @@
 
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon</artifactId>
-  <version>5-SNAPSHOT</version>
+  <version>4-SNAPSHOT</version>
   <name>Apache Cocoon</name>
   <inceptionYear>1999</inceptionYear>
   <url>http://cocoon.apache.org</url>
@@ -47,6 +47,9 @@
     <!-- sub projects -->
     <module>core/cocoon-configuration/cocoon-configuration-api</module>
     <module>core/cocoon-configuration/cocoon-spring-configurator</module>
+    <module>core/cocoon-servlet-service/cocoon-servlet-service-components</module>
+    <module>core/cocoon-servlet-service/cocoon-servlet-service-impl</module>
   
+    <module>core/cocoon-servlet-service/cocoon-servlet-service-sample</module>
       
   </modules>
 
   <repositories>
@@ -767,12 +770,12 @@
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-core</artifactId>
-        <version>2.2.0-RC1-SNAPSHOT</version>
+        <version>2.2.0-RC2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-core</artifactId>
-        <version>2.2.0-RC1-SNAPSHOT</version>
+        <version>2.2.0-RC2-SNAPSHOT</version>
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
@@ -944,22 +947,22 @@
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-pipeline-api</artifactId>
-        <version>1.0.0-RC1-SNAPSHOT</version>
+        <version>1.0.0-RC2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-pipeline-components</artifactId>
-        <version>1.0.0-RC1-SNAPSHOT</version>
+        <version>1.0.0-RC2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-pipeline-impl</artifactId>
-        <version>1.0.0-RC1-SNAPSHOT</version>
+        <version>1.0.0-RC2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-pipeline-impl</artifactId>
-        <version>1.0.0-RC1-SNAPSHOT</version>
+        <version>1.0.0-RC2-SNAPSHOT</version>
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
@@ -1076,17 +1079,17 @@
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-sitemap-api</artifactId>
-        <version>1.0.0-RC1-SNAPSHOT</version>
+        <version>1.0.0-RC2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-sitemap-components</artifactId>
-        <version>1.0.0-RC1-SNAPSHOT</version>
+        <version>1.0.0-RC2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-sitemap-impl</artifactId>
-        <version>1.0.0-RC1-SNAPSHOT</version>
+        <version>1.0.0-RC2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
@@ -1106,7 +1109,7 @@
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-store-impl</artifactId>
-        <version>1.0.0-RC1-SNAPSHOT</version>
+        <version>1.0.0-RC2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
@@ -1131,12 +1134,12 @@
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-thread-api</artifactId>
-        <version>1.0.0-RC1-SNAPSHOT</version>
+        <version>1.0.0-RC2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-thread-impl</artifactId>
-        <version>1.0.0-RC1-SNAPSHOT</version>
+        <version>1.0.0-RC2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
@@ -1146,7 +1149,7 @@
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-util</artifactId>
-        <version>1.0.0-RC1-SNAPSHOT</version>
+        <version>1.0.0-RC2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
@@ -1182,12 +1185,12 @@
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-xml-api</artifactId>
-        <version>1.0.0-RC1-SNAPSHOT</version>
+        <version>1.0.0-RC2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-xml-impl</artifactId>
-        <version>1.0.0-RC1-SNAPSHOT</version>
+        <version>1.0.0-RC2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
@@ -1197,7 +1200,7 @@
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-xml-resolver</artifactId>
-        <version>1.0.0-RC1-SNAPSHOT</version>
+        <version>1.0.0-RC2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
@@ -2302,8 +2305,8 @@
       </modules>
       <repositories>  
         <repository>
-          <id>cocoon.dev</id>
-          <url>http://people.apache.org/~reinhard/m2-daisy-staging-repository/</url>
+          <id>cocoon-dev.org</id>
+          <url>http://cocoondev.org/repository2</url>
           <releases>
             <enabled>true</enabled>
           </releases>
@@ -2314,8 +2317,8 @@
       </repositories>
       <pluginRepositories>
         <pluginRepository>
-          <id>cocoon.dev</id>
-          <url>http://people.apache.org/~reinhard/m2-daisy-staging-repository/</url>
+          <id>cocoon-dev.org</id>
+          <url>http://cocoondev.org/repository2</url>
           <releases>
             <enabled>true</enabled>
           </releases>

Modified: cocoon/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/pom.xml?view=diff&rev=538705&r1=538704&r2=538705
==============================================================================
--- cocoon/trunk/tools/pom.xml (original)
+++ cocoon/trunk/tools/pom.xml Wed May 16 13:08:45 2007
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
-    <version>4</version>
+    <version>4-SNAPSHOT</version>
   </parent>
   <artifactId>cocoon-tools-modules</artifactId>
   <version>4-SNAPSHOT</version>



Mime
View raw message