Commit Graph

4588 Commits

Author SHA1 Message Date
Alex Mukha
d856fd8292 REPO-2941 Rename artefacts to contain ea in artefact ids 2017-10-13 10:51:21 +01:00
Alex Mukha
31b61cb584 Merge pull request #6 from Alfresco/develop
Sync master with develop
2017-10-13 10:38:21 +01:00
Alex Mukha
f83b24bafb Merge branch 'master' into develop 2017-10-13 10:25:02 +01:00
Matt Ward
56f165dfd2 Merge pull request #5 from Alfresco/ALF-21953_missing_license_header_plug
ALF-21953: updated pom to use super-pom v9
2017-10-11 16:02:39 +01:00
Alex Mukha
42c5c4e9da REPO-2886 Change bitrock command arguments to a single line 2017-10-11 15:53:55 +01:00
Alex Mukha
96e8daf85e REPO-2886 Add gitattributes file 2017-10-11 15:39:22 +01:00
Alex Mukha
16930a5917 REPO-2886 Remove unnecessary variables 2017-10-11 13:27:38 +01:00
Matt Ward
71e59c633d ALF-21953: updated pom to use super-pom v9 2017-10-11 12:12:25 +01:00
Alex Mukha
c6672bef0b Merge pull request #4 from Alfresco/feature/repo-2944-new-6-version
REPO-2886 Change the project version to 6.0.0
2017-10-11 11:31:18 +01:00
Alex Mukha
03f32226f9 REPO-2886 Change installer command variables 2017-10-10 17:32:32 +01:00
Alex Mukha
62fb875941 REPO-2886 Change the project version to 6.0.0 2017-10-10 15:13:21 +01:00
Alan Davis
5a743a67c8 REPO-2005 Add MariaDB to community packaging so that it is in the docker image.
Added as part of this issue as this is the first issue to do with MariaDB.
2017-10-10 14:15:03 +01:00
Alex Mukha
8b77ce79b6 REPO-2886 Tidy up poms. Add scm config 2017-10-10 11:49:46 +01:00
Alex Mukha
39252f8c22 REPO-2886 Change project name 2017-10-06 17:37:16 +01:00
Alex Mukha
323d4889a7 REPO-2886 Prepare community version of the full packaging 2017-10-06 10:59:42 +01:00
Alan Davis
bb7e551023 MNT-18275 include data-model 6.19 2017-09-28 22:50:01 +01:00
Alex Mukha
bc540ddf0e REPO-2915 Fix artefact unpack/copy for Docker image 2017-09-21 00:02:51 +01:00
Alex Mukha
270358dc18 REPO-2915 Use alpine Docker image 2017-09-20 22:11:50 +01:00
Alex Mukha
41a92023b6 REPO-2915 Put exploded war into Docker 2017-09-20 22:10:41 +01:00
Alan Davis
9aa854f384 REPO-2921 Put a .gitbugtraq file in all develop Branches 2017-09-20 14:34:33 +01:00
Alex Mukha
8c1489bfd0 Merge branch 'develop' into 'master'
Sync master with develop

See merge request !7
2017-09-19 10:32:33 +01:00
Alex Mukha
a47f487f74 Resolve conflicts when merging 'master' into 'develop' 2017-09-19 10:31:40 +01:00
Alex Mukha
260ee70706 GOOGLEDOCS-401 Update googledocs module to 3.0.4.2 2017-09-19 10:06:01 +01:00
Petru Obreja
818a92a68b GOOGLEDOCS-401 Update googledocs module to be compatible with ACS 6.0
- Updated full-installer's pom to use googledocs.version as 3.0.4.2
2017-09-18 14:20:50 +03:00
Alex Mukha
b654b5175d REPO-2907 Add config for Docker images 2017-09-18 11:05:20 +01:00
Alex Mukha
358e53edd0 REPO-2815 Update solr4 version to 6.5 2017-09-14 14:50:36 +01:00
Alex Mukha
8f5ad456f6 REPO-2815 Update community dependency to 6.0.b 2017-09-14 13:37:59 +01:00
Alex Mukha
e2fea4b707 REPO-2815 Update project version to 6.0.b 2017-09-14 13:18:06 +01:00
alfresco-build
1ad0851513 [maven-release-plugin] prepare for next development iteration 2017-09-14 10:59:47 +00:00
alfresco-build
fa1bbdd89e [maven-release-plugin] prepare release acs-community-packaging-6.0.a 2017-09-14 10:59:41 +00:00
Alex Mukha
d396500773 Merge pull request #2 from Alfresco/develop
REPO-2815 Sync master with develop
2017-09-14 11:49:17 +01:00
Alex Mukha
b0db1b0d16 REPO-2815 Revert back to numbers only in version.properties 2017-09-13 20:01:48 +01:00
Alex Mukha
f73733357c REPO-2815 Fix module management in top level pom[D 2017-09-13 13:03:44 +01:00
Alex Mukha
745793ee76 REPO-2815 Update project version to 6.0 2017-09-13 11:57:31 +01:00
Alex Mukha
062cc8b2ba REPO-2815 Update the dependencies for latest ACS 2017-09-13 11:51:23 +01:00
Alex Mukha
56119d116e REPO-2815 Add additional dependency management 2017-09-13 11:37:06 +01:00
Alex Mukha
30afb2ad0c REPO-2815 Populate version.properties with maven version 2017-09-13 09:11:57 +01:00
Alex Mukha
8353c58260 Merge pull request #1 from Alfresco/develop
REPO-2815 Sync master with develop
2017-09-12 15:20:34 +01:00
Alex Mukha
2af872dfab Merge branch 'master' into develop 2017-09-12 15:05:54 +01:00
Alex Mukha
8426e6d6b6 REPO-2815 Update project version to 6.0 2017-09-12 14:53:06 +01:00
Alex Mukha
6bf75be4b3 REPO-2815 Update to latest dependencies 2017-09-12 14:50:44 +01:00
Alan Davis
05354a55f6 REPO-1805 Use standard project dependency naming.
So <dependency.acs-packaging.version> rather than <alfresco.platform.version> (reverted from commit 0f433b9fa5)
2017-09-12 13:07:02 +01:00
Alan Davis
0f433b9fa5 REPO-1805 Use standard project dependency naming.
So <dependency.acs-packaging.version> rather than <alfresco.platform.version>
2017-09-11 18:13:12 +01:00
Alex Mukha
1944aa920c Update MMT to 6.0 release. 2017-09-11 13:32:04 +01:00
Codrin Chirica
89d3b2e291 Merge branch 'fix/MNT-18400_SyntaxErrorInWindowsServiceScript' into 'develop'
REPO-2867: Service Pack: MNT-18400: Syntax error in Windows service stop script

See merge request !5
2017-09-08 12:28:17 +01:00
CodrinChirica
e44958ecee REPO-2867: Service Pack: MNT-18400: Syntax error in Windows service stop script
- fix syntax error in batch script AlfrescoRootDirectory\servicerun.bat
2017-09-08 11:08:54 +03:00
Alex Mukha
460153b228 REPO-2815 Fix product name in readme 2017-09-07 14:04:42 +01:00
Derek Hulley
48d51632b4 Ignore alf_data directory in case of running using 'mvn tomcat7:run' 2017-09-06 15:51:29 +01:00
Alex Mukha
ff2155556f REPO-2830 Add correct jackson lib version 2017-09-05 15:48:41 +01:00
Alex Mukha
c1aa8586fa REPO-2830 Add correct version of commons-logging 2017-09-05 13:40:52 +01:00