Commit Graph

4227 Commits

Author SHA1 Message Date
alfresco-build
ba5289da85 [maven-release-plugin] prepare for next development iteration 2017-07-30 14:38:46 +01:00
alfresco-build
9a9e7b6e01 [maven-release-plugin] prepare release alfresco-content-repository-6.0 2017-07-30 14:38:41 +01:00
Alex Mukha
84021c8ab1 REPO-2724 Add gitignore 2017-07-30 14:19:18 +01:00
Alex Mukha
349e7eac12 REPO-2724 Fix pom after split 2017-07-30 14:18:32 +01:00
Alex Mukha
aee80c0bcc REPO-2724 Apply default maven layout 2017-07-30 14:17:45 +01:00
Ray Gauss
c53c97f56b Merge branch 'fix/MNT-18318_Googledocs_3.0.4.1' into 'develop'
MNT-18318: alfresco.war contains duplicate libraries

See merge request !2
2017-07-14 20:03:00 +01:00
Jared Ottley
9d7fcee68f MNT-18318: alfresco.war contains duplicate libraries
-Upgrade to Googledocs 3.0.4.1 which no longer provides duplicate libraries
2017-07-14 12:55:31 -06:00
Stefan Kopf
c44d9c927a REPO-2659: Service Pack: alfresco-pdf-renderer must be included in distribution zip 2017-07-14 15:01:41 +02:00
Derek Hulley
01b3dbabf9 Merge branch 'fix/REPO-2636_Remove_OSX_Installer' into 'develop'
REPO-2636 Remove the OSX installer

See merge request !1
2017-07-14 10:46:58 +01:00
Derek Hulley
72ebd7af60 Merge branch 'fix/REPO-2636_Remove_OSX_Installer' into 'develop'
REPO-2636 Remove the OSX installer

See merge request !1
2017-07-14 10:46:58 +01:00
Ancuta Morarasu
b395efe3b9 REPO-2346: Create develop branch from 5.2.N and change version to 5.3-SNAPSHOT 2017-07-13 15:39:27 +03:00
Ancuta Morarasu
1412c18ad6 REPO-2346: Create develop branch from 5.2.N and change version to 5.3-SNAPSHOT 2017-07-13 15:39:27 +03:00
Ancuta Morarasu
285c23cf13 REPO-2346: Create develop branch from 5.2.N and change version to 5.3-SNAPSHOT 2017-07-13 15:39:27 +03:00
Ancuta Morarasu
9bf0af277e REPO-2346: Create develop branch from 5.2.N and change version to 5.3-SNAPSHOT 2017-07-13 15:39:27 +03:00
Ancuta Morarasu
955f51ebab REPO-2346: Create develop branch from 5.2.N and change version to 5.3-SNAPSHOT 2017-07-13 15:39:27 +03:00
Alex Mukha
2f9ecabb6a REPO-2636 Update versions to latest 2017-07-13 10:54:40 +01:00
Alex Mukha
1f1ca66a6b REPO-2636 Remove the OSX installer 2017-07-13 10:35:58 +01:00
Alex Mukha
5453f96b66 REPO-2463 Disable win32 dependencies 2017-07-13 10:30:18 +01:00
Alex Mukha
26b2bb7786 REPO-2636 Remove the OSX installer 2017-07-11 16:59:41 +01:00
Alex Mukha
b9afa3ab06 REPO-2636 Remove the OSX installer 2017-07-11 16:59:41 +01:00
Nebil Kisa
f29833b881 Revert "Create tag for Alfresco Full Installer Community-201707"
This reverts commit 1ccff87042.

Revert back to state prior tag creation for next community release
2017-07-11 12:36:28 +02:00
Nebil Kisa
1ccff87042 Create tag for Alfresco Full Installer Community-201707 2017-07-11 12:34:14 +02:00
Nebil Kisa
653c68280a Revert "Create tag for Alfresco Full Installer Community-201706"
This reverts commit 5ebe52500d.

Reset to 5.2-SNAPSHOT
2017-06-29 10:16:28 +01:00
Nebil Kisa
5ebe52500d Create tag for Alfresco Full Installer Community-201706 2017-06-29 10:11:43 +01:00
Nebil Kisa
d8cfcdd50f Revert "Create tag for Alfresco Full Installer Community-201706"
This reverts commit a8a30ec6f5.

Reset to 5.2-SNAPSHOT
2017-06-28 17:17:15 +01:00
Nebil Kisa
a8a30ec6f5 Create tag for Alfresco Full Installer Community-201706 2017-06-28 16:58:49 +01:00
NESS\P3700526
ec95913328 REPO-2535 : Community 201706: Stack upgrades
- Upgrade alfresco common installer to version 2017/06/16
      - Update to latest version of Tomcat(7.0.78), PostgreSQL(9.4.12), Java(1.8.0_131)
