inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,254 Commits 324 Branches 2,170 Tags
ce60d3e89f9bf41ea45793f9ff9f0a9a6fd2903a
Commit Graph

1439 Commits

Author SHA1 Message Date
Claudia Agache
99bf4bba4a Merge branch 'feature/RM-6803_JavadocNotGenerated_no' into 'master' 
RM-6803 Skip Javadoc execution for not a Java classpath-capable packages

Closes RM-6803

See merge request records-management/records-management!1151
 2019-04-12 08:47:23 +01:00
Roxana Lucanu
400a61b7bc Merge branch 'feature/RM-6723_AGS_ACS6.1_compatibility' into 'master' 
Resolve RM-6723 "Feature/ ags acs6.1 compatibility"

Closes RM-6723

See merge request records-management/records-management!1148
 2019-04-10 15:18:46 +01:00
cagache
aa0a32b676 RM-6803 Skip Javadoc execution for not a Java classpath-capable packages 2019-04-10 15:39:35 +03:00
Rodica Sutu
2d06a30243 Merge remote-tracking branch 'origin/release/V3.0' into merge/RM-6787_VersionWhenClassifyFileWithCopies 2019-04-10 09:04:01 +03:00
rlucanu
02db9e2d52 RM-6723 review changes 2019-04-09 16:45:22 +03:00
Rodica Sutu
bb93c0ad4e Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/RM-6787_VersionWhenClassifyFileWithCopies 
# Conflicts:
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java
#	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/AbstractSecureItem.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspect.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/secured/aspect/SecuredAspect.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspectUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/secured/aspect/SecuredAspectUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/securitymarks/SecurityMarkingServiceImplUnitTest.java
 2019-04-09 10:51:44 +03:00
rlucanu
166273ff0a RM-6723 code review changes 2019-04-09 09:55:43 +03:00
rlucanu
d25c8762ca RM-6723 fixing tests 2019-04-07 23:11:10 +03:00
Ross Gale
c551042eca RM-6787 adding fix for renditons 2019-04-05 15:50:33 +01:00
rlucanu
a8c7e8540e RM-6723 Added variables for versions 2019-04-05 16:07:53 +03:00
rlucanu
5c2c54a4cd Merge remote-tracking branch 'origin/master' into feature/RM-6723_AGS_ACS6.1_compatibility 2019-04-05 14:47:27 +03:00
rlucanu
3ab28bb2c2 RM-6723 Added ActiveMQ 2019-04-05 14:44:30 +03:00
Ross Gale
9baac01d03 RM-6787 updating copy and add behaviors for other aspects to use duplication utility class 2019-04-02 11:47:29 +01:00
Rodica Sutu
f77dc61b89 tidy up 2019-04-02 12:41:22 +03:00
rlucanu
190f859464 Merge branch 'feature/RM-6722_OpenJDK11Compatibility' into feature/RM-6723_AGS_ACS6.1_compatibility 2019-04-02 12:21:14 +03:00
Ross Gale
ed8f24865c RM-6787 adding fix for version number increasing and bin duplicating more than needed 2019-04-01 17:54:23 +01:00
Rodica Sutu
9d1c3770c9 fix getResourceAsStream() for OpenJdk11 2019-04-01 11:11:43 +03:00
rlucanu
3ac143c283 RM-6723 removed unwanted string 2019-03-29 12:06:01 +02:00
rlucanu
8df3dbb151 RM-6723 changes to be compatible with ACS6.1 2019-03-29 09:24:40 +02:00
Rodica Sutu
2b6dd1861c change back alfresco-maven-plugin 
comment out thejava version from the maven-enforcer-plugin
 2019-03-28 09:48:45 +02:00
Rodica Sutu
7c27ac4782 fix compilation error 2019-03-28 09:44:43 +02:00
Rodica Sutu
cb76ebed00 update the maven javadoc, maven war and alfresco-maven plugin to be compatible with OpenJDK 11 
add javax libraries
 2019-03-26 13:50:09 +02:00
