Author: tv
Date: Wed Sep 25 08:14:30 2013
New Revision: 1526129

URL: http://svn.apache.org/r1526129
Log:
Update Turbine Parent POM to version 3

Modified:
    turbine/site/pom.xml
    turbine/site/src/site/site.xml

Modified: turbine/site/pom.xml
URL: 
http://svn.apache.org/viewvc/turbine/site/pom.xml?rev=1526129&r1=1526128&r2=1526129&view=diff
==============================================================================
--- turbine/site/pom.xml (original)
+++ turbine/site/pom.xml Wed Sep 25 08:14:30 2013
@@ -22,14 +22,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache</groupId>
-    <artifactId>apache</artifactId>
-    <version>7</version>
+       <artifactId>turbine-parent</artifactId>
+       <groupId>org.apache.turbine</groupId>
+       <version>3</version>
   </parent>
 
-  <groupId>turbine-site</groupId>
+  <groupId>org.apache.turbine</groupId>
   <artifactId>turbine-site</artifactId>
-  <version>1.0</version>
+  <version>4.0</version>
+  <packaging>pom</packaging>
   <name>Turbine</name>
   <description>Turbine is a servlet based framework that allows experienced 
Java developers
     to quickly build secure web applications. Parts of Turbine can also be used
@@ -158,10 +159,65 @@
       <url>scpexe://people.apache.org/www/turbine.apache.org/</url>
     </site>
   </distributionManagement>
+  
+  <build>
+    <plugins>
+      <plugin> <!-- Thanks to Apache Commons -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-scm-publish-plugin</artifactId>
+        <version>1.0-beta-2</version>
+        <configuration>
+          <content>${project.reporting.outputDirectory}</content>
+          <pubScmUrl>scm:svn:${turbine.scmPubUrl}</pubScmUrl>
+          
<checkoutDirectory>${turbine.scmPubCheckoutDirectory}</checkoutDirectory>
+          <tryUpdate>true</tryUpdate>
+          <skipDeletedFiles>true</skipDeletedFiles>
+          <ignorePathsToDelete>
+            <ignorePathToDelete>dtd**</ignorePathToDelete>
+            <ignorePathToDelete>fulcrum**</ignorePathToDelete>
+            <ignorePathToDelete>meta**</ignorePathToDelete>
+            <ignorePathToDelete>stratum**</ignorePathToDelete>
+            <ignorePathToDelete>tdk**</ignorePathToDelete>
+            <ignorePathToDelete>turbine**</ignorePathToDelete>
+          </ignorePathsToDelete>
+        </configuration>
+        <executions>
+          <execution>
+            <id>scm-publish</id>
+            <phase>site-deploy</phase><!-- deploy site with 
maven-scm-publish-plugin -->
+            <goals>
+              <goal>publish-scm</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
   <reporting>
     <plugins>
       <plugin>
-        <artifactId>maven-changelog-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>project-team</report>
+              <report>mailing-list</report>
+              <report>cim</report>
+              <report>issue-tracking</report>
+              <report>license</report>
+              <report>scm</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+        <version>${turbine.surefire.version}</version>
+        <configuration>
+         <skipSurefireReport>true</skipSurefireReport>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-changes-plugin</artifactId>
@@ -171,4 +227,10 @@
       </plugin>
     </plugins>
   </reporting>
+  
+  <properties>
+    <turbine.site.path></turbine.site.path>
+    
<turbine.scmPubCheckoutDirectory>${turbine.site.cache}/site</turbine.scmPubCheckoutDirectory>
+  </properties>
+
 </project>

Modified: turbine/site/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/turbine/site/src/site/site.xml?rev=1526129&r1=1526128&r2=1526129&view=diff
==============================================================================
--- turbine/site/src/site/site.xml (original)
+++ turbine/site/src/site/site.xml Wed Sep 25 08:14:30 2013
@@ -95,14 +95,5 @@
         <item name="Developer Links"       
href="/common/developer-links.html"/>
         <item name="Improving Documentation"          
href="/common/documentation.html"/>
     </menu>
-
-    <menu name="Apache">
-        <item name="Apache Website"     href="http://www.apache.org/"/>
-        <item name="License"            href="http://www.apache.org/licenses/"; 
/>
-        <item name="How the ASF works"  
href="http://www.apache.org/foundation/how-it-works.html"/>
-        <item name="Sponsorship"        
href="http://www.apache.org/foundation/sponsorship.html"; />
-        <item name="Thanks"             
href="http://www.apache.org/foundation/thanks.html"; />
-        <item name="Security"           href="http://www.apache.org/security/"; 
/>
-    </menu>
     </body>
 </project>


Reply via email to