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/12/08 00:16:16 UTC

svn commit: r1418550 - in /myfaces/extensions/validator/trunk: pom.xml site/pom.xml site/src/site/apt/download.apt

Author: lu4242
Date: Fri Dec  7 23:16:15 2012
New Revision: 1418550

URL: http://svn.apache.org/viewvc?rev=1418550&view=rev
Log:
update site for release 1.2.6, 2.0.6

Modified:
    myfaces/extensions/validator/trunk/pom.xml
    myfaces/extensions/validator/trunk/site/pom.xml
    myfaces/extensions/validator/trunk/site/src/site/apt/download.apt

Modified: myfaces/extensions/validator/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/pom.xml?rev=1418550&r1=1418549&r2=1418550&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/pom.xml (original)
+++ myfaces/extensions/validator/trunk/pom.xml Fri Dec  7 23:16:15 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.myfaces</groupId>
         <artifactId>myfaces</artifactId>
-        <version>9</version>
+        <version>14</version>
     </parent>
 
     <groupId>org.apache.myfaces.extensions.validator</groupId>
@@ -38,13 +38,22 @@
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk</developerConnection>
         <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk</url>
     </scm>
-
+    <!--
     <distributionManagement>
         <site>
             <id>apache.website</id>
             <url>scpexe://people.apache.org/www/myfaces.apache.org/extensions/validator12</url>
         </site>
     </distributionManagement>
+    -->
+    
+    <distributionManagement>
+      <site>
+        <id>myfaces-local-staging</id>
+        <name>Apache Website</name>
+        <url>scp://localhost/${user.home}/myfaces-site/${siteModule.path}</url>
+      </site>
+    </distributionManagement>
 
     <issueManagement>
         <system>jira</system>
@@ -63,6 +72,15 @@
     </modules>
 
     <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>
+
         <resources>
             <resource>
                 <directory>${basedir}</directory>
@@ -93,11 +111,16 @@
                 </plugin>
 
                 <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>2.2</version>
+                    <version>3.1</version>
                 </plugin>
-                
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-scm-publish-plugin</artifactId>
+                    <version>1.0-beta-1</version>
+                </plugin>
+
             </plugins>
         </pluginManagement>
 
@@ -155,7 +178,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.2</version>
+                <!--<version>2.2</version>-->
                 <executions>
                     <execution>
                         <id>verify-style</id>
@@ -171,6 +194,25 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-scm-publish-plugin</artifactId>
+                <version>1.0-beta-1</version>
+                <configuration>
+                    <pubScmUrl>${siteScmPublish.url}</pubScmUrl>
+                    <tryUpdate>true</tryUpdate>
+                    <checkoutDirectory>${scmCheckout.path}</checkoutDirectory>
+                    <content>\${siteContent.path}</content>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <configuration>
+                    <stagingRepositoryId>myfaces-local-staging</stagingRepositoryId>
+                    <stagingSiteURL>${siteDeploy.url}</stagingSiteURL>
+                </configuration>
+            </plugin>
 
             <plugin>
                 <!-- Set compile source at 1.5, since the target JSF impl is 1.2 -->
@@ -214,18 +256,22 @@
             </plugin>
             <plugin>
                 <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.1</version>
+                <version>2.3</version>
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.4.3</version>
+                <version>2.9</version>
             </plugin>
             <plugin>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.0.1</version>
+                <version>2.4</version>
             </plugin>
             <plugin>
                 <artifactId>maven-pmd-plugin</artifactId>
+                <reportSets>
+                    <reportSet />
+                </reportSets>
+                <!--
                 <version>2.3</version>
                 <configuration>
                     <rulesets>
@@ -236,7 +282,9 @@
                     <minimumTokens>100</minimumTokens>
                     <targetJdk>1.5</targetJdk>
                 </configuration>
+                -->
             </plugin>
