You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2012/04/19 00:04:19 UTC
svn commit: r1327699 - in /myfaces/tomahawk/trunk: ./ core/ core/src/site/
core12/ core12/src/site/ core20/ core20/src/site/ site/ site/src/site/
site/src/site/apt/testing/
Author: lu4242
Date: Wed Apr 18 22:04:18 2012
New Revision: 1327699
URL: http://svn.apache.org/viewvc?rev=1327699&view=rev
Log:
update site to maven 3.0
Removed:
myfaces/tomahawk/trunk/site/src/site/apt/testing/hostedqa.apt
myfaces/tomahawk/trunk/site/src/site/apt/testing/selenium.apt
Modified:
myfaces/tomahawk/trunk/core/pom.xml
myfaces/tomahawk/trunk/core/src/site/site.xml
myfaces/tomahawk/trunk/core12/pom.xml
myfaces/tomahawk/trunk/core12/src/site/site.xml
myfaces/tomahawk/trunk/core20/pom.xml
myfaces/tomahawk/trunk/core20/src/site/site.xml
myfaces/tomahawk/trunk/pom.xml
myfaces/tomahawk/trunk/site/pom.xml
myfaces/tomahawk/trunk/site/src/site/site.xml
Modified: myfaces/tomahawk/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/pom.xml?rev=1327699&r1=1327698&r2=1327699&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/pom.xml (original)
+++ myfaces/tomahawk/trunk/core/pom.xml Wed Apr 18 22:04:18 2012
@@ -182,12 +182,13 @@
<artifactId>joda-time</artifactId>
<scope>test</scope>
</dependency>
-
+ <!--
<dependency>
<groupId>cactus</groupId>
<artifactId>cactus</artifactId>
<scope>test</scope>
</dependency>
+ -->
<dependency>
<groupId>org.aspectj</groupId>
@@ -557,7 +558,7 @@
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <version>2.8</version>
</plugin>
<plugin>
@@ -645,7 +646,7 @@
<plugin>
<!-- Install in the repository a "-javadoc.jar" file -->
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <version>2.8</version>
<executions>
<execution>
<id>attach-javadoc</id>
Modified: myfaces/tomahawk/trunk/core/src/site/site.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/site/site.xml?rev=1327699&r1=1327698&r2=1327699&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/site/site.xml (original)
+++ myfaces/tomahawk/trunk/core/src/site/site.xml Wed Apr 18 22:04:18 2012
@@ -44,7 +44,7 @@
</links>
<menu name="JSF Implementations" inherit="top">
- <item name="Core JSF-2.1" href="../../index.html" collapse="true">
+ <item name="Core JSF-2.1" href="../../core21/index.html" collapse="true">
<item name="dummy" href="dummy"/>
</item>
<item name="Core JSF-2.0" href="../../core20/index.html" collapse="true">
Modified: myfaces/tomahawk/trunk/core12/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core12/pom.xml?rev=1327699&r1=1327698&r2=1327699&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core12/pom.xml (original)
+++ myfaces/tomahawk/trunk/core12/pom.xml Wed Apr 18 22:04:18 2012
@@ -185,12 +185,13 @@
<artifactId>joda-time</artifactId>
<scope>test</scope>
</dependency>
-
+<!--
<dependency>
<groupId>cactus</groupId>
<artifactId>cactus</artifactId>
<scope>test</scope>
</dependency>
+ -->
<dependency>
<groupId>org.aspectj</groupId>
@@ -591,7 +592,7 @@
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <version>2.8</version>
</plugin>
<plugin>
@@ -693,7 +694,7 @@
<plugin>
<!-- Install in the repository a "-javadoc.jar" file -->
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <version>2.8</version>
<executions>
<execution>
<id>attach-javadoc</id>
Modified: myfaces/tomahawk/trunk/core12/src/site/site.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core12/src/site/site.xml?rev=1327699&r1=1327698&r2=1327699&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core12/src/site/site.xml (original)
+++ myfaces/tomahawk/trunk/core12/src/site/site.xml Wed Apr 18 22:04:18 2012
@@ -44,7 +44,7 @@
</links>
<menu name="JSF Implementations" inherit="top">
- <item name="Core JSF-2.1" href="../../index.html" collapse="true">
+ <item name="Core JSF-2.1" href="../../core21/index.html" collapse="true">
<item name="dummy" href="dummy"/>
</item>
<item name="Core JSF-2.0" href="../../core20/index.html" collapse="true">
Modified: myfaces/tomahawk/trunk/core20/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core20/pom.xml?rev=1327699&r1=1327698&r2=1327699&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core20/pom.xml (original)
+++ myfaces/tomahawk/trunk/core20/pom.xml Wed Apr 18 22:04:18 2012
@@ -177,12 +177,13 @@
<artifactId>joda-time</artifactId>
<scope>test</scope>
</dependency>
-
+<!--
<dependency>
<groupId>cactus</groupId>
<artifactId>cactus</artifactId>
<scope>test</scope>
</dependency>
+-->
<dependency>
<groupId>org.aspectj</groupId>
@@ -706,7 +707,7 @@
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <version>2.8</version>
</plugin>
<plugin>
@@ -810,7 +811,7 @@
<plugin>
<!-- Install in the repository a "-javadoc.jar" file -->
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <version>2.8</version>
<executions>
<execution>
<id>attach-javadoc</id>
Modified: myfaces/tomahawk/trunk/core20/src/site/site.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core20/src/site/site.xml?rev=1327699&r1=1327698&r2=1327699&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core20/src/site/site.xml (original)
+++ myfaces/tomahawk/trunk/core20/src/site/site.xml Wed Apr 18 22:04:18 2012
@@ -44,7 +44,7 @@
</links>
<menu name="JSF Implementations" inherit="top">
- <item name="Core JSF-2.1" href="../../index.html" collapse="true">
+ <item name="Core JSF-2.1" href="../../core21/index.html" collapse="true">
<item name="dummy" href="dummy"/>
</item>
<item name="Core JSF-2.0" href="../../core20/index.html" collapse="true">
Modified: myfaces/tomahawk/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/pom.xml?rev=1327699&r1=1327698&r2=1327699&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/pom.xml (original)
+++ myfaces/tomahawk/trunk/pom.xml Wed Apr 18 22:04:18 2012
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces</artifactId>
- <version>10</version>
+ <version>14</version>
</parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
@@ -32,6 +32,14 @@
</issueManagement>
<build>
+ <!-- Since Maven 3.0, this is required to add scpexe as protocol for deploy. -->
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>1.0-beta-7</version>
+ </extension>
+ </extensions>
<plugins>
<plugin>
<!--
Modified: myfaces/tomahawk/trunk/site/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/site/pom.xml?rev=1327699&r1=1327698&r2=1327699&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/site/pom.xml (original)
+++ myfaces/tomahawk/trunk/site/pom.xml Wed Apr 18 22:04:18 2012
@@ -30,7 +30,6 @@
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1</version>
<configuration>
<checkoutDirectoryName>tomahawk</checkoutDirectoryName>
<anonymousConnection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tomahawk/trunk</anonymousConnection>
Modified: myfaces/tomahawk/trunk/site/src/site/site.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/site/src/site/site.xml?rev=1327699&r1=1327698&r2=1327699&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/site/src/site/site.xml (original)
+++ myfaces/tomahawk/trunk/site/src/site/site.xml Wed Apr 18 22:04:18 2012
@@ -44,7 +44,7 @@
</links>
<menu name="JSF Implementations" inherit="top">
- <item name="Core JSF-2.1" href="./index.html" collapse="true">
+ <item name="Core JSF-2.1" href="../core21/index.html" collapse="true">
<item name="dummy" href="dummy"/>
</item>
<item name="Core JSF-2.0" href="../core20/index.html" collapse="true">