Ross Gale
47ecd4eb64 Merge branch 'release/V3.0' into merge/RM-6788_DeclareArchivedContent 2019-03-18 13:11:36 +00:00
Ross Gale
5b3666f6e1 Merge branch 'feature-3.0.1/RM-6788_ArchiveClassifyDeclareFix' into 'release/V3.0' 
RM-6788 adding change to 3.0.1 branch

See merge request records-management/records-management!1133
 2019-03-18 13:07:58 +00:00
cagache
7f2c73174a Merge branch 'release/V3.0' into merge/RM-6786_FileCantBeDeclaredAsRecord 2019-03-15 15:31:41 +02:00
cagache
7bce79e772 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/RM-6786_FileCan'tBeDeclaredAsRecord 2019-03-15 10:00:48 +02:00
Rodica Sutu
53d0fb1cbd Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge/RM-6785_JacksonLibraryUpdate 2019-03-15 09:00:51 +02:00
rlucanu
2351eafd65 RM-6786 another fix 2019-03-14 16:24:50 +02:00
rlucanu
1b9d4306c8 RM-6786 Added check for records 2019-03-14 09:46:29 +02:00
Ross Gale
8bf3cdf913 RM-6788 adding change to 3.0.1 branch 2019-03-13 12:04:10 +00:00
Rodica Sutu
8a72644dec Update Jackson version library 2019-03-07 13:19:28 +02:00
Rodica Sutu
c6a45874fb Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge/MNT_20145_RM_6758_ChangesFrom2_6 2019-02-25 23:31:20 +02:00
Rodica Sutu
c96f9ae280 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/MNT_20145_RM_6758_ChangesFrom2_6 2019-02-25 16:03:08 +02:00
Rodica Sutu
cc3f72cfaf Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/MNT_20145_RM_6758_ChangesFrom2_6 2019-02-25 09:19:23 +02:00
cagache
fb02ac0afa addressed code review comments 2019-02-19 09:37:36 +02:00
cagache
db47a2f6f2 addressed code review comments 2019-02-18 17:08:05 +02:00
cagache
a5629acc2a added unit tests 2019-02-18 15:16:48 +02:00
cagache
ab762cf8f5 addressed code review comments 2019-02-18 10:57:16 +02:00
cagache
b6d6094ebe added javadoc and removed unused imports 2019-02-15 17:11:04 +02:00
cagache
54010f6ab9 MNT-20145 Duplicate the content url when declaring node as record, version as record, classifying or securing if the node has copies or it is a copy 2019-02-15 16:41:18 +02:00
cagache
01f7bc013d fixed failing tests 2019-02-14 16:22:57 +02:00
cagache
3c47771450 added behaviour to duplicate the bin before declaring a version record 2019-02-14 12:55:10 +02:00
cagache
5b477a7b64 added IT for delete classified content with copies 2019-02-13 16:00:05 +02:00
cagache
a5dc916a7e MNT-20145 Don't delete the content url if the file has copies or it is a copy 2019-02-07 17:54:46 +02:00
Rodica Sutu
caa35587e0 Merge branch 'release/V2.7' of https://git.alfresco.com/records-management/records-management into release/V2.7 2019-01-16 11:44:49 +02:00
Ross Gale
c68c814513 RM-6702 updating headers to 2019 2019-01-04 15:25:11 +00:00
Ross Gale
44cbc77aee RM-6702 updating headers to 2019 2019-01-04 12:25:39 +00:00
Ross Gale
a0575dbc8a RM-6702 updating headers to 2019 2019-01-04 10:11:45 +00:00
Ross Gale
cabc902203 RM-6702 updating headers to 2019 2019-01-03 14:30:44 +00:00
cagache
b8be1e375e Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge/Merge_MNT-19967_From2.6 2018-10-04 08:39:56 +03:00