Author: ilgrosso
Date: Wed Feb 26 10:22:22 2014
New Revision: 1571988

URL: http://svn.apache.org/r1571988
Log:
Merge from 1_1_X

Modified:
    syncope/trunk/   (props changed)
    syncope/trunk/CHANGES
    syncope/trunk/src/site/xdoc/downloads.xml
    syncope/trunk/src/site/xdoc/release-process.xml

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_1_X:r1570097-1571987

Modified: syncope/trunk/CHANGES
URL: 
http://svn.apache.org/viewvc/syncope/trunk/CHANGES?rev=1571988&r1=1571987&r2=1571988&view=diff
==============================================================================
--- syncope/trunk/CHANGES (original)
+++ syncope/trunk/CHANGES Wed Feb 26 10:22:22 2014
@@ -2,6 +2,31 @@ Apache Syncope - CHANGES
 Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
 
--------------------------------------------------------------------------------
 
+Release Notes - Syncope - Version 1.1.6
+================================================================================
+** Bug
+    * [SYNCOPE-452] - Generated project not starting in embedded mode
+    * [SYNCOPE-453] - Propagation problem with role virtual attribute mapped 
in user mapping 
+    * [SYNCOPE-454] - Update user without password specification involving 
resource with "Generate password if missing" enabled, sends password out anyway
+    * [SYNCOPE-455] - Role child implicit delete won't be propagated during 
parent delete
+    * [SYNCOPE-459] - Read-only virtual attribute cannot be added for a user 
by admin console
+    * [SYNCOPE-462] - Upgrade Spring to 3.2.7
+    * [SYNCOPE-465] - Selected items lost browsing paged results
+    * [SYNCOPE-466] - Server error when updating an existing policy to its 
global counterpart
+    * [SYNCOPE-474] - forbidden error when tried to change password
+    * [SYNCOPE-475] - After session expired, console shows split screen
+    * [SYNCOPE-476] - NPE opening Roles tab
+    * [SYNCOPE-477] - Alert popup appears through page navigation after modal 
window closing
+
+** Improvement
+    * [SYNCOPE-460] - Default datasource uses BasicDataSource
+    * [SYNCOPE-468] - Add information to what components refer to a certain 
policy
+    * [SYNCOPE-469] - Group policies and logs under configuration
+
+** Task
+    * [SYNCOPE-463] - Update notification docs after SYNCOPE-423
+    * [SYNCOPE-478] - Upgrade to Wicket 6.14.0
+
 Release Notes - Syncope - Version 1.1.5
 
================================================================================
 ** Bug
@@ -29,8 +54,6 @@ Release Notes - Syncope - Version 1.1.5
     * [SYNCOPE-448] - Provide build instructions
     * [SYNCOPE-449] - Fix support for Eclipse IDE
 
-
-
 Release Notes - Syncope - Version 1.1.4
 
================================================================================
 ** Bug

Modified: syncope/trunk/src/site/xdoc/downloads.xml
URL: 
http://svn.apache.org/viewvc/syncope/trunk/src/site/xdoc/downloads.xml?rev=1571988&r1=1571987&r2=1571988&view=diff
==============================================================================
--- syncope/trunk/src/site/xdoc/downloads.xml (original)
+++ syncope/trunk/src/site/xdoc/downloads.xml Wed Feb 26 10:22:22 2014
@@ -57,8 +57,8 @@ under the License.
     </section>
 
     <section name="Current Releases">
-      <subsection name="1.1.5 Ad libitum">
-        <p>Release date: Nov 28th, 2013</p>
+      <subsection name="1.1.6 Ad libitum">
+        <p>Release date: Feb 22nd, 2014</p>
         <p>
           <a 
href="https://cwiki.apache.org/confluence/display/SYNCOPE/Ad+libitum";>Release 
notes</a>
         </p>
@@ -72,22 +72,22 @@ under the License.
           <tbody>
             <tr>
               <td>
-                <a 
href="http://www.apache.org/dyn/closer.cgi/syncope/1.1.5/syncope-1.1.5-source-release.zip";>syncope-1.1.5-source-release.zip</a>
+                <a 
href="http://www.apache.org/dyn/closer.cgi/syncope/1.1.6/syncope-1.1.6-source-release.zip";>syncope-1.1.6-source-release.zip</a>
               </td>
               <td>
-                <a 
href="http://www.apache.org/dist/syncope/1.1.5/syncope-1.1.5-source-release.zip.asc";>asc</a>
 
-                <a 
href="http://www.apache.org/dist/syncope/1.1.5/syncope-1.1.5-source-release.zip.md5";>md5</a>
 
-                <a 
href="http://www.apache.org/dist/syncope/1.1.5/syncope-1.1.5-source-release.zip.sha1";>sha1</a>
+                <a 
href="http://www.apache.org/dist/syncope/1.1.6/syncope-1.1.6-source-release.zip.asc";>asc</a>
 
+                <a 
href="http://www.apache.org/dist/syncope/1.1.6/syncope-1.1.6-source-release.zip.md5";>md5</a>
 
+                <a 
href="http://www.apache.org/dist/syncope/1.1.6/syncope-1.1.6-source-release.zip.sha1";>sha1</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a 
href="http://www.apache.org/dyn/closer.cgi/syncope/1.1.5/syncope-standalone-1.1.5-distribution.zip";>syncope-standalone-1.1.5-distribution.zip</a>
+                <a 
href="http://www.apache.org/dyn/closer.cgi/syncope/1.1.6/syncope-standalone-1.1.6-distribution.zip";>syncope-standalone-1.1.6-distribution.zip</a>
               </td>
               <td>
-                <a 
href="http://www.apache.org/dist/syncope/1.1.5/syncope-standalone-1.1.5-distribution.zip.asc";>asc</a>
 