+            <!--
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
@@ -245,7 +293,7 @@
                     <configLocation>default/myfaces-checks-standard.xml</configLocation>
                     <headerLocation>default/myfaces-header.txt</headerLocation>
                 </configuration>
-            </plugin>
+            </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-doap-plugin</artifactId>
@@ -271,5 +319,13 @@
 
     <properties>
         <jsf.version>1.2.8</jsf.version>
+        <siteModule.path>extensions/validator12</siteModule.path>
+        <site.mainDirectory>${user.home}/myfaces-site/checkout</site.mainDirectory>
+        <siteContent.path>${user.home}/myfaces-site/site/${siteModule.path}</siteContent.path>
+        <!-- it's a default location for performance reason (not checkout the content all the time)
+            you can override this value in your settings. -->
+        <scmCheckout.path>\${site.mainDirectory}/${siteModule.path}</scmCheckout.path>
+        <siteDeploy.url>file://${user.home}/myfaces-site/site/${siteModule.path}</siteDeploy.url>
+        <siteScmPublish.url>scm:svn:https://svn.apache.org/repos/asf/myfaces/site/publish/</siteScmPublish.url>
     </properties>
 </project>

Modified: myfaces/extensions/validator/trunk/site/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/site/pom.xml?rev=1418550&r1=1418549&r2=1418550&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/site/pom.xml (original)
+++ myfaces/extensions/validator/trunk/site/pom.xml Fri Dec  7 23:16:15 2012
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.myfaces</groupId>
         <artifactId>myfaces</artifactId>
-        <version>9</version>
+        <version>14</version>
     </parent>
     <groupId>org.apache.myfaces.extensions.validator</groupId>
     <artifactId>myfaces-extval-site</artifactId>
@@ -38,13 +38,48 @@
 
     <build>
         <defaultGoal>site</defaultGoal>
+        <!-- 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-alpha-5</version>
+            <version>1.0-beta-7</version>
           </extension>
         </extensions>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>3.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-scm-publish-plugin</artifactId>
+                    <version>1.0-beta-1</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-scm-publish-plugin</artifactId>
+                <version>1.0-beta-1</version>
+                <configuration>
+                    <pubScmUrl>${siteScmPublish.url}</pubScmUrl>
+                    <tryUpdate>true</tryUpdate>
+                    <checkoutDirectory>${scmCheckout.path}</checkoutDirectory>
+                    <content>\${siteContent.path}</content>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <configuration>
+                    <stagingRepositoryId>myfaces-local-staging</stagingRepositoryId>
+                    <stagingSiteURL>${siteDeploy.url}</stagingSiteURL>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
     
     <reporting>
@@ -60,13 +95,31 @@
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk/site</developerConnection>
         <url>http://svn.apache.org/viewcvs.cgi/myfaces/extensions/validator/trunk/site</url>
     </scm>
-
+<!--
     <distributionManagement>
       <site>
         <id>apache.website</id>
         <name>Apache Website</name>
         <url>scpexe://people.apache.org/www/myfaces.apache.org/extensions/validator</url>
       </site>
+    </distributionManagement>-->
+    
+    <distributionManagement>
+      <site>
+        <id>myfaces-local-staging</id>
+        <name>Apache Website</name>
+        <url>scp://localhost/${user.home}/myfaces-site/${siteModule.path}</url>
+      </site>
     </distributionManagement>
 
+    <properties>
+        <siteModule.path>extensions/validator</siteModule.path>
+        <site.mainDirectory>${user.home}/myfaces-site/checkout</site.mainDirectory>
+        <siteContent.path>${user.home}/myfaces-site/site/${siteModule.path}</siteContent.path>
+        <!-- it's a default location for performance reason (not checkout the content all the time)
+            you can override this value in your settings. -->
+        <scmCheckout.path>\${site.mainDirectory}/${siteModule.path}</scmCheckout.path>
+        <siteDeploy.url>file://${user.home}/myfaces-site/site/${siteModule.path}</siteDeploy.url>
+        <siteScmPublish.url>scm:svn:https://svn.apache.org/repos/asf/myfaces/site/publish/</siteScmPublish.url>
+    </properties>
 </project>

