From cbec33e726b6b3f2adeffd4b6c95b4249f55b1e9 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Tue, 27 Jan 2015 23:03:18 +0000
Subject: [PATCH] Prepare 4.6.0 release

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2331 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 build.xml                           |  2 +-
 pom.xml                             |  2 +-
 releasenotes.txt                    | 47 +++++++++++++++++++++++++++++
 src/contribs/rpm/SPECS/davmail.spec |  4 +--
 src/site/xdoc/roadmap.xml           |  3 +-
 5 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 2006b14f..c941131a 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
 <project name="DavMail" default="dist" basedir=".">
     <property file="user.properties"/>
-    <property name="version" value="4.5.1"/>
+    <property name="version" value="4.6.0"/>
 
     <path id="classpath">
         <pathelement location="classes"/>
diff --git a/pom.xml b/pom.xml
index bea6c7aa..373db2f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>davmail</groupId>
     <artifactId>davmail</artifactId>
     <packaging>jar</packaging>
-    <version>4.5.1</version>
+    <version>4.6.0</version>
     <name>DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway</name>
     <organization>
         <name>Mickaël Guessant</name>
diff --git a/releasenotes.txt b/releasenotes.txt
index 46502382..4006a945 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -1,3 +1,50 @@
+** DavMail 4.6.0 released **
+Bugfix release with many IMAP enhancements over EWS, implement batch move items,
+also includes a brand new generic OSX package to handle new OSX java behaviour.
+
+OSX:
+- OSX: refactor OSX package based on universalJavaApplicationStub
+- Replace Java application stub with https://github.com/tofi86/universalJavaApplicationStub/blob/master/src/universalJavaApplicationStub
+
+Doc:
+- Doc: update OSX setup documentation
+- Doc: additional Linux instructions for Ubuntu 14
+- Fix #31 A typo in davmail.properties example
+
+EWS:
+- EWS: improve main calendar folder test
+- EWS: fix batch move
+- EWS: Adjust paged search for folders
+- EWS: implement batch move items
+- EWS: improve folder paged search
+- Prepare batch move implementation
+- EWS: force NTLM in direct EWS mode
+- EWS: implement batch move method
+- EWS: switch to GetMethod to check endpoint
+- EWS: take paging into account in appendSubFolders
+- EWS: fix ErrorExceededFindCountLimit on FindFolder requests
+- EWS: avoid NullPointerException in fixAttendees
+
+Linux:
+- Allow Java 8 and default jre in debian package
+
+IMAP:
+- IMAP: fix 587 log and skip broken messages
+
+Caldav
+- Caldav: fix #98 Support of Contacts in CardDav REPORT 
+- Fix #35 duplicates in updated reoccurring events 
+
+Enhancements
+- Fix potential CVE-2014-3566 vulnerability
+- From audit: remove throws statement
+- Adjust KerberosHelper logging message
+- Fix for #534 Kerberos Authentication doesn't seem to be work cross domain
+
+LDAP:
+- LDAP: reset icon after search
+
+
 ** DavMail 4.5.1 released **
 Bugfix release to fix Exchange 2013 regressions and wrong Europe/London timezone mapping.
 
diff --git a/src/contribs/rpm/SPECS/davmail.spec b/src/contribs/rpm/SPECS/davmail.spec
index 136d5fa8..6d1ec68d 100644
--- a/src/contribs/rpm/SPECS/davmail.spec
+++ b/src/contribs/rpm/SPECS/davmail.spec
@@ -2,8 +2,8 @@
 %{?!davmail_uid:   %define davmail_uid   213}
 %{?!davmail_gid:   %define davmail_gid   213}
 
-%{?!davrel:   %define davrel   4.5.1}
-%{?!davsvn:   %define davsvn   2303}
+%{?!davrel:   %define davrel   4.6.0}
+%{?!davsvn:   %define davsvn   2331}
 %define davver %{davrel}-%{davsvn}
 %ifarch i386 i586 i686
 %define davarch x86
diff --git a/src/site/xdoc/roadmap.xml b/src/site/xdoc/roadmap.xml
index 23cb2dd6..434a9525 100644
--- a/src/site/xdoc/roadmap.xml
+++ b/src/site/xdoc/roadmap.xml
@@ -15,7 +15,7 @@
                 for improvement. The following section lists the expected new features
                 and enhancements in next DavMail versions.
             </p>
-            <subsection name="4.5">
+            <subsection name="4.7">
                 <p>
                     <strong>Next minor release</strong>
                 </p>
@@ -31,6 +31,7 @@
                     <strong>Future version</strong>
                 </p>
                 <ul>
+                    <li>Improve EWS Caldav implementation</li>
                     <li>Implement Caldav attachments</li>
                     <li>Implement ActiveSync backend</li>
                     <li>Implement EWS frontend for Exchange 2003 backend and Outlook 2011</li>