2017-06-26 11:34:22 +03:00
Ancuta Morarasu
de9eacf998 Fix *community* full-installer builds after adding the alfresco-pdf-renderer. 2017-06-17 19:07:37 +01:00
Ancuta Morarasu
e55ac9440f Fix *community* full-installer builds after adding the alfresco-pdf-renderer. 2017-06-17 20:41:24 +03:00
Ancuta Morarasu
99e8c2283d REPO-2352: Added .gitignore 2017-06-17 17:57:31 +01:00
Martin Muller
1657b8f5da REPO-2481 Updated AOS artifacts for installer to 1.1.6 2017-06-16 12:44:38 +03:00
Alex Mukha
d9bc8d27e6 REPO-2463 Disable win32 dependencies 2017-06-16 12:44:18 +03:00
Ancuta Morarasu
06bf4f0ac6 REPO-2352: Added .gitignore 2017-06-16 12:42:56 +03:00
Stefan Kopf
97759203d1 Fix full-installer builds after adding the alfresco-pdf-renderer to the platform installer 2017-06-16 12:42:34 +03:00
Stefan Kopf
bade8c17fc Fix full-installer builds after adding the alfresco-pdf-renderer to the platform installer 2017-06-16 12:42:24 +03:00
Martin Muller
502c1c3d57 GOOGLEDOCS-394 googledocs upgrade to 3.0.4 2017-06-16 12:42:06 +03:00
Alex Mukha
a86c4c1de3 REPO-2483 Change ear artefact name 2017-06-16 12:41:12 +03:00
Alex Mukha
3acb5c9cf4 REPO-2485 Update version of common libs 2017-06-16 12:40:51 +03:00
Matt Ward
ae3761b2ed MNT-17200: update ImageMagick to 7.0.5
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@136063 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-16 12:38:43 +03:00
Alan Davis
624618daa8 Merged HEAD (5.2) to 5.2.N (5.2.2) (RECORD ONLY):
130397,130443,132419,132425,132567,132653-132654,132661-132685,132688,132692-132694,132709,
    132711-132712,132714,132723-132726,133002-133012,133249,133358-133411,133432,133563,133595,
    133762,133855,134029,134173-134200,134202-134211,134270,134302,134317,134837,134895-134896,
    134969-134988,134995,135081,135119,135778,136876,136905,137301-137420,137428-137657,137659
    The two branches should now be the same except for the version numbers and any commits on
    5.2.N after r137427

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137665 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-16 08:33:50 +00:00
Alan Davis
4e2bc7ae66 Merged HEAD (5.2) to 5.2.N (5.2.2) (RECORD ONLY):
130397,130443,132419,132425,132567,132653-132654,132661-132685,132688,132692-132694,132709,
    132711-132712,132714,132723-132726,133002-133012,133249,133358-133411,133432,133563,133595,
    133762,133855,134029,134173-134200,134202-134211,134270,134302,134317,134837,134895-134896,
    134969-134988,134995,135081,135119,135778,136876,136905,137301-137420,137428-137657,137659
    The two branches should now be the same except for the version numbers and any commits on
    5.2.N after r137427

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137665 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-16 08:33:50 +00:00
Alan Davis
038e87cfb1 Merged HEAD (5.2) to 5.2.N (5.2.2) (RECORD ONLY):
130397,130443,132419,132425,132567,132653-132654,132661-132685,132688,132692-132694,132709,
    132711-132712,132714,132723-132726,133002-133012,133249,133358-133411,133432,133563,133595,
    133762,133855,134029,134173-134200,134202-134211,134270,134302,134317,134837,134895-134896,
    134969-134988,134995,135081,135119,135778,136876,136905,137301-137420,137428-137657,137659
    The two branches should now be the same except for the version numbers and any commits on
    5.2.N after r137427

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137665 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-16 08:33:50 +00:00
Alan Davis
2b2e32879c Merged HEAD (5.2) to 5.2.N (5.2.2) (RECORD ONLY):
130397,130443,132419,132425,132567,132653-132654,132661-132685,132688,132692-132694,132709,
    132711-132712,132714,132723-132726,133002-133012,133249,133358-133411,133432,133563,133595,
    133762,133855,134029,134173-134200,134202-134211,134270,134302,134317,134837,134895-134896,
    134969-134988,134995,135081,135119,135778,136876,136905,137301-137420,137428-137657,137659
    The two branches should now be the same except for the version numbers and any commits on
    5.2.N after r137427

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137665 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-16 08:33:50 +00:00
Alan Davis
c33516c8a1 Merged HEAD (5.2) to 5.2.N (5.2.2) (RECORD ONLY):
130397,130443,132419,132425,132567,132653-132654,132661-132685,132688,132692-132694,132709,
    132711-132712,132714,132723-132726,133002-133012,133249,133358-133411,133432,133563,133595,
    133762,133855,134029,134173-134200,134202-134211,134270,134302,134317,134837,134895-134896,
    134969-134988,134995,135081,135119,135778,136876,136905,137301-137420,137428-137657,137659
    The two branches should now be the same except for the version numbers and any commits on
    5.2.N after r137427

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137665 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-16 08:33:50 +00:00
Andrei Rebegea
f82e7c7211 Merged 5.2.N (5.2.2) to HEAD (5.2)
137132 jvonka: CLD-79 - Minor update to Cloud Admin Node Browser to show "Source Associations"
   - follow-on to clear "sourceAssocs" when setting new nodeRef


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137640 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-15 11:23:52 +00:00
Andrei Rebegea
403c946979 Merged 5.2.N (5.2.2) to HEAD (5.2)
137126 jvonka: CLD-79 - Minor update to Cloud Admin Node Browser to show "Source Associations"
   - TODO merge to 5.2.N-CLOUD44 & additional change on CLOUD44


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137637 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-15 11:23:32 +00:00
Andrei Rebegea
c5b830a652 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
2017-06-15 11:21:35 +00:00
Andrei Rebegea
e7a9acad80 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
2017-06-15 11:21:29 +00:00
Andrei Rebegea
ba1624dde3 Merged 5.2.N (5.2.2) to HEAD (5.2)
137103 skopf: Merged REPO-2054 (5.2.1) to 5.2.N (5.2.1)
      136912 anechifor: added alfresco-global.properties


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137618 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-15 11:21:22 +00:00
Andrei Rebegea
0d516bef0b Merged 5.2.N (5.2.2) to HEAD (5.2)
137103 skopf: Merged REPO-2054 (5.2.1) to 5.2.N (5.2.1)
      136912 anechifor: added alfresco-global.properties


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137618 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-15 11:21:22 +00:00