Modified: myfaces/extensions/validator/trunk/site/src/site/apt/download.apt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/site/src/site/apt/download.apt?rev=1418550&r1=1418549&r2=1418550&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/site/src/site/apt/download.apt (original)
+++ myfaces/extensions/validator/trunk/site/src/site/apt/download.apt Fri Dec  7 23:16:15 2012
@@ -44,17 +44,17 @@ Download Apache MyFaces Extensions Valid
 *-------------------------+---------+----------+-----------+
 | MyFaces Extensions Validator for JSF 1.1 1.1.4 Source (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/myfaces-extval-module-1.1.4-source-release.zip} myfaces-extval-module-1.1.4-source-release.zip}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-extval-module-1.1.4-source-release.zip.md5} myfaces-extval-module-1.1.4-source-release.zip.md5}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-extval-module-1.1.4-source-release.zip.asc} myfaces-extval-module-1.1.4-source-release.zip.asc}} |
 *-------------------------+---------+----------+-----------+
-| MyFaces Extensions Validator for JSF 1.2 1.2.5 (tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-extval12-1.2.5-bin.tar.gz} myfaces-extval12-1.2.5-bin.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-extval12-1.2.5-bin.tar.gz.md5} myfaces-extval12-1.2.5-bin.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-extval12-1.2.5-bin.tar.gz.asc} myfaces-extval12-1.2.5-bin.tar.gz.asc}} |
+| MyFaces Extensions Validator for JSF 1.2 1.2.6 (tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-extval12-1.2.6-bin.tar.gz} myfaces-extval12-1.2.6-bin.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-extval12-1.2.6-bin.tar.gz.md5} myfaces-extval12-1.2.6-bin.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-extval12-1.2.6-bin.tar.gz.asc} myfaces-extval12-1.2.6-bin.tar.gz.asc}} |
 *-------------------------+---------+----------+-----------+
-| MyFaces Extensions Validator for JSF 1.2 1.2.5 (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-extval12-1.2.5-bin.zip} myfaces-extval12-1.2.5-bin.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-extval12-1.2.5-bin.zip.md5} myfaces-extval12-1.2.5-bin.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-extval12-1.2.5-bin.zip.asc} myfaces-extval12-1.2.5-bin.zip.asc}} |
+| MyFaces Extensions Validator for JSF 1.2 1.2.6 (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-extval12-1.2.6-bin.zip} myfaces-extval12-1.2.6-bin.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-extval12-1.2.6-bin.zip.md5} myfaces-extval12-1.2.6-bin.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-extval12-1.2.6-bin.zip.asc} myfaces-extval12-1.2.6-bin.zip.asc}} |
 *-------------------------+---------+----------+-----------+
-| MyFaces Extensions Validator for JSF 1.2 1.2.5 Source (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/myfaces-extval-module-1.2.5-source-release.zip} myfaces-extval-module-1.2.5-source-release.zip}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-extval-module-1.2.5-source-release.zip.md5} myfaces-extval-module-1.2.5-source-release.zip.md5}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-extval-module-1.2.5-source-release.zip.asc} myfaces-extval-module-1.2.5-source-release.zip.asc}} |
+| MyFaces Extensions Validator for JSF 1.2 1.2.6 Source (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/myfaces-extval-module-1.2.6-source-release.zip} myfaces-extval-module-1.2.6-source-release.zip}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-extval-module-1.2.6-source-release.zip.md5} myfaces-extval-module-1.2.6-source-release.zip.md5}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-extval-module-1.2.6-source-release.zip.asc} myfaces-extval-module-1.2.6-source-release.zip.asc}} |
 *-------------------------+---------+----------+-----------+
