From 94cd52958be171e7ee9158b80a6fcb36f1e60ca8 Mon Sep 17 00:00:00 2001
From: Martin Muller <martin.muller@alfresco.com>
Date: Mon, 16 Apr 2018 13:16:02 +0100
Subject: [PATCH 1/4] repo-3442 make copyright dyn

---
 war/src/main/webapp/index.jsp | 53 ++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/war/src/main/webapp/index.jsp b/war/src/main/webapp/index.jsp
index 33b0b1d45..dd4cad2e8 100644
--- a/war/src/main/webapp/index.jsp
+++ b/war/src/main/webapp/index.jsp
@@ -1,28 +1,28 @@
-<%--
-  #%L
-  Alfresco Repository WAR Community
-  %%
-  Copyright (C) 2005 - 2016 Alfresco Software Limited
-  %%
-  This file is part of the Alfresco software. 
-  If the software was purchased under a paid Alfresco license, the terms of 
-  the paid license agreement will prevail.  Otherwise, the software is 
-  provided under the following open source license terms:
-  
-  Alfresco is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-  
-  Alfresco is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
-  
-  You should have received a copy of the GNU Lesser General Public License
-  along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
-  #L%
-  --%>
+<%--
+  #%L
+  Alfresco Repository WAR Community
+  %%
+  Copyright (C) 2005 - 2016 Alfresco Software Limited
+  %%
+  This file is part of the Alfresco software. 
+  If the software was purchased under a paid Alfresco license, the terms of 
+  the paid license agreement will prevail.  Otherwise, the software is 
+  provided under the following open source license terms:
+  
+  Alfresco is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+  
+  Alfresco is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Lesser General Public License for more details.
+  
+  You should have received a copy of the GNU Lesser General Public License
+  along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+  #L%
+  --%>
 
 <%@ page import="org.springframework.web.context.WebApplicationContext" %>
 <%@ page import="org.springframework.web.context.support.WebApplicationContextUtils" %>
@@ -33,6 +33,7 @@
 <%@ page import="org.alfresco.service.cmr.module.ModuleService" %>
 <%@ page import="org.alfresco.service.cmr.module.ModuleDetails" %>
 <%@ page import="org.alfresco.service.cmr.module.ModuleInstallState" %>
+<%@ page import="java.util.Calendar" %>
 
 <!-- Enterprise index-jsp placeholder -->
 <%
@@ -122,7 +123,7 @@ ModuleDetails shareServicesModule = moduleService.getModule("alfresco-share-serv
       <div class="push"></div>
    </div>
    <div class="footer">
-      Alfresco Software, Inc. &copy; 2005-2017 All rights reserved.
+       Alfresco Software, Inc. &copy; 2005-<%=Calendar.getInstance().get(Calendar.YEAR)%> All rights reserved.
    </div>
 </body>
 </html>

From 202a0752ce5e874d3f9c34f38ce33b5137a0cb7e Mon Sep 17 00:00:00 2001
From: Ancuta Morarasu <ancuta.morarasu@ness.com>
Date: Tue, 17 Apr 2018 13:05:57 +0300
Subject: [PATCH 2/4] REPO-3446: Update components (6.0.0 RC1)

---
 pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0e3632c8b..e5de67788 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,10 +63,10 @@
         <image.tag>latest</image.tag>
 
         <dependency.alfresco-core.version>7.2</dependency.alfresco-core.version>
-        <dependency.alfresco-data-model.version>8.3</dependency.alfresco-data-model.version>
-        <dependency.alfresco-repository.version>6.42</dependency.alfresco-repository.version>
-        <dependency.alfresco-remote-api.version>6.28</dependency.alfresco-remote-api.version>
-        <dependency.alfresco-hb-data-sender.version>1.0.7</dependency.alfresco-hb-data-sender.version>
+        <dependency.alfresco-data-model.version>8.5</dependency.alfresco-data-model.version>
+        <dependency.alfresco-repository.version>6.44</dependency.alfresco-repository.version>
+        <dependency.alfresco-remote-api.version>6.29</dependency.alfresco-remote-api.version>
+        <dependency.alfresco-hb-data-sender.version>1.0.8</dependency.alfresco-hb-data-sender.version>
 
         <dependency.alfresco-mmt.version>6.0</dependency.alfresco-mmt.version>
         <dependency.alfresco-pdf-renderer.version>1.1</dependency.alfresco-pdf-renderer.version>
@@ -79,8 +79,8 @@
         <dependency.fabric8.version>3.5.37</dependency.fabric8.version>
 
         <!-- Alfresco Share version -->
-        <alfresco.share.version>6.0.a</alfresco.share.version>
-        <alfresco.alfresco-share-services.version>6.0.a</alfresco.alfresco-share-services.version>
+        <alfresco.share.version>6.0.0-rc1</alfresco.share.version>
+        <alfresco.alfresco-share-services.version>6.0.0-rc1</alfresco.alfresco-share-services.version>
 
         <!-- Alfresco GoogleDocs integration version -->
         <alfresco.googledocs.version>3.1.0-RC1</alfresco.googledocs.version>

From ec47c9b2638c1524e4ac5e11164d61f0af82ce34 Mon Sep 17 00:00:00 2001
From: Stefan Kopf <stefan.kopf@alfresco.com>
Date: Tue, 17 Apr 2018 12:22:30 +0200
Subject: [PATCH 3/4] REPO-3281 - 6.0: AOS Compatibility

- update to aos-module 1.2.0-RC2
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e5de67788..9608fde79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
         <alfresco.googledocs.version>3.1.0-RC1</alfresco.googledocs.version>
 
         <!-- Alfresco Office Services Module -->
-        <alfresco.aos-module.version>1.1.7</alfresco.aos-module.version>
+        <alfresco.aos-module.version>1.2.0-RC2</alfresco.aos-module.version>
 
         <!-- Deprecated SOLR4 app, still packaged for downward compatibility -->
         <alfresco.solr4.version>6.7</alfresco.solr4.version>

From b90678c3251a8945c78cc4f5a652ad15ff2f2bf1 Mon Sep 17 00:00:00 2001
From: CodrinChirica <codrin.chirica@ness.com>
Date: Thu, 19 Apr 2018 16:19:45 +0300
Subject: [PATCH 4/4] Update alfresco-share to 6.0.a for 201804 EA

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9608fde79..a3b967fe0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,8 +79,8 @@
         <dependency.fabric8.version>3.5.37</dependency.fabric8.version>
 
         <!-- Alfresco Share version -->
-        <alfresco.share.version>6.0.0-rc1</alfresco.share.version>
-        <alfresco.alfresco-share-services.version>6.0.0-rc1</alfresco.alfresco-share-services.version>
+        <alfresco.share.version>6.0.a</alfresco.share.version>
+        <alfresco.alfresco-share-services.version>6.0.a</alfresco.alfresco-share-services.version>
 
         <!-- Alfresco GoogleDocs integration version -->
         <alfresco.googledocs.version>3.1.0-RC1</alfresco.googledocs.version>