Author: stevel
Date: Fri Nov 14 19:37:51 2014
New Revision: 1639762

URL: http://svn.apache.org/r1639762
Log:
SLIDER-544 notes in sync with SLIDER-0.60.0-RC1

Modified:
    incubator/slider/site/trunk/content/developing/releasing.md
    incubator/slider/site/trunk/content/developing/windows.md

Modified: incubator/slider/site/trunk/content/developing/releasing.md
URL: 
http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/developing/releasing.md?rev=1639762&r1=1639761&r2=1639762&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/developing/releasing.md (original)
+++ incubator/slider/site/trunk/content/developing/releasing.md Fri Nov 14 
19:37:51 2014
@@ -59,7 +59,22 @@ create HBase and Accumulo clusters in th
 *Make sure that the integration tests are passing (and not being skipped) 
before
 starting to make a release*
 
-*2.*  Check out the latest version of `origin/master`.
+*2.* Check out the latest version of `origin/master`.
+
+*3.* If you are not building against a stable Hadoop release
+
+  1. Check out the hadoop branch you intend to build and test against —and 
include in
+     the redistributable artifacts.
+  1. Build it via `mvn clean install -DskipTests`
+  1. Note the git revision number of this build -for documentation.
+  1. Maybe: tag that revision so you can easily revert to it
+
+##### Profiles
+
+The slider POMs offer different profiles of hadoop versions to build against. 
The instructions 
+below do not choose one. If a profile is needed, append it to all the maven 
commands.
+
+e.g. {{mvn clean install -DskipTests -Prelease-2.6}}
 
 
 ## <a name="phase1"></a>Phase - I
