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,816 Commits 324 Branches 2,170 Tags
b36b4e31cb15d4c2cbe7fd5d7c004f783553f6ca
Commit Graph

5816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ross Gale
55ed417a8c Merge branch 'feature/RM-6825_UpdateTravis' into 'master' 
RM-6825 update travis to use openjdk11

Closes RM-6825

See merge request records-management/records-management!1157
 2019-04-17 13:21:30 +01:00
Ross Gale
902c8a4463 RM-6825 update travis to use openjdk11 2019-04-17 11:04:26 +01:00
cagache
95ee11f82c try to search for content ~2 min 2019-04-16 14:17:55 +03:00
cagache
08acacf4f5 try to search for content ~1.45 min 2019-04-16 10:38:24 +03:00
cagache
4e83a921b9 removed afterMethod annotation 2019-04-16 09:16:20 +03:00
cagache
f1453e5a7c Merge remote-tracking branch 'remotes/origin/master' into feature/RM-6821_IntermittentSearchRestApiTests 2019-04-16 08:17:37 +03:00
cagache
a1b0799133 try to search for content ~1.45 min 2019-04-15 15:42:01 +03:00
cagache
1047fd46a2 Renamed test classes to end with Test or Tests 2019-04-12 14:32:52 +03:00
cagache
9957dd3f55 Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge/Fix_ClassNotFoundException_logs 2019-04-12 14:17:40 +03:00
cagache
f26612f00b try to search for content ~1.30 min 2019-04-12 14:14:59 +03:00
Rodica Sutu
fb3b4547db Merge branch 'feature/RM-6804_FixWarningsIllegalReflecticeAccess' into 'master' 
RM-6804_FixWarningsIllegalReflecticeAccess

See merge request records-management/records-management!1153
 2019-04-12 12:13:21 +01:00
Claudia Agache
805c24c62a Merge branch 'feature-3.0/Fix_ClassNotFoundException_logs' into 'release/V3.0' 
RM-6822 Renamed test classes to end with Test or Tests to get rid of java.lang.ClassNotFoundException

See merge request records-management/records-management!1152
 2019-04-12 09:33:17 +01:00
Rodica Sutu
e55cadcb38 Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-6804_FixWarningsIllegalReflecticeAccess 
# Conflicts:
#	pom.xml
 2019-04-12 11:32:10 +03:00
Claudia Agache
1696a6521a 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
Rodica Sutu
cb6b79124f fix the illegal reflective access operation warning from xstream library 2019-04-12 10:31:23 +03:00
cagache
456bd75968 try to search for content ~1 min 2019-04-11 17:47:08 +03:00
cagache
9249b8cb80 refactoring 2019-04-11 17:33:26 +03:00
cagache
de1dd13900 fix javadoc 2019-04-11 17:10:08 +03:00
cagache
0300ac3317 Added slf4j-log4j12 dependency to automation community rest api project and log4j.properties file because logs didn't work on rest api tests after moving to OpenJdk 11 2019-04-11 17:09:40 +03:00
cagache
3310d3805a Renamed files to end with Test or Tests to get rid of java.lang.ClassNotFoundException 2019-04-10 17:47:48 +03:00
Roxana Lucanu
efe66ed4c5 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
320908db31 RM-6803 Skip Javadoc execution for not a Java classpath-capable packages 2019-04-10 15:39:35 +03:00
cagache
d11d37aac2 Record only merge of version change. 2019-04-10 13:31:04 +03:00
Rodica Sutu
930c3a4e43 Merge branch 'merge/RM-6787_VersionWhenClassifyFileWithCopies' into 'master' 
Resolve RM-6787 "Merge/ versionwhenclassifyfilewithcopies"

Closes RM-6787

See merge request records-management/records-management!1150
 2019-04-10 10:54:41 +01:00
cagache
433654202c Record only merge of version change. 2019-04-10 09:57:12 +03:00
cagache
608827075f Record only merge of version change. 2019-04-10 09:54:17 +03:00
Rodica Sutu
8eb05df07b Merge remote-tracking branch 'origin/release/V3.0' into merge/RM-6787_VersionWhenClassifyFileWithCopies 2019-04-10 09:04:01 +03:00
Rodica Sutu
bb4b573da4 Merge branch 'merge-3.0/RM-6787_VersionWhenClassifyFileWithCopies' into 'release/V3.0' 
Resolve RM-6787 "Merge 3.0/ versionwhenclassifyfilewithcopies"

