You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2012/06/21 17:05:04 UTC

svn commit: r1352556 - in /incubator/syncope/trunk: archetype/pom.xml build-tools/pom.xml client/pom.xml console/pom.xml core/pom.xml hibernate-enhancer/pom.xml parent/src/site/xdoc/release-process.xml quality/pom.xml

Author: ilgrosso
Date: Thu Jun 21 15:05:04 2012
New Revision: 1352556

URL: http://svn.apache.org/viewvc?rev=1352556&view=rev
Log:
[SYNCOPE-73] Staging site generation, promotion and rollback is now in

Modified:
    incubator/syncope/trunk/archetype/pom.xml
    incubator/syncope/trunk/build-tools/pom.xml
    incubator/syncope/trunk/client/pom.xml
    incubator/syncope/trunk/console/pom.xml
    incubator/syncope/trunk/core/pom.xml
    incubator/syncope/trunk/hibernate-enhancer/pom.xml
    incubator/syncope/trunk/parent/src/site/xdoc/release-process.xml
    incubator/syncope/trunk/quality/pom.xml

Modified: incubator/syncope/trunk/archetype/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/archetype/pom.xml?rev=1352556&r1=1352555&r2=1352556&view=diff
==============================================================================
--- incubator/syncope/trunk/archetype/pom.xml (original)
+++ incubator/syncope/trunk/archetype/pom.xml Thu Jun 21 15:05:04 2012
@@ -35,6 +35,14 @@ under the License.
   <artifactId>syncope-archetype</artifactId>
   <packaging>maven-archetype</packaging>
 
+  <distributionManagement>
+    <site>
+      <id>syncope.website</id>
+      <name>Apache Syncope website</name>
+      <url>${site.deploymentBaseUrl}/${project.artifactId}</url>
+    </site>
+  </distributionManagement>
+  
   <properties>
     <SVNRepoURL>http://svn.apache.org/repos/asf/incubator/syncope/trunk</SVNRepoURL>
   </properties>

Modified: incubator/syncope/trunk/build-tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/build-tools/pom.xml?rev=1352556&r1=1352555&r2=1352556&view=diff
==============================================================================
--- incubator/syncope/trunk/build-tools/pom.xml (original)
+++ incubator/syncope/trunk/build-tools/pom.xml Thu Jun 21 15:05:04 2012
@@ -35,6 +35,14 @@ under the License.
   <artifactId>syncope-build-tools</artifactId>
   <packaging>war</packaging>
 
+  <distributionManagement>
+    <site>
+      <id>syncope.website</id>
+      <name>Apache Syncope website</name>
+      <url>${site.deploymentBaseUrl}/${project.artifactId}</url>
+    </site>
+  </distributionManagement>
+  
   <dependencies>
     <dependency>
       <artifactId>servlet-api</artifactId>

Modified: incubator/syncope/trunk/client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/client/pom.xml?rev=1352556&r1=1352555&r2=1352556&view=diff
==============================================================================
--- incubator/syncope/trunk/client/pom.xml (original)
+++ incubator/syncope/trunk/client/pom.xml Thu Jun 21 15:05:04 2012
@@ -35,6 +35,14 @@ under the License.
   <artifactId>syncope-client</artifactId>
   <packaging>jar</packaging>
 
+  <distributionManagement>
+    <site>
+      <id>syncope.website</id>
+      <name>Apache Syncope website</name>
+      <url>${site.deploymentBaseUrl}/${project.artifactId}</url>
+    </site>
+  </distributionManagement>
+  
   <dependencies>
 
     <dependency>

Modified: incubator/syncope/trunk/console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/pom.xml?rev=1352556&r1=1352555&r2=1352556&view=diff
==============================================================================
--- incubator/syncope/trunk/console/pom.xml (original)
+++ incubator/syncope/trunk/console/pom.xml Thu Jun 21 15:05:04 2012
@@ -36,6 +36,14 @@ under the License.
   <artifactId>syncope-console</artifactId>
   <packaging>war</packaging>
 
+  <distributionManagement>
+    <site>
+      <id>syncope.website</id>
+      <name>Apache Syncope website</name>
+      <url>${site.deploymentBaseUrl}/${project.artifactId}</url>
+    </site>
+  </distributionManagement>
+  
   <dependencies>
 
     <dependency>

