Commit Graph

5254 Commits

Author SHA1 Message Date
nmcerlean
8824fc342b Merge remote-tracking branch 'origin/master' into feature/RM-3063_Creation_of_Groups_and_Marks 2016-03-07 14:55:03 +00:00
Roy Wetherall
4deba195ea updated and added headers where required. 2016-03-07 15:05:05 +11:00
Roy Wetherall
c01deb55b9 Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into RM-2969_UpdateLicenseHeaders 2016-03-07 14:19:08 +11:00
Roy Wetherall
59bf1cf1a0 Review feedback. 2016-03-07 11:06:43 +11:00
Ana Bozianu
94f74b5fcb Merge release/V2.4 into master 2016-03-04 17:37:03 +02:00
Ana Bozianu
76ba8de108 Merge branch 'feature-2.4/RM-2770_CannotValidateCaveatConfigIfContentStoreEncrypted' into 'release/V2.4'
Feature 2.4/rm 2770 cannot validate caveat config if content store encrypted

RM-2770 - List of Values: Unable to grant access to a values (Transfer Location/Supplemental)
   - run check on transaction commit when the encryption key will also be stored

See merge request !53
2016-03-04 15:13:21 +00:00
David Webster
f4c69b318c Merge remote-tracking branch 'origin/master' into feature/RM-2718_ViewCaveatMarks 2016-03-04 11:54:50 +00:00
Tom Page
fd2ad7f254 Merge release/V2.4 into master.
Conflicts:
	rm-enterprise/pom.xml
	rm-enterprise/rm-enterprise-repo/pom.xml
2016-03-04 08:32:55 +00:00
Tom Page
8d62b3919a Revert "Trying to fix the builds."
This reverts commit 33c3d219ce.
2016-03-04 08:27:48 +00:00
Tom Page
18b3e62255 RM-3110 Upgrade to Alfresco 5.1.
This will currently break local builds, but should fix Bamboo builds.
Local builds should start to pass again once 5.1 has been released.
2016-03-04 08:21:03 +00:00
Tom Page
bbf737db64 Revert "Trying to fix builds."
This reverts commit b1c18bb2bf.
2016-03-04 08:20:45 +00:00
Roy Wetherall
95610f4bfc Add missing headers 2016-03-04 10:16:19 +11:00
Roy Wetherall
509ae8e8d6 Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into RM-2969_UpdateLicenseHeaders 2016-03-04 09:05:15 +11:00
Roy Wetherall
25a6e9a6b7 Change automation project license to Enterprise following review discusions 2016-03-04 09:04:48 +11:00
Roy Wetherall
ea350e988c Improve configuration of license plugin in POMs 2016-03-04 08:59:15 +11:00
onechiforescu
33c3d219ce Trying to fix the builds. 2016-03-03 22:07:47 +02:00
onechiforescu
b1c18bb2bf Trying to fix builds. 2016-03-03 22:00:41 +02:00
Tom Page
0f9f731b1d Merge release/V2.4 into master. 2016-03-03 17:00:37 +00:00
Tom Page
c91e71821f Merge branch 'feature-2.4/RM-3099_UpgradeDataprep' into 'release/V2.4'
Feature 2.4/rm 3099 upgrade dataprep

See merge request !55
2016-03-03 16:59:49 +00:00
Ana Bozianu
c8bdafe3b4 RM-2770 - run check on transaction commit when the encryption key will also be stored 2016-03-03 18:17:17 +02:00
Tom Page
c71c602a7d RM-3099 Upgrade data prep library to 1.8.
This should fix the Activiti error seen when inviting users to a site.
2016-03-03 11:20:26 +00:00
Roy Wetherall
cc5444bff2 Fix build failure 2016-03-03 14:50:24 +11:00
Roy Wetherall
1988b7b503 Merge remote-tracking branch 'origin/release/V2.4' 2016-03-03 14:14:58 +11:00
Roy Wetherall
1a68115166 Merge branch 'feature-2.4/RM-2700_CommunityOnEnterprise' into 'release/V2.4'
Feature 2.4/rm 2700 community on enterprise

Added module compatibility component that inspects the installed core and rm modules and determines if there is an incompatibility or not.

