From c4a3f9f01da7f25443ea89cc674043e25666f891 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Fri, 30 Sep 2016 15:25:51 +0000 Subject: [PATCH 1/9] Merged 5.2.N (5.2.1) to HEAD (5.2) 131121 amukha: ALF-21229: Installer: "View Readme File" option displays information-less file - changed the README to point to new community site git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@131122 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- src/main/resources/README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/README.txt b/src/main/resources/README.txt index aadb302f1d..36c16cd016 100644 --- a/src/main/resources/README.txt +++ b/src/main/resources/README.txt @@ -3,6 +3,6 @@ Alfresco Community ${project.version} For Enterprise subscribers, refer to http://support.alfresco.com for release notes and detailed information on this release. -For Community members, refer to the Alfresco wiki for more information on this release. +For users of Alfresco Community Edition, more information on this release is available at https://community.alfresco.com/community/ecm. From c0d09725bcf67e4c58b8b0f228c9dd7dbc536f01 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 3 Nov 2016 13:26:09 +0000 Subject: [PATCH 2/9] Merged 5.2.N (5.2.1) to HEAD (5.2) 130784 amukha: REPO-1006: Move Alfresco 'data-model' to Git - removed project files - changed the dependencies git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132180 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 607715f197..a2d2042822 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ org.alfresco alfresco-data-model - ${project.version} + ${dependency.alfresco-data-model.version} org.alfresco From 00c391da608790d31dbb1458b2c91b254a6f35f0 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 3 Nov 2016 13:46:48 +0000 Subject: [PATCH 3/9] Merged 5.2.N (5.2.1) to HEAD (5.2) 131286 amukha: Merged DEV to 5.2.N (5.2.1) 131050 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate 131057 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate / fix test CMISTest.testModelAvailability 131064 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate - added patch to remove JBPM database tables 131169 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate - replaced generic DB script with database specific scripts 131171 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate - Fix DB2 patch 131213 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate - Fix JBPM table removal patch git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- src/main/resources/licenses/notice.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/resources/licenses/notice.txt b/src/main/resources/licenses/notice.txt index 080f88dd72..d17c62b227 100644 --- a/src/main/resources/licenses/notice.txt +++ b/src/main/resources/licenses/notice.txt @@ -225,7 +225,6 @@ libwmf http://wvware.sourceforge.net/libwmf.html === LGPL 2.1 === Hibernate http://www.hibernate.org/ -JBPM http://jbpm.org/ jid3lib http://javamusictag.sourceforge.net/ JMagick http://sourceforge.net/projects/jmagick/ JODConverter http://jodconverter.sourceforge.net/ @@ -312,7 +311,6 @@ TrueLicense http://truelicense.java.net/ === LGPL 2.1 === Hibernate http://www.hibernate.org/ -JBPM http://jbpm.org/ JODConverter http://jodconverter.sourceforge.net/ PDF Renderer http://java.net/projects/pdf-renderer TinyMCE http://www.tinymce.com/ From d9d09913d31ee334619ea5022b7531db9a54c795 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 6 Dec 2016 17:24:19 +0000 Subject: [PATCH 4/9] Merged 5.2.0 (5.2.0) to HEAD (5.2) 133327 amukha: Merged 5.2.N (5.2.1) to 5.2.0 (5.2.0) 133305 amukha: REPO-1658: ACE-5627: GPL components that were removed in 5.1 are still listed in "notice.txt" file - Removed the unused components. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@133411 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- src/main/resources/licenses/notice.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/resources/licenses/notice.txt b/src/main/resources/licenses/notice.txt index d17c62b227..6f34014ade 100644 --- a/src/main/resources/licenses/notice.txt +++ b/src/main/resources/licenses/notice.txt @@ -196,10 +196,6 @@ truezip http://truezip.java.net/ === GPL V2 === GhostScript http://www.ghostscript.com/ -ncurses http://www.gnu.org/software/ncurses/ -libiconv http://www.gnu.org/software/libiconv/ -libstdc++ http://gcc.gnu.org/libstdc++/ -LibreOffice Portable http://portableapps.com/apps/office/libreoffice_portable === ICU License === From e48595542e0b5e3f3f378afafa1be25bdd245710 Mon Sep 17 00:00:00 2001 From: Alexandru Epure Date: Tue, 31 Jan 2017 09:14:02 +0000 Subject: [PATCH 5/9] Merged 5.2.N (5.2.1) to HEAD (5.2) 134835 aepure: ACE-5761: References to Activiti need altering in "notice.txt" - Update Activiti license text git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134837 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- src/main/resources/licenses/notice.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/licenses/notice.txt b/src/main/resources/licenses/notice.txt index 6f34014ade..490d0293f2 100644 --- a/src/main/resources/licenses/notice.txt +++ b/src/main/resources/licenses/notice.txt @@ -11,8 +11,8 @@ Below is the list of licenses and modules used under corresponding licenses, === Apache 2.0 License ==== acegi http://sourceforge.net/projects/acegisecurity/ ActiveMQ http://activemq.apache.org/ -Activiti http://activiti.org/ -Activiti webapp explorer http://activiti.org/ +Activiti: If shipped or included with the commercial version of Alfresco software, the Activiti component is licensed under the terms of the associated Alfresco Master Services Agreement; If shipped or included with the open-source Community version of Alfresco software, then it will be governed by the Apache open source license specified at http://activiti.org/ +Activiti Webapp Explorer: If shipped or included with the commercial version of Alfresco software, the Activiti component is licensed under the terms of the associated Alfresco Master Services Agreement; If shipped or included with the open-source Community version of Alfresco software, then it will be governed by the Apache open source license specified at http://activiti.org/ Alfresco OpenCMIS Extension http://code.google.com/a/apache-extras.org/p/alfresco-opencmis-extension/ Apache Mime http://james.apache.org/mime4j/index.html Apache Avalon http://excalibur.apache.org/ From c994ffca62a9575968a4b5468498716029052373 Mon Sep 17 00:00:00 2001 From: Andrei Rebegea Date: Thu, 15 Jun 2017 11:08:51 +0000 Subject: [PATCH 6/9] Merged 5.2.N (5.2.2) to HEAD (5.2) 136791 skopf: Merged REPO-2057 (5.2.1) to 5.2.N (5.2.1) 136674 anechifor: Remove GhostScript from the code base (installer, Admin Console et al.) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137513 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- src/main/resources/licenses/notice.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/resources/licenses/notice.txt b/src/main/resources/licenses/notice.txt index 490d0293f2..fe80943fca 100644 --- a/src/main/resources/licenses/notice.txt +++ b/src/main/resources/licenses/notice.txt @@ -194,10 +194,6 @@ TrueLicense http://truelicense.java.net/ truezip http://truezip.java.net/ -=== GPL V2 === -GhostScript http://www.ghostscript.com/ - - === ICU License === icu4j http://icu-project.org/ From 8ebeecd2738027b5870146156e185378771a0e7e Mon Sep 17 00:00:00 2001 From: Andrei Rebegea Date: Thu, 15 Jun 2017 11:09:09 +0000 Subject: [PATCH 7/9] Merged 5.2.N (5.2.2) to HEAD (5.2) 136794 skopf: Merged REPO-2057 (5.2.1) to 5.2.N (5.2.1) 136775 skopf: REPO-2057 - GS Replacement: Remove GhostScript from the code base (installer, Admin Console et al.) Remove Ghostscript license git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137516 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../licenses/3rd-party/ghostscript.txt | 53 ------------------- 1 file changed, 53 deletions(-) delete mode 100644 src/main/resources/licenses/3rd-party/ghostscript.txt diff --git a/src/main/resources/licenses/3rd-party/ghostscript.txt b/src/main/resources/licenses/3rd-party/ghostscript.txt deleted file mode 100644 index 8cf7175d97..0000000000 --- a/src/main/resources/licenses/3rd-party/ghostscript.txt +++ /dev/null @@ -1,53 +0,0 @@ - - The files in the base, psi, lib, toolbin, examples, doc and man - directories (folders) and any subdirectories (sub-folders) - thereof are part of GPL Ghostscript. - - The files in the Resource directory and any subdirectories thereof - are also part of GPL Ghostscript, with the explicit exception of - the files in the CMap subdirectory. The CMap files are copyright - Adobe Systems Incorporated and covered by a separate license - which permits only verbatim distribution. - - GPL Ghostscript is free software; you can redistribute it and/or - modify it under the terms of version 2 of the GNU General Public - License as published by the Free Software Foundation. - - GPL Ghostscript 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program so you can know your rights and responsibilities. - It should be in a file named doc/COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place Suite 330, Boston, MA - 02111-1307, USA. - - --- - - GPL Ghostscript contains an implementation of techniques covered - by US Patents 5,055,942 and 5,917,614, and corresponding - international patents. These patents are licensed for use with - GPL Ghostscript under the following grant: - - Whereas, Raph Levien (hereinafter "Inventor") has obtained patent - protection for related technology (hereinafter "Patented - Technology"), Inventor wishes to aid the the GNU free software - project in achieving its goals, and Inventor also wishes to - increase public awareness of Patented Technology, Inventor hereby - grants a fully paid up, nonexclusive, royalty free license to - practice the patents listed below ("the Patents") if and only if - practiced in conjunction with software distributed under the - terms of any version of the GNU General Public License as - published by the Free Software Foundation, 59 Temple Place, Suite - 330, Boston, MA 02111. Inventor reserves all other rights, - including without limitation, licensing for software not - distributed under the GNU General Public License. - - 5055942 Photographic image reproduction device using digital - halftoning to screen images allowing adjustable coarseness - - 5917614 Method and apparatus for error diffusion screening of - images with improved smoothness in highlight and shadow - regions From e7a9acad80b27f7eff0b3cc9d68b7bcdb49aa85f Mon Sep 17 00:00:00 2001 From: Andrei Rebegea Date: Thu, 15 Jun 2017 11:21:29 +0000 Subject: [PATCH 8/9] Merged 5.2.N (5.2.2) to HEAD (5.2) 137104 skopf: Merged REPO-2054 (5.2.1) to 5.2.N (5.2.1) 136918 anechifor: pdf-renderer licence git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../3rd-party/alfresco-pdf-renderer.txt | 27 +++++++++++++++++++ src/main/resources/licenses/notice.txt | 4 +++ 2 files changed, 31 insertions(+) create mode 100644 src/main/resources/licenses/3rd-party/alfresco-pdf-renderer.txt diff --git a/src/main/resources/licenses/3rd-party/alfresco-pdf-renderer.txt b/src/main/resources/licenses/3rd-party/alfresco-pdf-renderer.txt new file mode 100644 index 0000000000..8b4ed6dddf --- /dev/null +++ b/src/main/resources/licenses/3rd-party/alfresco-pdf-renderer.txt @@ -0,0 +1,27 @@ +// Copyright 2014 PDFium Authors. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/main/resources/licenses/notice.txt b/src/main/resources/licenses/notice.txt index fe80943fca..5926a551c8 100644 --- a/src/main/resources/licenses/notice.txt +++ b/src/main/resources/licenses/notice.txt @@ -297,6 +297,7 @@ xercesImpl http://xerces.apache.org/xerces2-j === BSD-like License === FreeMarker http://freemarker.sourceforge.net/ +Pdfium https://pdfium.googlesource.com/pdfium/ === Eclipse Public License 1.0 === TrueLicense http://truelicense.java.net/ @@ -312,3 +313,6 @@ Jut.jar http://www.openoffice.org/licenses/lgpl_license.html === Mozilla Public License 2.0 === rhino-js http://www.mozilla.org/rhino/ + + + From c5b830a652b210a6c3c7e979d26d15a6f00b306a Mon Sep 17 00:00:00 2001 From: Andrei Rebegea Date: Thu, 15 Jun 2017 11:21:35 +0000 Subject: [PATCH 9/9] Merged 5.2.N (5.2.2) to HEAD (5.2) 137105 skopf: Merged REPO-2054 (5.2.1) to 5.2.N (5.2.1) 136926 skopf: REPO-2053 - GS Replacement: Build Rasterizer binaries for all platforms (if required) - Renamed alfresco-pdf-renderer.txt to pdfium.txt git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137620 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../licenses/3rd-party/{alfresco-pdf-renderer.txt => pdfium.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/licenses/3rd-party/{alfresco-pdf-renderer.txt => pdfium.txt} (100%) diff --git a/src/main/resources/licenses/3rd-party/alfresco-pdf-renderer.txt b/src/main/resources/licenses/3rd-party/pdfium.txt similarity index 100% rename from src/main/resources/licenses/3rd-party/alfresco-pdf-renderer.txt rename to src/main/resources/licenses/3rd-party/pdfium.txt