Modified: incubator/syncope/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/pom.xml?rev=1352556&r1=1352555&r2=1352556&view=diff
==============================================================================
--- incubator/syncope/trunk/core/pom.xml (original)
+++ incubator/syncope/trunk/core/pom.xml Thu Jun 21 15:05:04 2012
@@ -36,6 +36,14 @@ under the License.
   <artifactId>syncope-core</artifactId>
   <packaging>war</packaging>
 
+  <distributionManagement>
+    <site>
+      <id>syncope.website</id>
+      <name>Apache Syncope website</name>
+      <url>${site.deploymentBaseUrl}/${project.artifactId}</url>
+    </site>
+  </distributionManagement>
+  
   <properties>
     <jdbcdriver.groupId>com.h2database</jdbcdriver.groupId>
     <jdbcdriver.artifactId>h2</jdbcdriver.artifactId>

Modified: incubator/syncope/trunk/hibernate-enhancer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/hibernate-enhancer/pom.xml?rev=1352556&r1=1352555&r2=1352556&view=diff
==============================================================================
--- incubator/syncope/trunk/hibernate-enhancer/pom.xml (original)
+++ incubator/syncope/trunk/hibernate-enhancer/pom.xml Thu Jun 21 15:05:04 2012
@@ -34,6 +34,14 @@ under the License.
   <groupId>org.apache.syncope</groupId>
   <artifactId>syncope-hibernate-enhancer</artifactId>
 
+  <distributionManagement>
+    <site>
+      <id>syncope.website</id>
+      <name>Apache Syncope website</name>
+      <url>${site.deploymentBaseUrl}/${project.artifactId}</url>
+    </site>
+  </distributionManagement>
+  
   <dependencies>
     <dependency>
       <groupId>org.springframework</groupId>

Modified: incubator/syncope/trunk/parent/src/site/xdoc/release-process.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/parent/src/site/xdoc/release-process.xml?rev=1352556&r1=1352555&r2=1352556&view=diff
==============================================================================
--- incubator/syncope/trunk/parent/src/site/xdoc/release-process.xml (original)
+++ incubator/syncope/trunk/parent/src/site/xdoc/release-process.xml Thu Jun 21 15:05:04 2012
@@ -119,6 +119,12 @@ under the License.
             from JIRA.
           </li>
           <li>
+            Update the 
+            <a href="downloads.html">downloads</a> site page by adding the new release artifacts with base 
+            URL
+            <source>http://www.apache.org/dyn/closer.cgi/incubator/syncope/&lt;version&gt;/</source>
+          </li>
+          <li>
             Commit any changes back to svn:
             <source>svn commit -m "updating files for release"</source>
           </li>
@@ -220,61 +226,83 @@ gpg: Signature made ...</source>
             Backup (zip or tar) your local release candidate directory in case you need to rollback the release after 
             the next step is performed.
             <source>cd ..
-tar -czf 1.0-rc1.tar.gz 1.0-rc1/
-cd 1.0-rc1</source>
+tar -czf &lt;version&gt;.tar.gz &lt;version&gt;/
+cd &lt;version&gt;</source>
           </li>
         </ol>
       </subsection>
       
       <subsection name="Perform the release">
-        This step will create a maven staging repository
-        <source>mvn -P apache-release release:perform</source>
-        
         <ol>
