From 3f7a3e2be19fe33267aeb5108dc05296c0c5b941 Mon Sep 17 00:00:00 2001 From: Mihai Cozma Date: Mon, 14 Nov 2016 17:33:34 +0200 Subject: [PATCH 1/7] RM-4320 Upgrade RM 2.5.1 dependency to Alfresco 5.2_SNAPSHOT --- rm-community/pom.xml | 2 +- .../rm-public-services-security-context.xml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/rm-community/pom.xml b/rm-community/pom.xml index e5ad0a3c57..a7ced592b3 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -23,7 +23,7 @@ - 5.1.g + 5.2.a-EA ${alfresco.version} diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml index 8b773b3c9b..6d90759e2b 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml @@ -136,9 +136,6 @@ - - - ${system.acl.maxPermissionCheckTimeMillis} From 010e79be05ee847c3bc4a06c9e7bedd65fd271bd Mon Sep 17 00:00:00 2001 From: Mihai Cozma Date: Wed, 16 Nov 2016 16:53:15 +0200 Subject: [PATCH 2/7] RM-4320 Upgrade RM 2.5.1 to Alf 5.2 --- .../security/rm-method-security.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties index 350505fa84..6a5bfac349 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties @@ -127,6 +127,7 @@ rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.getLockStatus=RM.Rea rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.getLockType=RM.Read.0 rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.checkForLock=RM.Read.0 rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.getLocks=RM.Read.0 +rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.isLockedAndReadOnly=RM.Read.0 rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.*=RM_DENY ## Multilingual Content Service From 66332f624fac2097ba44456751d2b3cff9140b5a Mon Sep 17 00:00:00 2001 From: Mihai Cozma Date: Mon, 21 Nov 2016 13:27:46 +0200 Subject: [PATCH 3/7] RM 4320 Min Alfresco Repo Version should be 5.1.1 not 5.2.(alfresco.version) --- pom.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index a713d01aed..8b7bd6f8c0 100644 --- a/pom.xml +++ b/pom.xml @@ -103,6 +103,7 @@ ${project.version} + 5.1.1 AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE false 1.7 @@ -153,9 +154,9 @@ rm.module.repo.version.min - ${alfresco.version} -- (\d+)\.(\d+).* -- $1.$2 + ${alfresco.repo.version.min} +- ([0-9\.]*[0-9]).* +- $1 false From 58c22467bb7ff730d99938caaf67be83c4657a63 Mon Sep 17 00:00:00 2001 From: Mihai Cozma Date: Tue, 22 Nov 2016 14:23:09 +0200 Subject: [PATCH 4/7] Set Alfresco community version to 5.1.g --- rm-community/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-community/pom.xml b/rm-community/pom.xml index a7ced592b3..e5ad0a3c57 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -23,7 +23,7 @@ - 5.2.a-EA + 5.1.g ${alfresco.version} From 1f5c5c0c19583a10ed33f4358e581efdbf323c38 Mon Sep 17 00:00:00 2001 From: Mihai Cozma Date: Fri, 25 Nov 2016 16:11:24 +0200 Subject: [PATCH 5/7] Revert "Merge branch 'feature-2.5/Merge_RM4320_to_V2.5' into 'release/V2.5'" This reverts commit 21b0ad9eff75619749efb7b5fc3f86e963c1d7d1, reversing changes made to d90c19522e8844ef8a11d2af3f84891bbe1bf71a. --- pom.xml | 7 +++---- .../rm-public-services-security-context.xml | 3 +++ .../security/rm-method-security.properties | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 8b7bd6f8c0..a713d01aed 100644 --- a/pom.xml +++ b/pom.xml @@ -103,7 +103,6 @@ ${project.version} - 5.1.1 AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE false 1.7 @@ -154,9 +153,9 @@ rm.module.repo.version.min - ${alfresco.repo.version.min} -- ([0-9\.]*[0-9]).* -- $1 + ${alfresco.version} +- (\d+)\.(\d+).* +- $1.$2 false diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml index 6d90759e2b..8b773b3c9b 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml @@ -136,6 +136,9 @@ + + + ${system.acl.maxPermissionCheckTimeMillis} diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties index 6a5bfac349..350505fa84 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties @@ -127,7 +127,6 @@ rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.getLockStatus=RM.Rea rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.getLockType=RM.Read.0 rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.checkForLock=RM.Read.0 rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.getLocks=RM.Read.0 -rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.isLockedAndReadOnly=RM.Read.0 rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.*=RM_DENY ## Multilingual Content Service From 952148a0ca5103a8a634afee591e90956f019bef Mon Sep 17 00:00:00 2001 From: Mihai Cozma Date: Fri, 25 Nov 2016 17:17:55 +0200 Subject: [PATCH 6/7] Revert "Revert "Merge branch 'feature-2.5/Merge_RM4320_to_V2.5' into 'release/V2.5'"" This reverts commit 1f5c5c0c19583a10ed33f4358e581efdbf323c38. --- pom.xml | 7 ++++--- .../rm-public-services-security-context.xml | 3 --- .../security/rm-method-security.properties | 1 + 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index a713d01aed..8b7bd6f8c0 100644 --- a/pom.xml +++ b/pom.xml @@ -103,6 +103,7 @@ ${project.version} + 5.1.1 AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE false 1.7 @@ -153,9 +154,9 @@ rm.module.repo.version.min - ${alfresco.version} -- (\d+)\.(\d+).* -- $1.$2 + ${alfresco.repo.version.min} +- ([0-9\.]*[0-9]).* +- $1 false diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml index 8b773b3c9b..6d90759e2b 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml @@ -136,9 +136,6 @@ - - - ${system.acl.maxPermissionCheckTimeMillis} diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties index 350505fa84..6a5bfac349 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties @@ -127,6 +127,7 @@ rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.getLockStatus=RM.Rea rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.getLockType=RM.Read.0 rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.checkForLock=RM.Read.0 rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.getLocks=RM.Read.0 +rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.isLockedAndReadOnly=RM.Read.0 rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.*=RM_DENY ## Multilingual Content Service From ce0a9d8b2ffa369a6fff84db7d69611176702000 Mon Sep 17 00:00:00 2001 From: Mihai Cozma Date: Sat, 26 Nov 2016 09:09:30 +0200 Subject: [PATCH 7/7] RM-4320 Remove alfresco min rm version --- pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 8b7bd6f8c0..ecf6ff66d2 100644 --- a/pom.xml +++ b/pom.xml @@ -103,7 +103,6 @@ ${project.version} - 5.1.1 AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE false 1.7 @@ -154,9 +153,9 @@ rm.module.repo.version.min - ${alfresco.repo.version.min} -- ([0-9\.]*[0-9]).* -- $1 + ${alfresco.version} + (\d+)\.(\d+).* + $1.$2 false