@@ -68,19 +83,16 @@ starting to make a release*
 **Step #1:** Create a JIRA for the release, estimate 3h
 (so you don't try to skip the tests)
 
-    export SLIDER_RELEASE_JIRA=SLIDER-13927
-    
-**Step #2:** Check everything in. Git flow won't let you progress without this.
-
-**Step #3:** Git flow: create a release branch
+    export SLIDER_RELEASE_JIRA=SLIDER-544
 
-    export SLIDER_RELEASE=0.50.1-incubating
-    
-    git flow release start slider-$SLIDER_RELEASE
+**Step #2:** Check everything in. Git flow won't let you progress without this.
 
-**Step #4:** In the new branch, increment those version numbers using [the 
maven
+**Step #4:** Increment those version numbers using [the maven
 versions plugin](http://mojo.codehaus.org/versions-maven-plugin/)
 
+
+    export SLIDER_RELEASE=0.60.0-incubating
+    
     mvn versions:set -DnewVersion=$SLIDER_RELEASE
 
 
@@ -91,6 +103,11 @@ versions plugin](http://mojo.codehaus.or
     git commit -m "$SLIDER_RELEASE_JIRA updating release POMs for 
$SLIDER_RELEASE"
 
   
+**Step #3:** Create and check out a release branch
+
+    git checkout -b releases/slider-0.60
+
+
 **Step #6:** Do a final test run to make sure nothing is broken
 
 In the `slider` directory, run:
@@ -119,8 +136,8 @@ finalizing the release notes.
 
 **Step #7:** Build the release package
 
-Run
-    
+Run the `package` goal:
+
     mvn clean site:site site:stage package -DskipTests
 
 
@@ -129,7 +146,10 @@ Run
 Look in `slider-assembly/target` to find the `.tar.gz` file, and the
 expanded version of it. Inspect that expanded version to make sure that
 everything looks good -and that the versions of all the dependent artifacts
-look good too: there must be no `-SNAPSHOT` dependencies.
+look good too: there must be no `-SNAPSHOT` dependencies. [Exception, when the 
release
+is deliberately made against an unreleased version of Hadoop or other 
dependencies.
+in that situation the unreleased dependency is expected to consist of 
`-SNAPSHORT`
+artifacts]
 
 tip: the lib dir can be viewed with
 
@@ -143,7 +163,7 @@ Create a a one-line plain text release n
 and a multi-line markdown release note which will be used for artifacts.
 
 
-    Release against hadoop 2.4.1, HBase-0.98.5 and Accumulo 1.6.0 artifacts. 
+    Release against hadoop 2.6.0
 
 The multi-line release notes should go into the slider SVN repo under
 `site/trunk/content/release_notes`.
@@ -153,44 +173,32 @@ Commit the documentation changes:
 
     svn commit -m "$SLIDER_RELEASE_JIRA updating release notes for 
slider-$SLIDER_RELEASE"
 
-**Step #10:** End the git flow
+**Step #10:** Get back to the develop branch
 
-Finish the git flow release, either in a tool such as SourceTree GUI or
-the command line:
-
-    
-    git flow release finish slider-$SLIDER_RELEASE 
+    git checkout develop
 
-*tip* in the CLI this asks for the message 3x times; copy the release text to
-paste in.
-   
 
 You will now be back on the `develop` branch.
 
-**Step #11:** update mvn versions
+
+**Step #11:** update maven versions
 
 Switch back to `develop` and update its version number past
 the release number
 
 
-    export SLIDER_DEV=0.51.0-incubating-SNAPSHOT
+    export SLIDER_DEV=0.61.0-incubating-SNAPSHOT
     mvn versions:set -DnewVersion=$SLIDER_DEV
     git commit -a -m "$SLIDER_RELEASE_JIRA updating development POMs to 
$SLIDER_DEV"
 
 **Step #12:** Push the release and develop branches to github 
 
-    git push origin master develop 
+    git push origin develop releases/slider-0.60
 
 (assuming that `origin` maps to 
`https://git-wip-us.apache.org/repos/asf/incubator-slider.git`;
  you can check this with `git remote -v`
 
 
-The `git-flow` program automatically pushes up the 
`release/slider-$SLIDER_RELEASE` branch,
-before deleting it locally.
-
-If you are planning on any release work of more than a single test run,
-consider having your local release branch track the master.
-
 **Step #13:** Finish the JIRA
 
 Log the time, close the issue. This should normally be the end of a 
@@ -203,9 +211,9 @@ Check out the develop branch and purge a
     git checkout develop
     git pull origin
     mvn clean
-    
+
 *At this point you are ready for Apache release from master.*
-    
+
 
 ## <a name="phase2"></a>Phase - II
 
@@ -217,54 +225,54 @@ Get a clean enlistment.
     cd release
     git clone https://git-wip-us.apache.org/repos/asf/incubator-slider.git 
slider-$SLIDER_RELEASE
     cd slider-$SLIDER_RELEASE
-    
+
 **Step 2**
 
 Ensure you are in the *master* branch and it's clean. Beware that the git 
clean command will remove any unknown files to Git in your current repository.
 
-    git checkout master
+    git checkout releases/slider-0.60
+    git pull origin
     git clean -fxd
-    
+
 **Step 3**
 
 Ensure the rat check is clean.
-    
-    mvn clean apache-rat:check
-    
+
+    mvn clean apache-rat:check -Prat
+
 **Step 4**
 
 Tag for the release. Start with RC0 and move to RC1, RC2 if you need to 
restart the release process for this version.
 
-    git tag -a release-$SLIDER_RELEASE-rc0 -m 'Slider $SLIDER_RELEASE-RC0'
+    git tag -a release-$SLIDER_RELEASE-rc1 -m 'Slider $SLIDER_RELEASE-RC1'
     git push --tags origin
    
 **Step 5**
 
 Create the release source tarball.
 
-    mvn clean install -DskipTests -Papache-release
-    
-You should find a *.tar.gz at target folder (e.g. 
./target/apache-slider-$SLIDER_RELEASE-source-release.tar.gz and .zip)
+    mvn clean install -DskipTests -Papache-release -Prat
+
+You should find a `*.tar.gz` at target folder (e.g. 
`./target/apache-slider-$SLIDER_RELEASE-source-release.tar.gz` and `.zip`)
 Rename it with *incubator* in the name.
 
     cd target
     rm rat.txt
     rm -rf archive-tmp
 
-    #    mv apache-slider-$SLIDER_RELEASE-source-release.tar.gz 
apache-slider-$SLIDER_RELEASE-source-release.tar.gz
-    
+
 **Step 6**
 
 Sign the tarball
 
     export ASF_USER=stevel
-
+    
     gpg2  --armor  --default-key [email protected] -v --output 
apache-slider-$SLIDER_RELEASE-source-release.tar.gz.asc --detach-sig 
apache-slider-$SLIDER_RELEASE-source-release.tar.gz
     gpg2  --armor  --default-key [email protected] -v  --output 
apache-slider-$SLIDER_RELEASE-source-release.zip.asc --detach-sig 
apache-slider-$SLIDER_RELEASE-source-release.zip
-    
+
 **Step 7**
 
-Generate MD5 checksums. *md5sum* and *sha1sum* or *gpg* are also both capable 
of creating checksum files.
+Generate MD5 checksums. *md5sum* and *sha1sum* or *gpg* are all capable of 
creating checksum files.
 
     openssl md5 apache-slider-$SLIDER_RELEASE-source-release.tar.gz > 
apache-slider-$SLIDER_RELEASE-source-release.tar.gz.md5
     openssl sha1 apache-slider-$SLIDER_RELEASE-source-release.tar.gz > 
apache-slider-$SLIDER_RELEASE-source-release.tar.gz.sha
@@ -282,14 +290,19 @@ or
 **Step 8**
 
 Upload the artifacts to your apache home:
-    
+
 The artifacts then need to be copied over to 
~/public_html/slider-release-$SLIDER_RELEASE-rc0
   
     cd ..
-    mv target slider-release-$SLIDER_RELEASE-rc0
+    mv target slider-release-$SLIDER_RELEASE-rc1
     
-    scp -r slider-release-$SLIDER_RELEASE-rc0 people.apache.org:public_html
-  
+    scp -r slider-release-$SLIDER_RELEASE-rc1 
[email protected]:public_html/slider/
+
+(if you don't get the authentication for the copy, go to 
https://id.apache.org/ and add your ssh keys to your profile)
+
+The entire directory should now be uploaded, check it:
+
+    echo http://people.apache.org/~$ASF_USER/slider
 
 **Step 9**
 
@@ -307,12 +320,13 @@ Call for a release VOTE to the dev maili
 
 To build the URLs, echo them then verify in your browser that they are present
 
-    echo "artifacts at 
http://people.apache.org/~$ASF_USER/slider-release-$SLIDER_RELEASE-rc0";
+    echo "artifacts at 
http://people.apache.org/~$ASF_USER/slider/slider-release-$SLIDER_RELEASE-rc1";
 
     echo "source at 
https://git-wip-us.apache.org/repos/asf?p=incubator-slider.git;a=shortlog;h=refs/tags/release-$SLIDER_RELEASE-rc0";
 
     echo "PGP keys at 
http://pgp.mit.edu:11371/pks/lookup?op=vindex&[email protected]";
 
+    echo  [VOTE] Apache Slider Incubating Release $SLIDER_RELEASE RC0
 Sample:
 
 
@@ -373,8 +387,8 @@ Sample:
 Verify your PGP key is provided to Apache. 
 
 Apache verifies that distributions are correctly signed.
-Login to https://id.apache.org and verify the fingerprint of PGP key used to 
sign above is provided. (gpg --fingerprint)
-Upload your PGP public key only to /home/$ASF_USER/.pgpkey
+Login to [https://id.apache.org](https://id.apache.org) and verify the 
fingerprint of PGP key used to sign above is provided. (`gpg --fingerprint`)
+Upload your PGP public key only to `/home/$ASF_USER/.pgpkey`
 
     scp public-key.asc people.apache.org:.pgpkey
 
@@ -400,7 +414,7 @@ Create the release tag:
     On branch master
     git tag -a $SLIDER_RELEASE -m 'Slider $SLIDER_RELEASE'
     git push --tags origin
-    
+
 **Step 15**
 
 Update the Slider website as needed. Most of the documents would have been 
updated by now to reflect the released version. *The remaining changes should 
really be modifying the references to the latest release to the new version.*
@@ -411,11 +425,11 @@ Verify the download links at [Slider Pag
 
 **Step 16**
 
-Send an anouncement:
+Send an announcement:
 
 The bits published in **Step 13** may take up to 24 hours to replicate to the 
mirrors.
 
-Send an [email protected] to the dev and user aliases after the bits have 
replicated.
+Send an announcement to the dev and user aliases after the bits have 
replicated.
 
 Sample:
 
@@ -478,7 +492,8 @@ the actual development version.
 
 1. reset the versions
 
-    mvn versions:set -DnewVersion=$SLIDER_DEV
-    git commit -a -m "$SLIDER_RELEASE_JIRA reverting development POMs to 
$SLIDER_DEV"
-    
+        mvn versions:set -DnewVersion=$SLIDER_DEV
+        git commit -a -m "$SLIDER_RELEASE_JIRA reverting development POMs to 
$SLIDER_DEV"
+
+
  1. Continue the release process from step 12.
\ No newline at end of file

Modified: incubator/slider/site/trunk/content/developing/windows.md
URL: 
http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/developing/windows.md?rev=1639762&r1=1639761&r2=1639762&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/developing/windows.md (original)
+++ incubator/slider/site/trunk/content/developing/windows.md Fri Nov 14 
19:37:51 2014
@@ -55,8 +55,8 @@ is "private", then edit the firewall to 
    (even with this installed, you will still be mostly working from the windows
     command prompt on the machine, as it has the env variables set up)
 1. Git
-1. Java 7
-1. Python 2,7
+1. Java 7+
+1. Python 2.7
 1. OpenSSL
 1. Everything Hadoop's `BUILDING.TXT` needs. This includes the cygwin tools, 
protoc,
 python and more. If you cannot build Hadoop from the `Windows SDK Command 
Prompt`
@@ -89,7 +89,7 @@ Their `tcpview` tool is ideal for seeing
 1. Get the cygwin64 bin dir on the PATH (remember, ";" as separators)
 1. find where the `CL` C/C++ compiler is and make sure it is on the PATH
 1. get the (native) [CMake 2.8+](http://www.cmake.org/) command on the path, 
-not the cygwin one.
+not any cygwin one.
 
 
 Things to install in cygwin
@@ -170,7 +170,9 @@ dialog.
 
 From a Windows SDK command prompt:
 
-    set HADOOP_VERSION=2.6.0-SNAPSHOT
+    set HADOOP_VERSION=2.6.0
+    
+    set HADOOP_VERSION=2.7.0-SNPSHOT
 
 or
 
@@ -191,9 +193,8 @@ exception)
     rm -rf c:\bin\hadoop
     cp -r hadoop-%HADOOP_VERSION% c:\bin\hadoop
     popd 
-   
  
-    
+
  Hadoop is now installed into `c:\bin\%HADOOP_VERSION%`
  
  Set up the env variables by hand
@@ -209,5 +210,5 @@ Verify that the binaries are there
      
      hadoop checknative -a
           
- This should report the hadoop binaries, even if it warns about missing
- compression libraries
\ No newline at end of file
+This should report the hadoop binaries, even if it warns about missing
+compression libraries
\ No newline at end of file


Reply via email to