sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1504945 - in /sis/branches/JDK7: core/sis-build-helper/src/main/ant/ core/sis-build-helper/src/main/ant/prepare-branch.xml src/site/apt/index.apt src/site/apt/release-process.apt src/site/apt/release-setup.apt
Date Fri, 19 Jul 2013 17:11:34 GMT
Author: desruisseaux
Date: Fri Jul 19 17:11:33 2013
New Revision: 1504945

URL: http://svn.apache.org/r1504945
Log:
Initial draft of release-process page, derived from Suresh's page.

Added:
    sis/branches/JDK7/core/sis-build-helper/src/main/ant/
    sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-branch.xml   (with props)
    sis/branches/JDK7/src/site/apt/release-process.apt   (contents, props changed)
      - copied, changed from r1504167, sis/site/trunk/content/release-management.mdtext
Modified:
    sis/branches/JDK7/src/site/apt/index.apt
    sis/branches/JDK7/src/site/apt/release-setup.apt

Added: sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-branch.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-branch.xml?rev=1504945&view=auto
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-branch.xml (added)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-branch.xml Fri Jul 19 17:11:33
2013
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+
+<!--
+  Invoked after a branch has been created in order to update version numbers.
+  See http://builds.apache.org/job/sis-trunk/site/release-process.html
+-->
+<project name="prepare-branch" default="update-version">
+  <target name="update-version">
+    <!--
+      Ensure that the "sis-build-helper" plugin used by the build is the released version.
+      This replacement is optional since the trunk may have fixed the plugin to a stable
release.
+    -->
+    <replaceregexp file = "${user.dir}/pom.xml"
+                  match = "&lt;sis\.plugin\.version&gt;.+&lt;/sis\.plugin\.version&gt;"
+                replace = "&lt;sis.plugin.version&gt;${sis.version}-SNAPSHOT&lt;/sis.plugin.version&gt;"/>
+
+    <!--
+      Replace the version number in Java code.
+    -->
+    <replace dir="${user.dir}" failOnNoReplacements="true">
+      <include name="core/sis-utility/src/main/java/org/apache/sis/util/Version.java"/>
+      <include name="core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java"/>
+      <replacefilter token="&quot;${sis.version}-SNAPSHOT&quot;"
+                     value="&quot;${sis.version}&quot;"/>
+    </replace>
+
+    <!--
+      Replace URL to trunk by URL to the branch on Suversion.
+    -->
+    <replace dir="${user.dir}" failOnNoReplacements="true">
+      <include name="pom.xml"/>
+      <include name="core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java"/>
+      <replacefilter token="svn.apache.org/repos/asf/sis/trunk"
+                     value="svn.apache.org/repos/asf/sis/branches/${sis.version}"/>
+      <replacefilter token="svn.apache.org/viewvc/sis/trunk"
+                     value="svn.apache.org/viewvc/sis/branches/${sis.version}"/>
+    </replace>
+  </target>
+</project>

