svn commit: r1540528 - in /river/jtsk/branches/2.2: ./ common.xml roll_release.sh

[gtrasuk]

Author: gtrasuk
Date: Sun Nov 10 19:47:49 2013
New Revision: 1540528

URL: http://svn.apache.org/r1540528
Log:
Merge back changes from 2.2.2 tags.

Modified:
    river/jtsk/branches/2.2/   (props changed)
    river/jtsk/branches/2.2/common.xml
    river/jtsk/branches/2.2/roll_release.sh

Propchange: river/jtsk/branches/2.2/
------------------------------------------------------------------------------
  Merged /river/jtsk/tags/2.2.2:r1539670-1540527

Modified: river/jtsk/branches/2.2/common.xml
URL: 
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/common.xml?rev=1540528&r1=1540527&r2=1540528&view=diff
==============================================================================
--- river/jtsk/branches/2.2/common.xml (original)
+++ river/jtsk/branches/2.2/common.xml Sun Nov 10 19:47:49 2013
@@ -25,7 +25,7 @@
     <property file="${root}/build.properties" />
 
     <!-- Product version info -->
-    <property name="version" value="2.2.1"/>
+    <property name="version" value="2.2.2"/>
     <property name="product.name" value="apache-river-${version}"/>
     <property name="product.title" value="Apache River v${version}"/>
 
@@ -80,7 +80,7 @@
     <!-- Standard javadoc options and settings -->
     <property name="jdk.doc.url" 
value="http://java.sun.com/j2se/1.4.2/docs/api"/>
     <property name="jdk.packages" location="${root}/${src-doc}/j2se"/>
-    <property name="api.copyright" value="Copyright 2007-2010, multiple 
authors.&lt;br&gt;Licensed under the &lt;a 
href=&quot;http://www.apache.org/licenses/LICENSE-2.0&quot; 
target=&quot;child&quot; &gt;Apache License, Version 2.0&lt;/a&gt;, see the 
&lt;a href=&quot;{@docRoot}/doc-files/NOTICE&quot; target=&quot;child&quot; 
&gt;NOTICE&lt;/a&gt; file for attributions."/>
+    <property name="api.copyright" value="Copyright 2007-2013, multiple 
authors.&lt;br&gt;Licensed under the &lt;a 
href=&quot;http://www.apache.org/licenses/LICENSE-2.0&quot; 
target=&quot;child&quot; &gt;Apache License, Version 2.0&lt;/a&gt;, see the 
&lt;a href=&quot;{@docRoot}/doc-files/NOTICE&quot; target=&quot;child&quot; 
&gt;NOTICE&lt;/a&gt; file for attributions."/>
 
     <!--## Private package inclusions for use with classdep; the
         ## classes in these packages are both not part of the JSK

Modified: river/jtsk/branches/2.2/roll_release.sh
URL: 
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/roll_release.sh?rev=1540528&r1=1540527&r2=1540528&view=diff
==============================================================================
--- river/jtsk/branches/2.2/roll_release.sh (original)
+++ river/jtsk/branches/2.2/roll_release.sh Sun Nov 10 19:47:49 2013
@@ -108,7 +108,7 @@ function confirm_continue {
        [[ 'n' = $CONTINUE || 'N' = $CONTINUE ]] && echo $QUIT_MSG
 }
 
-VERSION=2.2.1
+VERSION=2.2.2
 SRC_DIR=$(pwd)
 RAT_HOME=$HOME/java_libs/apache-rat-0.8
 
@@ -124,8 +124,16 @@ confirm_continue "Please Update repo sta
 ant release
 
 test_tar_release
+
+cd $SRC_DIR
 test_zip_release
 
+cd $SRC_DIR
 sign_all
+
+cd $SRC_DIR
 rat_report
-upload_all gtra...@people.apache.org:~/public_html/river/2.2.1-rc2
+
+cd $SRC_DIR
+upload_all gtra...@people.apache.org:~/public_html/river/$VERSION
+