-                <a 
href="http://www.apache.org/dist/syncope/1.1.5/syncope-standalone-1.1.5-distribution.zip.md5";>md5</a>
 
-                <a 
href="http://www.apache.org/dist/syncope/1.1.5/syncope-standalone-1.1.5-distribution.zip.sha1";>sha1</a>
+                <a 
href="http://www.apache.org/dist/syncope/1.1.6/syncope-standalone-1.1.6-distribution.zip.asc";>asc</a>
 
+                <a 
href="http://www.apache.org/dist/syncope/1.1.6/syncope-standalone-1.1.6-distribution.zip.md5";>md5</a>
 
+                <a 
href="http://www.apache.org/dist/syncope/1.1.6/syncope-standalone-1.1.6-distribution.zip.sha1";>sha1</a>
               </td>
             </tr>
           </tbody>
@@ -122,8 +122,8 @@ under the License.
     </section>
 
     <section name="Older Releases">
-      <subsection name="1.1.4 Ad libitum">
-        <p>Release date: Sep 27th, 2013</p>
+      <subsection name="1.1.5 Ad libitum">
+        <p>Release date: Nov 28th, 2013</p>
         <p>
           <a 
href="https://cwiki.apache.org/confluence/display/SYNCOPE/Ad+libitum";>Release 
notes</a>
         </p>
@@ -137,22 +137,22 @@ under the License.
           <tbody>
             <tr>
               <td>
-                <a 
href="http://archive.apache.org/dist/syncope/1.1.4/syncope-1.1.4-source-release.zip";>syncope-1.1.4-source-release.zip</a>
+                <a 
href="http://archive.apache.org/dist/syncope/1.1.5/syncope-1.1.5-source-release.zip";>syncope-1.1.5-source-release.zip</a>
               </td>
               <td>
-                <a 
href="http://archive.apache.org/dist/syncope/1.1.4/syncope-1.1.4-source-release.zip.asc";>asc</a>
 
-                <a 
href="http://archive.apache.org/dist/syncope/1.1.4/syncope-1.1.4-source-release.zip.md5";>md5</a>
 
-                <a 
href="http://archive.apache.org/dist/syncope/1.1.4/syncope-1.1.4-source-release.zip.sha1";>sha1</a>
+                <a 
href="http://archive.apache.org/dist/syncope/1.1.5/syncope-1.1.5-source-release.zip.asc";>asc</a>
 
+                <a 
href="http://archive.apache.org/dist/syncope/1.1.5/syncope-1.1.5-source-release.zip.md5";>md5</a>
 
+                <a 
href="http://archive.apache.org/dist/syncope/1.1.5/syncope-1.1.5-source-release.zip.sha1";>sha1</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a 
href="http://archive.apache.org/dist/syncope/1.1.4/syncope-standalone-1.1.4-distribution.zip";>syncope-standalone-1.1.4-distribution.zip</a>
+                <a 
href="http://archive.apache.org/dist/syncope/1.1.5/syncope-standalone-1.1.5-distribution.zip";>syncope-standalone-1.1.5-distribution.zip</a>
               </td>
               <td>
-                <a 
href="http://archive.apache.org/dist/syncope/1.1.4/syncope-standalone-1.1.4-distribution.zip.asc";>asc</a>
 
-                <a 
href="http://archive.apache.org/dist/syncope/1.1.4/syncope-standalone-1.1.4-distribution.zip.md5";>md5</a>
 
-                <a 
href="http://archive.apache.org/dist/syncope/1.1.4/syncope-standalone-1.1.4-distribution.zip.sha1";>sha1</a>
+                <a 
href="http://archive.apache.org/dist/syncope/1.1.5/syncope-standalone-1.1.5-distribution.zip.asc";>asc</a>
 
+                <a 
href="http://archive.apache.org/dist/syncope/1.1.5/syncope-standalone-1.1.5-distribution.zip.md5";>md5</a>
 
+                <a 
href="http://archive.apache.org/dist/syncope/1.1.5/syncope-standalone-1.1.5-distribution.zip.sha1";>sha1</a>
               </td>
             </tr>
           </tbody>

Modified: syncope/trunk/src/site/xdoc/release-process.xml
URL: 
http://svn.apache.org/viewvc/syncope/trunk/src/site/xdoc/release-process.xml?rev=1571988&r1=1571987&r2=1571988&view=diff
==============================================================================
--- syncope/trunk/src/site/xdoc/release-process.xml (original)
+++ syncope/trunk/src/site/xdoc/release-process.xml Wed Feb 26 10:22:22 2014
@@ -468,6 +468,8 @@ rm <version>/syncope-*asc.asc
 svn add <version>
 svn commit -m "Promoting the voted release artifacts to dist-dev area"
 
+svn mkdir -m "Creating root dir for new release" 
https://dist.apache.org/repos/dist/release/syncope/<version>
+
 svn mv -m "Moving the voted release artifacts to dist/release (source)" \
 
https://dist.apache.org/repos/dist/dev/syncope/<version>/syncope-<version>-source-release.zip
 \
 
https://dist.apache.org/repos/dist/dev/syncope/<version>/syncope-<version>-source-release.zip.asc
 \
@@ -482,6 +484,8 @@ https://dist.apache.org/repos/dist/dev/s
 
https://dist.apache.org/repos/dist/dev/syncope/<version>/syncope-standalone-<version>-distribution.zip.sha1
 \
 https://dist.apache.org/repos/dist/release/syncope/<version>
 
+svn rm -m "Cleaning up older releases" 
https://dist.apache.org/repos/dist/dev/syncope/<version>
+
 svn co https://dist.apache.org/repos/dist/release/syncope syncope-dist-release
 cd syncope-dist-release
 svn rm <any older release artifact (if present)>


Reply via email to