-          <li>Verify the staged artifacts in the Nexus repository:
-            <ol>
-              <li>
-                <a href="https://repository.apache.org/index.html">https://repository.apache.org/index.html</a>
-              </li>
-              <li>
-                <strong>Enterprise --&gt; Staging</strong>
-              </li>
-              <li>
-                <strong>Staging tab --&gt; Name column --&gt; org.apache.syncope</strong>
-              </li>
-              <li>Navigate through the artifact tree and make sure that all binary, 
-                <code>javadoc</code>,
-                <code>sources</code>, and 
-                <code>tests</code> jars, as well as 
-                <code>pom</code>s, ... have 
-                <code>.asc</code> (GPG signature) and 
-                <code>.md5</code>
-                files (see 
-                <a href="http://people.apache.org/~henkp/repo/faq.html">Repository FAQ</a> and 
-                <a href="http://www.apache.org/dev/release-signing.html#openpgp-ascii-detach-sig">Detached Signatures</a>).
-                The 
-                <code>syncope-source.tar.gz</code> and 
-                <code>syncope-source.zip</code> of 
-                <code>syncope-root</code>
-                should likewise have signature and checksum files.
-              </li>
-            </ol>
+          <li>
+            This step will create the staging site
+            <source>svn checkout https://svn.apache.org/repos/asf/incubator/syncope/site/ site
+svn checkout https://svn.apache.org/repos/asf/incubator/syncope/tags/syncope-&lt;version&gt; syncope-&lt;version&gt;
+cd syncope-&lt;version&gt;
+mvn -f parent/pom.xml -P site -Dsite.deploymentBaseUrl=file:///&lt;absolute path to ../site/&lt;version&gt;&gt;
+cd ../site
+rm -r syncope-console syncope-client syncope-archetype syncope-core syncope-build-tools syncope-hibernate-enhancer syncope-quality
+svn add &lt;version&gt;
+svn commit -m "staging site for release"</source>
           </li>
-          <li>Close the nexus staging repo:
+          <li>
+            This step will create a maven staging repository
+            <source>mvn -P apache-release release:perform [-Duser.name=&lt;your_apache_uid&gt;]</source>
+        
+            <p>
+              <em>If your local OS userid doesn't match your Apache userid, then you'll have to also override the value 
+                provided by the OS to Maven for the site-deploy step to work. This is known to work for Linux, 
+                but not for Mac and unknown for Windows.
+              </em>
+            </p>
+            
             <ol>
-              <li>
-                <a href="https://repository.apache.org/index.html">https://repository.apache.org/index.html</a>
-              </li>
-              <li>
-                <strong>Enterprise --&gt; Staging</strong>
-              </li>
-              <li>
-                <strong>Staging tab --&gt; Name column --&gt; org.apache.syncope</strong>
+              <li>Verify the staged artifacts in the Nexus repository:
+                <ol>
+                  <li>
+                    <a href="https://repository.apache.org/index.html">https://repository.apache.org/index.html</a>
+                  </li>
+                  <li>
+                    <strong>Enterprise --&gt; Staging</strong>
+                  </li>
+                  <li>
+                    <strong>Staging tab --&gt; Name column --&gt; org.apache.syncope</strong>
+                  </li>
+                  <li>Navigate through the artifact tree and make sure that all binary, 
+                    <code>javadoc</code>,
+                    <code>sources</code>, and 
+                    <code>tests</code> jars, as well as 
+                    <code>pom</code>s, ... have 
+                    <code>.asc</code> (GPG signature) and 
+                    <code>.md5</code>
+                    files (see 
+                    <a href="http://people.apache.org/~henkp/repo/faq.html">Repository FAQ</a> and 
+                    <a href="http://www.apache.org/dev/release-signing.html#openpgp-ascii-detach-sig">Detached Signatures</a>).
+                    The 
+                    <code>syncope-source.tar.gz</code> and 
+                    <code>syncope-source.zip</code> of 
+                    <code>syncope-root</code>
+                    should likewise have signature and checksum files.
+                  </li>
+                </ol>
               </li>
-              <li>Right click on the open 
-                <code>org.apache.syncope-XXX</code> staging repo
-                and select 
-                <strong>Close</strong>.
+              <li>Close the nexus staging repo:
+                <ol>
+                  <li>
+                    <a href="https://repository.apache.org/index.html">https://repository.apache.org/index.html</a>
+                  </li>
+                  <li>
+                    <strong>Enterprise --&gt; Staging</strong>
+                  </li>
+                  <li>
+                    <strong>Staging tab --&gt; Name column --&gt; org.apache.syncope</strong>
+                  </li>
+                  <li>Right click on the open 
+                    <code>org.apache.syncope-XXX</code> staging repo
+                    and select 
+                    <strong>Close</strong>.
+                  </li>
+                </ol>
               </li>
             </ol>
           </li>