The application context is closed if there is an issue and an error logged/reported.

See merge request !49
2016-03-03 03:13:42 +00:00
Roy Wetherall
587a6377a1 Merge remote-tracking branch 'origin/release/V2.4' 2016-03-03 14:02:18 +11:00
Roy Wetherall
78fcda90a7 Use POM hierarchy to remove plugin configuration duplication 2016-03-03 13:07:19 +11:00
Roy Wetherall
9085014d54 Merge remote-tracking branch 'origin/release/v2.4' into feature/RM-2700_CommunityOnEnterprise 2016-03-03 11:16:11 +11:00
Roy Wetherall
18c618a919 Review feedback 2016-03-03 10:50:16 +11:00
Roy Wetherall
d165a43353 Refresh license headers to include changes to community license and module description 2016-03-03 10:38:37 +11:00
Roy Wetherall
4346d79cc9 Update to community license header 2016-03-03 10:29:23 +11:00
Roy Wetherall
9b2f975ed4 Ensure license header does not appear before import statements in JS files. 2016-03-02 11:59:19 +11:00
Roy Wetherall
9371461975 update POM config to fix issues on Bamboo 2016-03-02 10:38:33 +11:00
Roy Wetherall
a84922be19 Updated README with information on how to refresh license headers 2016-03-02 10:25:43 +11:00
nmcerlean
a4d8483125 Added javadoc to explain how to use smuggleCheckedExceptions utility method. 2016-03-01 20:45:55 +00:00
nmcerlean
513f9c64c5 Added additional utility methods and types for easier use of Java 8 lambdas with checked exceptions. 2016-03-01 19:01:06 +00:00
Roy Wetherall
ba96f27ccc Added enterprise header, target to enterprise projects and headers to enterprise source. 2016-03-01 13:45:32 +11:00
Roy Wetherall
6b8851b201 Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into RM-2969_UpdateLicenseHeaders 2016-03-01 13:16:51 +11:00
Roy Wetherall
b6571f5e85 Add update license header goal to automation project and add community license to automation project source. 2016-03-01 13:16:05 +11:00
Roy Wetherall
412353c044 Add managed license headers to community projects for java, js and ftl source files. 2016-03-01 13:06:00 +11:00
Roy Wetherall
2bbdd7cd48 Remove old license headers 2016-03-01 12:53:30 +11:00
Roy Wetherall
ddc33b1fa4 Extended configuration to cover share community, added file exclusions. 2016-03-01 11:35:28 +11:00
Roy Wetherall
ac9ba4bb1c Added update header plugin to community repo 2016-03-01 10:58:56 +11:00
Roy Wetherall
c5be9defff Added update-file-header goal 2016-02-29 15:11:07 +11:00
Roy Wetherall
e5e5597efc Fixed issues with detecting correct license 2016-02-29 13:52:17 +11:00
Ana Bozianu
3125a6e4b3 Merge release/2.4 into master 2016-02-26 11:00:00 +02:00
Roy Wetherall
0f80b9f992 Unit test for module compatibility component 2016-02-26 11:51:08 +11:00
Ana Bozianu
cfc9c6988f RM-2994 : fixed issue
- issue title: Copy/Move/Link actions don't take place and errors are thrown when running rules that perform them.
   - regression caused by RM-2072 merged forward from v2.2
   - the retrying transaction helper was missing from copyTo, moveTo and linkTo beans and was causing NullPointerException
   - createOrResolvePath method calls getContext on a node created in the current transaction which is not visible in the new transaction and it throws a FileNotFoundException
      - solution: I moved the creation of the new transaction after the context was retrieved as the concurrency exception reported in RM-2072 was being caused by property updates
2016-02-25 19:37:14 +02:00
Roy Wetherall
1c3a369faa Use context refresh event to ensure handler is called 2016-02-25 12:02:13 +11:00
Roy Wetherall
e2421d514e Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into feature/RM-2700_CommunityOnEnterprise 2016-02-25 10:42:21 +11:00
David Webster
461f35bde4 Merge remote-tracking branch 'origin/master' into feature/RM-3039_AikauUpgrade 2016-02-24 22:35:23 +00:00