cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r1066741 - in /cocoon/cocoon3/trunk: cocoon-docs/src/changes/changes.xml cocoon-docs/src/site/site.xml cocoon-sax/pom.xml cocoon-sitemap/pom.xml parent/pom.xml
Date Thu, 03 Feb 2011 07:38:25 GMT
Author: reinhard
Date: Thu Feb  3 07:38:25 2011
New Revision: 1066741

URL: http://svn.apache.org/viewvc?rev=1066741&view=rev
Log:
upgrade to cocoon-jnet-1.2.0
use the release cocoon-thien-maven-site-skin
move all plugin/dependency version information to the parent POM

Modified:
    cocoon/cocoon3/trunk/cocoon-docs/src/changes/changes.xml
    cocoon/cocoon3/trunk/cocoon-docs/src/site/site.xml
    cocoon/cocoon3/trunk/cocoon-sax/pom.xml
    cocoon/cocoon3/trunk/cocoon-sitemap/pom.xml
    cocoon/cocoon3/trunk/parent/pom.xml

Modified: cocoon/cocoon3/trunk/cocoon-docs/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-docs/src/changes/changes.xml?rev=1066741&r1=1066740&r2=1066741&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-docs/src/changes/changes.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-docs/src/changes/changes.xml Thu Feb  3 07:38:25 2011
@@ -72,6 +72,10 @@
 	  </action>
 
       <action dev="reinhard" type="update">
+        [all] Upgrade to cocoon-jnet-1.2.0
+      </action>
+
+      <action dev="reinhard" type="update">
         [all] Upgrade all modules that have a dependency on Spring version 3.0.5.RELEASE
       </action>
     </release>

Modified: cocoon/cocoon3/trunk/cocoon-docs/src/site/site.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-docs/src/site/site.xml?rev=1066741&r1=1066740&r2=1066741&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-docs/src/site/site.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-docs/src/site/site.xml Thu Feb  3 07:38:25 2011
@@ -7,9 +7,9 @@
   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
@@ -22,7 +22,7 @@
   <skin>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-thien-maven-site-skin</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
   </skin>
 
   <body>

Modified: cocoon/cocoon3/trunk/cocoon-sax/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/pom.xml?rev=1066741&r1=1066740&r2=1066741&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/pom.xml Thu Feb  3 07:38:25 2011
@@ -89,7 +89,6 @@
     <dependency>
       <groupId>org.apache.bcel</groupId>
       <artifactId>bcel</artifactId>
-      <version>5.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -99,7 +98,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>javacc-maven-plugin</artifactId>
-        <version>2.6</version>
         <executions>
           <execution>
             <id>javacc</id>
@@ -113,7 +111,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.3</version>
         <executions>
           <execution>
             <id>add-source</id>
@@ -132,7 +129,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>1.1</version>
         <executions>
           <execution>
             <phase>test-compile</phase>
@@ -176,9 +172,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>javacc-maven-plugin</artifactId>
-        <version>2.6</version>
       </plugin>
     </plugins>
   </reporting>
-
 </project>

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/pom.xml?rev=1066741&r1=1066740&r2=1066741&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/pom.xml Thu Feb  3 07:38:25 2011
@@ -33,7 +33,7 @@
   <groupId>org.apache.cocoon.sitemap</groupId>
   <artifactId>cocoon-sitemap</artifactId>
   <version>3.0.0-alpha-3-SNAPSHOT</version>
-  
+
   <name>Apache Cocoon 3: Sitemap</name>
   <description>A sitemap language interpreter.</description>
 
@@ -46,7 +46,7 @@
       <groupId>org.apache.cocoon.sax</groupId>
       <artifactId>cocoon-sax</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
@@ -54,17 +54,12 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-    </dependency>    
-    
+    </dependency>
     <dependency>
       <groupId>commons-jexl</groupId>
       <artifactId>commons-jexl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>jakarta-regexp</groupId>
-      <artifactId>jakarta-regexp</artifactId>
-    </dependency>    
-    
+
     <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>

Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=1066741&r1=1066740&r2=1066741&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Thu Feb  3 07:38:25 2011
@@ -196,7 +196,7 @@
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-jnet</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
@@ -324,11 +324,6 @@
         <version>1.1.1</version>
       </dependency>
       <dependency>
-        <groupId>jakarta-regexp</groupId>
-        <artifactId>jakarta-regexp</artifactId>
-        <version>1.4</version>
-      </dependency>
-      <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>servlet-api</artifactId>
         <version>2.4</version>
@@ -528,6 +523,12 @@
         <scope>test</scope>
         <version>1.3</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.bcel</groupId>
+        <artifactId>bcel</artifactId>
+        <version>5.2</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -624,7 +625,7 @@
         <plugin>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-maven-plugin</artifactId>
-          <version>1.0.0-RC1-SNAPSHOT</version>
+          <version>1.0.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-war-plugin</artifactId>
@@ -633,7 +634,7 @@
         <plugin>
           <groupId>org.mortbay.jetty</groupId>
           <artifactId>maven-jetty-plugin</artifactId>
-          <version>6.1.7</version>
+          <version>6.1.26</version>
         </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
@@ -669,6 +670,26 @@
           <artifactId>maven-site-plugin</artifactId>
           <version>2.0-beta-5</version>
         </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>javacc-maven-plugin</artifactId>
+          <version>2.6</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>1.3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>1.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>javacc-maven-plugin</artifactId>
+          <version>2.6</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
@@ -948,7 +969,7 @@
           <dependency>
             <groupId>org.apache.cocoon</groupId>
             <artifactId>cocoon-jnet</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>1.2.1-SNAPSHOT</version>
           </dependency>
         </dependencies>
       </dependencyManagement>



Mime
View raw message