@@ -302,6 +330,9 @@ Source release (checksums and signatures
 https://repository.apache.org/content/repositories/orgapachesyncope-YYY/org/apache/syncope/syncope-root/&lt;version&gt;/syncope-&lt;version&gt;-source.tar.gz
 https://repository.apache.org/content/repositories/orgapachesyncope-YYY/org/apache/syncope/syncope-root/&lt;version&gt;/syncope-&lt;version&gt;-source.zip
 
+Staging site:
+http://incubator.apache.org/syncope/&lt;version&gt;/
+
 PGP release keys (signed using ABCDEFG):
 http://www.apache.org/dist/incubator/syncope/KEYS
 
@@ -385,6 +416,9 @@ Source release (checksums and signatures
 https://repository.apache.org/content/repositories/orgapachesyncope-YYY/org/apache/syncope/syncope-root/&lt;version&gt;/syncope-&lt;version&gt;-source.tar.gz
 https://repository.apache.org/content/repositories/orgapachesyncope-YYY/org/apache/syncope/syncope-root/&lt;version&gt;/syncope-&lt;version&gt;-source.zip
 
+Staging site:
+http://incubator.apache.org/syncope/&lt;version&gt;/
+
 PGP release keys (signed using ABCDEFG):
 http://www.apache.org/dist/incubator/syncope/KEYS
 
@@ -478,11 +512,6 @@ https://repository.apache.org/content/re
             wiki page based on the HTML release reports from JIRA
           </li>
           <li>
-            Update the <a href="downloads.html">downloads</a> site page to point to the new release artifacts with base 
-            URL
-            <source>http://www.apache.org/dyn/closer.cgi/incubator/syncope/&lt;version&gt;/</source>
-          </li>
-          <li>
             Update the <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Create+a+new+Syncope+project">Create
             new project</a> wiki page to point to the new release artifacts
           </li>
@@ -491,6 +520,15 @@ https://repository.apache.org/content/re
             versions</a> page to mark the version as <strong>Released</strong>, and set the date to the date that
             the release was approved. You may also need to make a new release entry for the next release.
           </li>
+          <li>
+            Promote the staging site
+            <source>
+svn co https://svn.apache.org/repos/asf/incubator/syncope/site/
+svn rm *.html apidocs css images js
+svn mv &lt;version&gt;/* .
+svn rm &lt;version&gt;
+svn commit -m "Promoting the staging site"</source>
+          </li>
         </ol>
       </subsection>
       
@@ -516,7 +554,7 @@ https://repository.apache.org/content/re
           </p>
           <ol>
             <li>
-              restore the 0.1-rc1.tar.gz and run
+              restore the &lt;version&gt;.tar.gz and run
               <source>mvn -P apache-release release:rollback</source> 
             </li>
             <li>             
@@ -529,7 +567,12 @@ https://repository.apache.org/content/re
           <p>Delete the svn tag created by the 
             <code>release:perform</code> step:
           </p>
-          <source>svn rm https://svn.apache.org/repos/asf/incubator/syncope/tags/1.0 -m "deleting tag from rolled back release"</source>
+          <source>svn rm https://svn.apache.org/repos/asf/incubator/syncope/tags/&lt;version&gt; -m "deleting tag from rolled back release"</source>
+        </li>
+        <li>
+          <p>Delete the staging site:
+          </p>
+          <source>svn rm https://svn.apache.org/repos/asf/incubator/syncope/site/&lt;version&gt; -m "deleting staging site from rolled back release"</source>
         </li>
         <li>
           <p>Drop the nexus staging repo:</p>

Modified: incubator/syncope/trunk/quality/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/quality/pom.xml?rev=1352556&r1=1352555&r2=1352556&view=diff
==============================================================================
--- incubator/syncope/trunk/quality/pom.xml (original)
+++ incubator/syncope/trunk/quality/pom.xml Thu Jun 21 15:05:04 2012
@@ -38,9 +38,9 @@ under the License.
   <!-- <SyncopeRootPOM /> -->
   <distributionManagement>
     <site>
-      <id>syncope.quality.website</id>
-      <name>Apache Syncope quality website</name>
-      <url>${site.deploymentBaseUrl}/quality</url>
+      <id>syncope.website</id>
+      <name>Apache Syncope website</name>
+      <url>${site.deploymentBaseUrl}/${project.artifactId}</url>
     </site>
   </distributionManagement>