Propchange: sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-branch.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-branch.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: sis/branches/JDK7/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/src/site/apt/index.apt?rev=1504945&r1=1504944&r2=1504945&view=diff
==============================================================================
--- sis/branches/JDK7/src/site/apt/index.apt [UTF-8] (original)
+++ sis/branches/JDK7/src/site/apt/index.apt [UTF-8] Fri Jul 19 17:11:33 2013
@@ -78,6 +78,8 @@ The Apache SIS™ library
 
     * {{{http://reviews.apache.org/groups/sis/}Code review}}
 
+    * {{{./release-process.html}Release process}} (for release managers)
+
 
   Apache SIS, Apache, the Apache feather logo, and the Apache SIS project logo are trademarks
of
   The Apache Software Foundation.

Copied: sis/branches/JDK7/src/site/apt/release-process.apt (from r1504167, sis/site/trunk/content/release-management.mdtext)
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/src/site/apt/release-process.apt?p2=sis/branches/JDK7/src/site/apt/release-process.apt&p1=sis/site/trunk/content/release-management.mdtext&r1=1504167&r2=1504945&rev=1504945&view=diff
==============================================================================
--- sis/site/trunk/content/release-management.mdtext [iso-8859-1] (original)
+++ sis/branches/JDK7/src/site/apt/release-process.apt [UTF-8] Fri Jul 19 17:11:33 2013
@@ -1,256 +1,234 @@
-Title: Release Process
-Notice:    Licensed to the Apache Software Foundation (ASF) under one
-           or more contributor license agreements.  See the NOTICE file
-           distributed with this work for additional information
-           regarding copyright ownership.  The ASF licenses this file
-           to you under the Apache License, Version 2.0 (the
-           "License"); you may not use this file except in compliance
-           with the License.  You may obtain a copy of the License at
-           .
-             http://www.apache.org/licenses/LICENSE-2.0
-           .
-           Unless required by applicable law or agreed to in writing,
-           software distributed under the License is distributed on an
-           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-           KIND, either express or implied.  See the License for the
-           specific language governing permissions and limitations
-           under the License.
+~~
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements.  See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership.  The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License.  You may obtain a copy of the License at
+~~
+~~   http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied.  See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+~~
 
-Releases are crucial aspects for an apache project and following the guidelines is very important.
The [Release FAQ][release-faq] describes the foundation wide policies. The following instructions
walkthrough SIS specific release steps.
+                             -----------------------------
+                                     Release process
+                             -----------------------------
 
-<a name="release-setup"></a>
-###One time release management setup
+Release Process
 
-This section describes release management configuration steps, if you have previously configured
these steps, jump directly to [Release Process](#release-process).
+  This page describes how to create and deploy the SIS Maven artifacts, binary bundle, javadoc
and list of API changes.
+  The {{{http://www.apache.org/dev/release.html}Release FAQ}} page describes the foundation
wide policies.
+  The instructions on this page provide a summary suitable to SIS releases, together with
SIS-specific steps.
+  The intended audiences are SIS release managers.
 
-Performing a release will require:
+%{toc|fromDepth=2|toDepth=3}
 
-* Generate, sign and upload gpg key, you can follow these [gpg instructions](#gpg-key).
-* Configure Maven and get access to Nexus Repo, more [maven & nexus instructions](#maven-nexus-setup).
 
-<a name="gpg-key"></a>
-#### Generate GPG key
-The releases have to be signed by public key cryptography signatures. Detailed instructions
on why releases have to be signed are provided on [Release Signing][release-signing] page.
-The popular software used Open Pretty Good Privacy (OpenPGP) is the GPG. The [GPG instructions][gpg-keys]
list out detailed steps on managing your keys.
+* Requirements
 
-The steps can be summarized as:
+  Before to perform a release, make sure that the following conditions holds:
 
-* Generate 4096 bits RSA key pair using gpg: `gpg --gen-key`.
-* Export the public key: `gpg --list-sigs <Real Name> && gpg --armor -- export
<Real Name>`
-* Upload the public key to [SURFNET PGP][surfnet-pgp] or [MIT PGP][mit-pgp] servers.
-* Have your key signed by at least three apache commiters, [key signing][key-sign] and [Henk
Penning][henk-trust] websites provide instructions.
-* Add the signed public key to the KEYS file on [SIS Dist SVN][sis-dist-svn].
+   * A Unix shell (commands documented in this page have not been tested on Windows).
 
-For reference, the steps to sign a key:
+   * GNU GPG, Maven, Ant, Java and the Java compiler are available on the path.
 
-* The person whom you know in person provides you his key, usually this happens at key signing
party where you can verify each others ID's.
-* Fetch the key `gpg --keyserver <keyserver> --recv-keys <Key_ID>` an example
key server is pgp.mit.edu
-* Sign the key `gpg --sign-key <Key_ID>`
-* Upload the key back to the server `gpg --keyserver <keyserver> --send-key <Key_ID>`
+   * The {{{./release-setup.html}release setup}} steps have been executed once.
 
+  For all instructions in this page, <<<$OLD_VERSION>>> and <<<$NEW_VERSION>>>
stand for the version
+  number of the previous and the new release respectively. Those versions shall be set on
the command
+  line like below (Unix):
 
-<a name="maven-nexus-setup"></a>
-#### Maven Configuration & Nexus Setup
+----------------------
+export OLD_VERSION=0.3
+export NEW_VERSION=0.4
+----------------------
 
-* SIS requires Maven 3 or later to build and release
-* It is encouraged to use maven's password encryption capabilities and set the gpg password
in
-~/.m2/settings.xml. Detailed instructions are at [Publishing Maven Artifacts][maven-artificats]
-	* Make sure both the apache.snapshots.https and apache.releases.https are configured correctly.
-* Performing release will require maven to run series of commands, the heapsize has to be
increased to avoid out of memory exceptions.
-* 		Bash Shell: `export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m"`.
-* 		C Shell: `setenv MAVEN_OPTS "-Xmx1024m -XX:MaxPermSize=256m"`.
 
-<a name="release-process"></a>
-#### Release Process
 
-1. Before performing the following release steps, ensure the [Release Setup](#release-setup)
steps have been performed.
+* Update JIRA tasks and release notes.
 
-2. Ensure the source is ready for release. Verify:
-     * Cleanup JIRA so the Fix Version in issues resolved since the last release includes
this release version correctly.
-     * Ensure all open issues are resolved before proceeding further, close all resolved
issues.
-     * Test and make sure the release passes all regression tests.
-     * Update RELEASE_NOTES with all the features added.
-     	 * The release notes can be obtained from JIRA, by clicking the version, and then configuring
the release notes to display text format and copying it.
-     	 * A suggested approach would be to reorganize the release notes as New Features, then
Improvements then Tasks and Sub Tasks and finally Bug Fixes.
-     * Review and update README, INSTALL files.
-     * Commit any changes back to svn.
-     * Update website/wiki with Roadmap or Release landing pages.
+  Update {{{http://issues.apache.org/jira/browse/SIS}JIRA}} tasks and prepare release notes
as below:
 
-3. Checkout a clean copy of the trunk to release using command line svn.
-    *Do not use Eclipse to do the checkout. The extra dot (.) files created by Eclipse throws
off the rat:check processing.*
+     * Ensure that the <Fix Version> in issues resolved since the last release includes
this release version correctly.
 
-    	`svn co https://svn.apache.org/repos/asf/sis/trunk sis-trunk`
+     * Ensure that all open issues are resolved or closed before proceeding further.
 
-4. Verify the source has the required license headers before trying to release:
+     * Create a <<<src/site/resources/release-notes/$NEW_VERSION.html>>>
file with all the features added.
 
-		`mvn -P pedantic verify -DskipTests=true`
+        * Use <<<$OLD_VERSION.html>>> as a template, omitting everything
between the <<<<body>>>> and <<<</body>>>>
tags.
 
-5. Do a dry run of the release:prepare step:
+        * The release notes can be obtained from JIRA, by clicking on the <Versions>
tab, clicking on the version number,
+          and then configuring the release notes to display HTML format and copying it.
 
-		`mvn -P apache-release release:prepare -DautoVersionSubmodules=true -DdryRun=true`
+        * A suggested approach would be to reorganize the release notes as <New Features>,
+          then <Improvements>, then <Tasks> and <Sub Tasks> and finally
<Bug Fixes>.
 
-    The dry run will not commit any changes back to SVN and gives you the opportunity to
verify that the release process will complete as expected. You will be prompted for the following
information :
+     * Review and update the <<<README>>> file.
 
-      * Release version
-      * SCM release tag
-      * New development version
-      * GPG Passprhase - On a Mac if the passphrase is stored in keychain, the passphrase
is not prompted.
+     * Commit any changes back to SVN.
 
-    *If you cancel a release:prepare before it updates the pom.xml versions, then use the
release:clean goal to just remove the extra files that were created.*
+     * Update the following Wiki pages:
 
-    The Maven release plugin checks for SNAPSHOT dependencies in pom's. It will not complete
the prepare goal until all SNAPSHOT dependencies are resolved.
+        * {{{https://cwiki.apache.org/confluence/display/SIS/Roadmap}Roadmap}}
 
-6. Verify that the release process completed as expected
-    * The release plugin will create pom.xml.tag files which contain the changes that would
have been committed to SVN. The only differences between pom.xml.tag and it's corresponding
pom.xml file should be the version number.
-    * If other formatting changes have been made you should review the changes and then commit
them `svn commit -m "fixing formatting for release"`
-    * Check release.properties and make sure that the scm properties have the right version.
Sometimes the scm location can be the previous version not the next version.
-    * Verify signatures ([Verifying release signatures](#verify_signatures))
 
-7. Once any failures or required updates have been committed to svn, rollback the release
prepare files:
 
-		`mvn -P apache-release release:rollback`
+* Prepare the trunk
 
-8. Prepare the release: Run the "release:prepare" step for real this time. You'll be prompted
for the same version information.
+  Update the version numbers from <<<$NEW_VERSION>>> to the next version
in the following files.
+  Do not update <<<pom.xml>>> files yet; this will be done after the release.
 
- 		`mvn -P apache-release release:prepare -DautoVersionSubmodules=true`
-    Backup (zip or tar) your local release candidate directory in case you need to rollback
the release after the next step is performed.
+     * <<<src/site/apt/index.apt>>>
 
-9. Perform the release
-     * This step will create a maven staging repository and site for use in testing and voting.
+     * <<<src/site/apt/download.apt>>>
 
-     		`mvn release:perform -Papache-release`
+  Commit on trunk:
 
-     * 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: -Duser.name=[your_apache_uid]
--This is known to work for Linux, but not for Mac and unknown for Windows--.
+----------------------------------------------------------
+svn add src/site/resources/release-notes/$NEW_VERSION.html
+svn commit --message "Document the $NEW_VERSION release."
+----------------------------------------------------------
 
-10. Verify the Nexus release artifacts
 
-    * Verify the HTML links in site are correct
 
-    * Verify the staged artifacts in the nexus repo
-        * https://repository.apache.org/index.html
-        * Staging repositories (under Build Promotion) --> Name column --> org.apache.sis
-        * Navigate through the artifact tree and make sure that all javadoc, sources, tests,
jars, ... have .asc (GPG signature) and .md5 files. See http://people.apache.org/~henkp/repo/faq.html
and http://www.apache.org/dev/release-signing.html#openpgp-ascii-detach-sig
+* Create a branch
 
-    * Close the nexus staging repo
-        * https://repository.apache.org/index.html
-        * Staging repositories (under Build Promotion) --> Name column --> org.apache.sis
-        * Click checkbox for the open staging repo (org.apache.sis-XXX) and press Close in
the menu bar.
+  Execute the following command:
 
-11.  Sign the binary artifacts
+----------------------------------------------------------------------------------------------------------------------------------------------------------
+svn copy https://svn.apache.org/repos/asf/sis/trunk https://svn.apache.org/repos/asf/sis/branches/$NEW_VERSION
--message "Create the $NEW_VERSION branch."
+----------------------------------------------------------------------------------------------------------------------------------------------------------
 
-        * $ `cd modules/distribution/target`
-        * $ `gpg -ab apache-sis-*${project.version}*-bin.tar.gz`
-        * $ `gpg -ab apache-sis-*${project.version}*-bin.zip`
-        * $ `gpg --print-md SHA512 apache-sis-*${project.version}*-bin.tar.gz > apache-sis-*${project.version}*-bin.tar.gz.sha`
-        * $ `gpg --print-md SHA512 apache-sis-*${project.version}*-bin.zip > apache-sis-*${project.version}*-bin.zip.sha`
-        * $ `gpg --print-md MD5 apache-sis-*${project.version}*-bin.tar.gz > apache-sis-*${project.version}*-bin.tar.gz.md5`
-        * $ `gpg --print-md MD5 apache-sis-*${project.version}*-bin.zip > apache-sis-*${project.version}*-bin.zip.md5`
+  Move to a directory containing the project branches (presumed to be <<<../branches>>>
in the following command,
+  but can be replaced by anything else), then checkout a clean copy of the branch to release:
 
-12. Stage the source and binary artifacts to the dist development repository
+-----------------------------------------------------------------------
+cd ../branches
+svn checkout https://svn.apache.org/repos/asf/sis/branches/$NEW_VERSION
+cd $NEW_VERSION
+-----------------------------------------------------------------------
 
-	* Checkout SIS development dist area:
+  We need to update the Subversion URL and SIS version numbers not only in the <<<pom.xml>>>
files,
+  but also in a few Java files. The following command performs the replacement using Ant:
 
-			`svn co https://dist.apache.org/repos/dist/dev/sis sis-dev-dist`
+-----------------------------------------------------------------------------------------------
+ant -buildfile core/sis-build-helper/src/main/ant/prepare-branch.xml -Dsis.version=$NEW_VERSION
+-----------------------------------------------------------------------------------------------
 
-	* Create the directory for ${project.version} and RC{number} within it. The RC number corresponds
to the current release attempt.
-	* Copy the source and binaries into dist area.
-		* Copy the source and binaries into the development dist RC area created above.
-		* Sources and signed artificats can be downloaded from staging repo https://repository.apache.org/content/groups/staging/org/apache/sis/sis/${project.version}.
-		* Source artifacts should include sis-{project.version}-source-release.zip, sis-{project.version}-source-release.zip.asc,
sis-{project.version}-source-release.zip.sha, sis-{project.version}-source-release.zip.md5
-		* Binaries and gpg signed artificats from step 11.
-        * Verify they are downloadable from https://dist.apache.org/repos/dist/dev/sis/${project.version}/RC{number}.
+  Open the root <<<pom.xml>>> file in an editor and remove the following
sections:
 
-13. Put the release candidate up for a vote
-     1. Create a VOTE email thread on dev@ to record votes as replies, like [this](release-vote.txt)
-     2. Create a DISCUSS email thread on dev@ for any vote questions, [this](release-discuss.txt)
-     3. Perform a review of the release and cast your vote. For elaborate instructions, please
consult [Apache Release FAQ][release-faq].
+     * The whole <<<<pluginRepositories>>>> section, since it should
not be needed for releases (and is actually not allowed).
 
-     4. A -1 vote does not necessarily mean that the vote must be redone, however it is usually
a good idea to rollback the release if a -1 vote is received. See - Recovering from a vetoed
release
-     5. After the vote has been open for at least 72 hours, has at least three +1 PMC votes
and no -1 votes, then post the results to the vote thread by -
-         * reply to the initial email and prepend to the original subject "[RESULT]"
-         * Include a list of everyone who voted +1, 0 or -1.
+     * The <<<<plugin>>>> section for <<<docbkx-maven-plugin>>>,
since the DocBook directory is omitted (see below).
 
-14. Finalizing a release
+  Recursively delete the <<<src/main/docbook>>> directory (this policy
may be revised in future SIS releases).
+  We omit this directory for now because this material may move to the CMS, and no English
version is available yet.
 
-    1. The artificats in the repository are not yet mirrored and available for maven to download.
Promote the staged nexus artifacts, but releasing them.
+  In <<<core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java>>>,
consider setting
+  the <<<ENABLED>>> flag to <<<false>>>. This policy
may be revised in future SIS releases.
 
-        * https://repository.apache.org/index.html
-        * Staging repositories (under Build Promotion) --> Name column --> org.apache.sis
-        * Click checkbox of the closed staging repo (org.apache.sis-XXX) and select Release.
+  Commit the changes on the branch:
 
-    2. Checkin the source and binary artifcats into distribution svn which will be pulled
by all mirrors within 24 hours. The dist/dev svn is not mirrored, but the dist/release is.
-        * `svn copy https://dist.apache.org/repos/dist/dev/sis/${project.version}/RC{number}
https://dist.apache.org/repos/dist/release/sis/${project.version}  -m "Committing SIS Source
and Binary Release for ${project.name}-${project.version}`
+-----------------------------------------------------------------------
+svn commit --message "Prepare the branch for the $NEW_VERSION release."
+-----------------------------------------------------------------------
 
-    3. Update the staged website
 
-        *  Update the downloads page to add new version using the mirrored URLs
-        *  Modify the URL for the prior release to the archived URL for the release
+** Verify the branch content
 
-    4.  Publish the website
+  Try a dry run of the <<<release:prepare>>> goal. This goals checks for
<<<SNAPSHOT>>> dependencies in <<<pom.xml>>> files.
+  It will not complete the prepare goal until all <<<SNAPSHOT>>> dependencies
are resolved.
+  If anything goes wrong, the directory can be cleaned by running the <<<release:clean>>>
goal
+  before to fix the problem and try again.
 
-        *  WAIT 24hrs after committing releases for mirrors to replicate
-        *  Publish updates to the download page
+-----------------------------------------------------------------------------------------------------
+mvn release:prepare --define releaseVersion=$NEW_VERSION --define tag=$NEW_VERSION \\
+    --define autoVersionSubmodules=true --define updateWorkingCopyVersions=false --define
dryRun=true
+-----------------------------------------------------------------------------------------------------
 
-    5.  Delete the prior versions
+  The dry run will not commit any changes back to SVN. Instead, it will create <<<pom.xml.tag>>>
files containing
+  the changes that would have been committed to SVN. This gives us the opportunity to verify
that the release process
+  will complete as expected.
 
-        *  Navigate to the release directories checked out in the prior steps
-        *  Delete the prior release artifacts using the svn delete command
-        *  Commit the deletion
+  <<Tip:>> Maven should not prompt for any information except the GPG passphrase
+  (on MacOS, the passphrase will not be prompted if it is stored in keychain).
+  However if no GPG agent is running and if the passphrase is not in the OS keychain,
+  then Maven may prompt for the passphrase very often (many times per module).
+  For avoiding this annoyance, consider starting the <<<gpg-agent>>> daemon
like below:
 
-15. Update the JIRA versions page to close all issues, mark the version as "released", 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.
+--------------------------
+eval $(gpg-agent --daemon)
+--------------------------
 
-16. Announcing the release
+  Compare the original <<<pom.xml>>> files with the <<<pom.xml.tag>>>
ones to see if the license or any other info has been removed.
+  This has been known to happen if the starting <<<<project>>>> tag
is not on a single line.
+  The only things that should be different between these files are the <<<<version>>>>
and <<<<scm>>>> elements.
+  Comparisons can be performed for all files with the following command:
 
-       * Make a news announcement on the SIS homepage.
-       * Make an announcement about the release on the dev@sis.apache.org, users@sis.apache.org,
and announce@apache.org.
-       * Sample announce [email](release-announce.txt).
+----------------------------------------------------------
+find . -name "pom.xml" -print -exec diff '{}' '{}'.tag \\;
+----------------------------------------------------------
 
+  View the <<<release.properties>>> file and check for the following properties:
 
-####Recovering from a vetoed release
+     * <<<exec.additionalArguments>>> shall contains <<<-Papache-release>>>
+       (this profile shall be implied even if not explicitely specified on the command line).
 
-1. Reply to the initial vote email and prepend to the original subject -
+     * <<<project.scm.org.apache.sis:parent.connection>>> shall be (ignoring
escape characters)
+       <<<scm:svn:http://svn.apache.org/repos/asf/sis/branches/$NEW_VERSION>>>.
 
-     [CANCELED]
+  Verify signature for all files:
 
-3. Delete the svn tag created by the release:perform step -
+----------------------------------------------------
+find . -name "sis-*.asc" -exec gpg --verify '{}' \\;
+----------------------------------------------------
 
-       $ svn del https://svn.apache.org/repos/asf/sis/tags/${project.version} -m "deleting
tag from rolled back release"
+  Clean and ensure that there is no modified files, i.e. that the last <<<svn>>>
command produces no output:
 
-4. Revert the svn to old version `mvn -P apache-release release:rollback`
-5.
-5.  Delete the build artifacts on people & www
-     *  $ rm -rfv /www/people.apache.org/builds/sis/${project.version}
+-----------------
+mvn release:clean
+svn status
+-----------------
 
-6. Drop the nexus staging repo
-    1. https://repository.apache.org/index.html
-    2. Enterprise --> Staging
-    3. Staging tab --> Name column --> org.apache.sis
-    4. Right click on the closed staging repo (org.apache.sis-XXX) and select Drop.
 
-7. Remove the staged site
 
-8. Make the required updates that caused the vote to be canceled during the next release
cycle
+* Perform the release
 
-<a name="verify_signatures"></a>
-####Verifying release signatures
-On unix platforms and mac's download all source and binary artifacts into a new directory
and cd to the download directory.
+  Run the <<<release:prepare>>> goal for real this time. The command is
identical to the one in the
+  <Create a branch> section except for the <<<dryRun>>> property,
which is omitted.
+  This command will create the tag and commit the changes on SVN.
 
-      for file in `find . -type f -iname '*.asc'`
-      do
-          gpg --verify ${file}
-      done
+-------------------------------------------------------------------------------------
+mvn release:prepare --define releaseVersion=$NEW_VERSION --define tag=$NEW_VERSION \\
+    --define autoVersionSubmodules=true --define updateWorkingCopyVersions=false
+-------------------------------------------------------------------------------------
 
-The output will indicate the You'll need to look at the output to ensure it contains only
good signatures -
+  In theory, the next command would be <<<mvn release:perform>>>.
+  However in fact, that command only checks out the project from tag folder and then run
the <<<deploy>>> phase.
+  We need to perform those commands manually, because we need a separated <<<install>>>
phase first,
+  then a <<<site>>> phase at deploy time (even if the site is not deployed)
for proper execution of SIS custom taglets.
 
-gpg: Good signature from ...
-gpg: Signature made ...
+  First, move to a directory containing the project tags (presumed to be <<<../../tags>>>
in the following
+  command, but can be replaced by anything else), then checkout and deploy:
 
-[release-faq]: http://www.apache.org/dev/release.html
-[gpg-keys]: http://www.apache.org/dev/openpgp.html
-[release-signing]: http://www.apache.org/dev/release-signing.html
-[surfnet-pgp]: http://pgp.surfnet.nl:11371/
-[mit-pgp]: http://pgp.mit.edu/
-[key-sign]: http://www.apache.org/dev/release-signing.html#key-signing-party
-[henk-trust]: http://people.apache.org/~henkp/trust/
-[maven-artificats]: http://www.apache.org/dev/publishing-maven-artifacts.html#dev-env
-[sis-dist-svn]: https://dist.apache.org/repos/dist/release/sis/
+--------------------------------------------------
+cd ../../tags
+svn checkout https://svn.apache.org/repos/asf/sis/tags/$NEW_VERSION
+cd $NEW_VERSION
+mvn clean install --define skipTests
+mvn site deploy --activate-profiles apache-release
+--------------------------------------------------
+
+  <<Note:>> if the local OS <<<userId>>> does not match the
Apache <<<userId>>>, then the Apache one must be specified
+  by adding the following option to the last command: <<<--define user.name=[apache_userId]>>>
+
+
+
+* Verify the Nexus release artifacts

Propchange: sis/branches/JDK7/src/site/apt/release-process.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK7/src/site/apt/release-process.apt
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/branches/JDK7/src/site/apt/release-setup.apt
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/src/site/apt/release-setup.apt?rev=1504945&r1=1504944&r2=1504945&view=diff
==============================================================================
--- sis/branches/JDK7/src/site/apt/release-setup.apt [UTF-8] (original)
+++ sis/branches/JDK7/src/site/apt/release-setup.apt [UTF-8] Fri Jul 19 17:11:33 2013
@@ -30,6 +30,16 @@ One time release management setup
 %{toc|fromDepth=2|toDepth=3}
 
 
+* Shell configuration
+
+  It is better for Unix shells to contain the following line in their initialization file
+  (typically {{~/.bashrc}} or {{~/.profile}}, where {{~}} stands for the user's home directory):
+
+---------------------
+export GPG_TTY=$(tty)
+---------------------
+
+
 * Generate GPG key
 
   The releases have to be signed by public key cryptography signatures.
@@ -69,7 +79,7 @@ gpg --gen-key
 
    * Passphrase: please choose a strong one.
 
-  Verify the key information (replace _Real Name_ by the above-cited developer's name, keeping
quotes in the command below).
+  Verify the key information (replace <Real Name> by the above-cited developer's name,
keeping quotes in the command below).
   Note the key identifier, which is a value like <<<EB98E066>>>. This key
identifier will be needed for the next steps.
 
 ---------------------------
@@ -88,12 +98,12 @@ gpg --send-key <key_id>
   Generate a revocation certificate. This is not for immediate use, but generating the certificate
now
   is a safety in case the passphrase is lost. Keep the revocation certificate in a safe place.
 
-----------------------------------------------
-gpg --output revcert.asc --gen-revoke <key_id>
-----------------------------------------------
+-------------------------------------------------------------
+gpg --output revocation_certificate.asc --gen-revoke <key_id>
+-------------------------------------------------------------
 
   Have the key signed by at least three Apache commiters. This can be done by executing the
following commands on
-  the machine of the other Apache commiter, where <<<key_to_use>>> is the
identifier of the other commiter's key.
+  the machine of the other Apache commiter, where <<<<key_to_use>>>>
is the identifier of the other commiter's key.
   Those operation should preferably be done in some event where the commiters can meet face-to-face.
   The other commiter should verify that the <<<gpg --fingerprint>>> command
output matches the fingerprint of the key to sign.
 
@@ -106,7 +116,7 @@ gpg --send-key <key_id>
 
   The above-cited <Release Signing> page provides more instructions.
   Then, the signed public key shall be appended to the <<<KEYS>>> file
on
-  {{{http://dist.apache.org/repos/dist/release/sis/}}}.
+  {{http://dist.apache.org/repos/dist/release/sis/}}.
 
 
 * Maven Configuration & Nexus Setup
@@ -119,7 +129,7 @@ gpg --send-key <key_id>
 mvn --encrypt-master-password <password>
 ----------------------------------------
 
-  The command will produce an encrypted version of the given password, something like <<<{jSMOWnoPFgsHVpMvz5VrIt5kRbzGpI8u+9EF1iFQyJQ=}>>>.
+  The command will produce an encrypted version of the given password, something like <<<\{jSMOWnoPFgsHVpMvz5VrIt5kRbzGpI8u+9EF1iFQyJQ=\}>>>.
   Store this password in the <<<~/.m2/settings-security.xml>>> file like
below:
 
 +---------------------------------------------------------------+
@@ -134,7 +144,7 @@ mvn --encrypt-master-password <password>
 mvn --encrypt-password <passphrase>
 -----------------------------------
 
-  The command will produce an encrypted version of the passphrase, something like <<<{COQLCE6DU6GtcS5P=}>>>.
+  The command will produce an encrypted version of the passphrase, something like <<<\{COQLCE6DU6GtcS5P=\}>>>.
   Cut-and-paste it in a section of the <<<~/.m2/settings.xml>>> file like
below:
 
 +--------------------------------------------------------------------+



Mime
View raw message