See merge request records-management/records-management!1149
 2019-04-09 16:24:43 +01:00
rlucanu
2144621448 RM-6723 review changes 2019-04-09 16:45:22 +03:00
Rodica Sutu
b60b877922 Update version to 2.7.2.1-SNAPSHOT 2019-04-09 11:47:20 +03:00
alfresco-build
e782840243 [maven-release-plugin] prepare for next development iteration 2019-04-09 09:04:42 +01:00
alfresco-build
124a1b964b [maven-release-plugin] prepare release V2.7.2 2019-04-09 09:04:38 +01:00
Rodica Sutu
4934fa5634 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
e4b8bc9510 RM-6723 code review changes 2019-04-09 09:55:43 +03:00
Ross Gale
3b9b87d22e Merge branch 'feature-2.7/RM-6787_ReduceBinDuplication_V3' into 'release/V2.7' 
Version change fix

See merge request records-management/records-management!1147
 2019-04-08 17:34:59 +01:00
rlucanu
9e0377c2b1 Merge remote-tracking branch 'origin/master' into feature/RM-6723_AGS_ACS6.1_compatibility 2019-04-08 14:39:48 +03:00
cagache
dccac07da5 Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge/MergeTestChangesFromV2.7 2019-04-08 09:47:19 +03:00
rlucanu
830874b334 RM-6723 fixing tests 2019-04-07 23:11:10 +03:00
Ross Gale
3112962646 Merge branch 'feature-2.7/RM-6787_ReduceBinDuplication_V3' of git.alfresco.com:records-management/records-management into feature-2.7/RM-6787_ReduceBinDuplication_V3 2019-04-05 15:52:03 +01:00
Ross Gale
c9d1453025 RM-6787 adding fix for renditons 2019-04-05 15:50:33 +01:00
rlucanu
8640ff6a30 RM-6723 Added variables for versions 2019-04-05 16:07:53 +03:00
cagache
0a78908e42 Merge remote-tracking branch 'remotes/origin/release/V2.7' into 'merge-3.0/MergeTestChangesFromV2.7' 2019-04-05 15:07:50 +03:00
rlucanu
f098169dc6 Merge remote-tracking branch 'origin/master' into feature/RM-6723_AGS_ACS6.1_compatibility 2019-04-05 14:47:27 +03:00
rlucanu
a0c4cd579c RM-6723 Added ActiveMQ 2019-04-05 14:44:30 +03:00
cagache
80924987c3 Revert "Revert "Merge remote-tracking branch 'remotes/origin/feature-2.7/RM-6787_ReduceBinDuplication_V3' into feature-2.7/RM-6787_VersionChangeTests_no"" 
This reverts commit 4f749c0fe4.
 2019-04-05 13:08:38 +03:00
cagache
4f749c0fe4 Revert "Merge remote-tracking branch 'remotes/origin/feature-2.7/RM-6787_ReduceBinDuplication_V3' into feature-2.7/RM-6787_VersionChangeTests_no" 
This reverts commit b5d1ae792eae2bd5adf4b1211011ace1046d40b7, reversing
changes made to d5dfbe7194c9e421b52e08032d192c089191e384.
 2019-04-05 12:04:27 +03:00
Claudia Agache
7b520affae Merge branch 'feature/RM-6790_OpenJDK11Compatibility' into 'master' 
RM-6790 Make RM automation project compatible with OpenJdk 11

Closes RM-6722

See merge request records-management/records-management!1140
 2019-04-03 09:44:57 +01:00
Rodica Sutu
f36817682f Merge branch 'feature/RM-6722_OpenJDK11Compatibility' into 'feature/RM-6790_OpenJDK11Compatibility' 
Resolve RM-6722 "Feature/ openjdk11compatibility"

See merge request records-management/records-management!1141
 2019-04-03 09:34:33 +01:00
Ross Gale
0c2833a5a2 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
e363bc7b50 version updates for the plugins used for OpenJDK 11 2019-04-02 12:43:16 +03:00