-| MyFaces Extensions Validator for JSF 2.0 2.0.5 (tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-extval20-2.0.5-bin.tar.gz} myfaces-extval20-2.0.5-bin.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-extval20-2.0.5-bin.tar.gz.md5} myfaces-extval20-2.0.5-bin.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-extval20-2.0.5-bin.tar.gz.asc} myfaces-extval20-2.0.5-bin.tar.gz.asc}} |
+| MyFaces Extensions Validator for JSF 2.0 2.0.6 (tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-extval20-2.0.6-bin.tar.gz} myfaces-extval20-2.0.6-bin.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-extval20-2.0.6-bin.tar.gz.md5} myfaces-extval20-2.0.6-bin.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-extval20-2.0.6-bin.tar.gz.asc} myfaces-extval20-2.0.6-bin.tar.gz.asc}} |
 *-------------------------+---------+----------+-----------+
-| MyFaces Extensions Validator for JSF 2.0 2.0.5 (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-extval20-2.0.5-bin.zip} myfaces-extval20-2.0.5-bin.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-extval20-2.0.5-bin.zip.md5} myfaces-extval20-2.0.5-bin.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-extval20-2.0.5-bin.zip.asc} myfaces-extval20-2.0.5-bin.zip.asc}} |
+| MyFaces Extensions Validator for JSF 2.0 2.0.6 (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-extval20-2.0.6-bin.zip} myfaces-extval20-2.0.6-bin.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-extval20-2.0.6-bin.zip.md5} myfaces-extval20-2.0.6-bin.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-extval20-2.0.6-bin.zip.asc} myfaces-extval20-2.0.6-bin.zip.asc}} |
 *-------------------------+---------+----------+-----------+
-| MyFaces Extensions Validator for JSF 2.0 2.0.5 Source (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/myfaces-extval-module-2.0.5-source-release.zip} myfaces-extval-module-2.0.5-source-release.zip}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-extval-module-2.0.5-source-release.zip.md5} myfaces-extval-module-2.0.5-source-release.zip.md5}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-extval-module-2.0.5-source-release.zip.asc} myfaces-extval-module-2.0.5-source-release.zip.asc}} |
+| MyFaces Extensions Validator for JSF 2.0 2.0.6 Source (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/myfaces-extval-module-2.0.6-source-release.zip} myfaces-extval-module-2.0.6-source-release.zip}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-extval-module-2.0.6-source-release.zip.md5} myfaces-extval-module-2.0.6-source-release.zip.md5}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-extval-module-2.0.6-source-release.zip.asc} myfaces-extval-module-2.0.6-source-release.zip.asc}} |
 *-------------------------+---------+----------+-----------+
 
 Latest source code from SVN repository
@@ -92,19 +92,19 @@ Verifying signatures
 
 	  <<<
 	  % pgpk -a KEYS
-	  % pgpv myfaces-extval12-1.2.5-bin.tar.gz.asc myfaces-extval12-1.2.5-bin.tar.gz
+	  % pgpv myfaces-extval12-1.2.6-bin.tar.gz.asc myfaces-extval12-1.2.6-bin.tar.gz
 	  >>>
 
 	  <or>
 
 	  <<<
 	  % pgp -ka KEYS
-	  % pgp myfaces-extval12-1.2.5-bin.tar.gz.asc myfaces-extval12-1.2.5-bin.tar.gz
+	  % pgp myfaces-extval12-1.2.6-bin.tar.gz.asc myfaces-extval12-1.2.6-bin.tar.gz
 	  >>>
 
 	  <or>
 
 	  <<<
   	% gpg --import KEYS
-	  % gpg --verify myfaces-extval12-1.2.5-bin.tar.gz.asc myfaces-extval12-1.2.5-bin.tar.gz
+	  % gpg --verify myfaces-extval12-1.2.6-bin.tar.gz.asc myfaces-extval12-1.2.6-bin.tar.gz
 	  >>>