svn commit: r1327965 - in /cocoon/trunk: parent/pom.xml site/cocoon-main-site/pom.xml site/pom.xml

Author: ilgrosso
Date: Thu Apr 19 14:31:03 2012
New Revision: 1327965

URL: http://svn.apache.org/viewvc?rev=1327965&view=rev
Log:
Updating main site generation with new parent POM and latest maven site plugin

Modified:
    cocoon/trunk/parent/pom.xml
    cocoon/trunk/site/cocoon-main-site/pom.xml
    cocoon/trunk/site/pom.xml

Modified: cocoon/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/parent/pom.xml?rev=1327965&r1=1327964&r2=1327965&view=diff
==============================================================================
--- cocoon/trunk/parent/pom.xml (original)
+++ cocoon/trunk/parent/pom.xml Thu Apr 19 14:31:03 2012
@@ -3101,7 +3101,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
-          <version>2.0-beta-5</version>
+          <version>3.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-war-plugin</artifactId>
@@ -3131,14 +3131,6 @@
       </plugins>
     </pluginManagement>
 
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-ssh-external</artifactId>
-        <version>1.0-alpha-6</version>
-      </extension>
-    </extensions>
-
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>

Modified: cocoon/trunk/site/cocoon-main-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-main-site/pom.xml?rev=1327965&r1=1327964&r2=1327965&view=diff
==============================================================================
--- cocoon/trunk/site/cocoon-main-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-main-site/pom.xml Thu Apr 19 14:31:03 2012
@@ -24,8 +24,8 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <version>9-SNAPSHOT</version>
+    <relativePath/>
   </parent>
   
   <artifactId>cocoon-main-site</artifactId>

Modified: cocoon/trunk/site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/pom.xml?rev=1327965&r1=1327964&r2=1327965&view=diff
==============================================================================
--- cocoon/trunk/site/pom.xml (original)
+++ cocoon/trunk/site/pom.xml Thu Apr 19 14:31:03 2012
@@ -61,7 +61,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-site-plugin</artifactId>
-        <version>2.0-beta-5</version>
+        <version>3.0</version>
       </plugin>
     </plugins>
   </build>