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

5622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rodica Sutu
c3b4b0cd77 Merge branch 'feature-3.0/RM-6823_UpgradeToACS601' into 'release/V3.0' 
RM-6823 "Feature 3.0/ upgradetoacs601"

See merge request records-management/records-management!1160
 2019-04-19 15:13:59 +01:00
Rodica Sutu
11d48c0c36 Update to ACS 6.0.1.2 2019-04-19 15:13:59 +01:00
Rodica Sutu
d719f535db Merge branch 'feature/RM-6833_SkipFailBuildOnJavaDocsError' into 'master' 
RM-6833

See merge request records-management/records-management!1161
 2019-04-19 14:40:52 +01:00
Rodica Sutu
61e50fb10f RM-6833 Fix java docs generation on openJDK 11.0.2 2019-04-19 14:40:52 +01:00
cagache
f6d0b2fd05 Merge remote-tracking branch 'remotes/origin/master' into feature/RM-6821_IntermittentSearchRestApiTests 2019-04-19 14:37:28 +03:00
cagache
d68070051d try to search for content ~1.45 min 2019-04-18 16:40:31 +03:00
Ross Gale
ecfb3fdca9 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
3cb127b620 RM-6825 update travis to use openjdk11 2019-04-17 11:04:26 +01:00
cagache
29a7047db1 try to search for content ~2 min 2019-04-16 14:17:55 +03:00
cagache
94454b1f6c try to search for content ~1.45 min 2019-04-16 10:38:24 +03:00
cagache
f74303fc50 removed afterMethod annotation 2019-04-16 09:16:20 +03:00
cagache
11a193bdbf Merge remote-tracking branch 'remotes/origin/master' into feature/RM-6821_IntermittentSearchRestApiTests 2019-04-16 08:17:37 +03:00
cagache
15b5c167af try to search for content ~1.45 min 2019-04-15 15:42:01 +03:00
cagache
ce60d3e89f Renamed test classes to end with Test or Tests 2019-04-12 14:32:52 +03:00
cagache
72493a9a13 Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge/Fix_ClassNotFoundException_logs 2019-04-12 14:17:40 +03:00
cagache
688628258d try to search for content ~1.30 min 2019-04-12 14:14:59 +03:00
Rodica Sutu
c17fc2ac6f 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
e311f8c0ca 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
3d91c28743 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
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
Rodica Sutu
107ae75f35 fix the illegal reflective access operation warning from xstream library 2019-04-12 10:31:23 +03:00
cagache
1bee02b8df try to search for content ~1 min 2019-04-11 17:47:08 +03:00
cagache
ce8522a2c1 refactoring 2019-04-11 17:33:26 +03:00
cagache
2e5ce4c6a2 fix javadoc 2019-04-11 17:10:08 +03:00
cagache
b6daa30fba 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
6a54f42ea6 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
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
cagache
c697e37dfe Record only merge of version change. 2019-04-10 13:31:04 +03:00
Rodica Sutu
9cbdb10e6a 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
ab27a2581c Record only merge of version change. 2019-04-10 09:57:12 +03:00
cagache
b4c29ae16d Record only merge of version change. 2019-04-10 09:54:17 +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
Rodica Sutu
a4ec375afd 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
02db9e2d52 RM-6723 review changes 2019-04-09 16:45:22 +03:00
Rodica Sutu
d042925488 Update version to 2.7.2.1-SNAPSHOT 2019-04-09 11:47:20 +03:00
alfresco-build
765c163d02 [maven-release-plugin] prepare for next development iteration 2019-04-09 09:04:42 +01:00
alfresco-build
237cd19f12 [maven-release-plugin] prepare release V2.7.2 ags-2.7.2 2019-04-09 09:04:38 +01: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
Ross Gale
c2a216f009 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
aa04bbba90 Merge remote-tracking branch 'origin/master' into feature/RM-6723_AGS_ACS6.1_compatibility 2019-04-08 14:39:48 +03:00
cagache
9384a4e5aa Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge/MergeTestChangesFromV2.7 2019-04-08 09:47:19 +03:00
rlucanu
d25c8762ca RM-6723 fixing tests 2019-04-07 23:11:10 +03:00
Ross Gale
61802a8fb9 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
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
cagache
f4ecf2a125 Merge remote-tracking branch 'remotes/origin/release/V2.7' into 'merge-3.0/MergeTestChangesFromV2.7' 2019-04-05 15:07:50 +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