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

5339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
cagache
c4cf0ff8cb 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 eb9071fb73.
 2019-04-05 13:08:38 +03:00
cagache
eb9071fb73 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
a68fccd169 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
84699c994d 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
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
d306574122 version updates for the plugins used for OpenJDK 11 2019-04-02 12:43:16 +03: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
Rodica Sutu
abfc1fc999 update the maven java doc plugin to fix the Error fetching link: .../target/apidocs/package-list. 
add the fabric8.docker.version to fix the warning "build.plugins.plugin.version' for io.fabric8:docker-maven-plugin is missing."
 2019-03-29 10:14:03 +02:00
rlucanu
8df3dbb151 RM-6723 changes to be compatible with ACS6.1 2019-03-29 09:24:40 +02:00
Rodica Sutu
0a72cf0c32 update maven enforce plugin 2019-03-28 17:53:00 +02:00
Rodica Sutu
60a7f3282d update the versions for surefire and failsafe plugins and add an additional argument --illegal-access=permit to allow all reflection access for third party libraries: 2019-03-28 17:33:37 +02:00
Rodica Sutu
95249c3c24 Merge remote-tracking branch 'remotes/origin/feature/RM-6790_OpenJDK11Compatibility' into feature/RM-6722_OpenJDKCOmpatibility 2019-03-28 11:32:05 +02:00
Rodica Sutu
5afd385009 update the maven.enforcer.plugin 2019-03-28 11:19:32 +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
cagache
b860dd25c7 changed formatter used in tests because DateTimeFormatter.ISO_INSTANT outputs 9 nanoseconds and POST request to http://localhost:8080/alfresco/service/api/rma/actions/ExecutionQueue returns 500 2019-03-27 13:19:09 +02:00
cagache
076910017e Revert "call super.checkServerHealth" 
This reverts commit 5b151008
 2019-03-26 16:19:15 +02:00
cagache
5b15100839 call super.checkServerHealth 2019-03-26 15:35:05 +02:00
Rodica Sutu
c9ae6b8d91 Merge remote-tracking branch 'remotes/origin/feature/RM-6790_OpenJDK11Compatibility' into feature/RM-6722_OpenJDKCOmpatibility 2019-03-26 13:51:40 +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
cagache
5e6555db50 RM-6790 Make RM automation module compatible with OpenJDK 11 2019-03-26 10:39:57 +02:00
Ross Gale
3314a60b44 Merge branch 'merge/RM-6788_DeclareArchivedContent' into 'master' 
Resolve RM-6788 "Merge/ declarearchivedcontent"

Closes RM-6788

See merge request records-management/records-management!1137
 2019-03-22 13:52:17 +00: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
Rodica Sutu
e7d32b93c1 Merge branch 'merge/RM-6785_JacksonLibraryUpdate' into 'master' 
RM-6785 Update Jackson Library on master

Closes RM-6785

See merge request records-management/records-management!1136
 2019-03-15 13:23:26 +00: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
Claudia Agache
2a0c0dd82c Merge branch 'feature-2.7/RM-6786_DeclareFileWithRecVersionAsRecord_test_no' into 'release/V2.7' 
RM-6786 Declare file as record when file already has version declared as record

See merge request records-management/records-management!1134
 2019-03-15 07:06:55 +00:00
Roxana Lucanu
2193a612bf Merge branch 'feature-2.7/RM-6786_FileCan'tBeDeclaredAsRecord' into 'release/V2.7' 
RM-6786 Added check for records

See merge request records-management/records-management!1135
 2019-03-15 07:03:50 +00:00