inteligr8/acs-community-packaging
1
0
Fork 0
mirror of https://github.com/Alfresco/acs-community-packaging.git synced 2026-09-16 18:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Alfresco/acs-community-packaging

Browse Source
This commit is contained in:
Andrei Rebegea
2018-04-19 16:51:37 +03:00
parent d3e889a14b b90678c325
commit 1d20992ecb
2 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+5 -5
View File
@@ -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>
@@ -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>
war/src/main/webapp/index.jsp
+27 -26
View File
@@ -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>