From e85ea821add6f3283444ab0fe9a6314c12eaa33b Mon Sep 17 00:00:00 2001 From: David Webster Date: Wed, 8 Mar 2017 16:05:00 +0000 Subject: [PATCH 01/10] MNT-17550: Add in null checks to prevent NPE and allow correct error codes to bubble up. --- .../filefolder/ExtendedFileFolderServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/rm-server/source/java/org/alfresco/repo/model/filefolder/ExtendedFileFolderServiceImpl.java b/rm-server/source/java/org/alfresco/repo/model/filefolder/ExtendedFileFolderServiceImpl.java index 1cd984e2a6..10e3fc2a2c 100644 --- a/rm-server/source/java/org/alfresco/repo/model/filefolder/ExtendedFileFolderServiceImpl.java +++ b/rm-server/source/java/org/alfresco/repo/model/filefolder/ExtendedFileFolderServiceImpl.java @@ -33,7 +33,10 @@ public class ExtendedFileFolderServiceImpl extends FileFolderServiceImpl finally { recordService.enablePropertyEditableCheck(); - recordService.disablePropertyEditableCheck(result.getNodeRef()); + if (result != null) + { + recordService.disablePropertyEditableCheck(result.getNodeRef()); + } } return result; @@ -52,7 +55,10 @@ public class ExtendedFileFolderServiceImpl extends FileFolderServiceImpl finally { recordService.enablePropertyEditableCheck(); - recordService.disablePropertyEditableCheck(result.getNodeRef()); + if (result != null) + { + recordService.disablePropertyEditableCheck(result.getNodeRef()); + } } return result; From 0ae2d548c7ed0b12f3860064998f68da74d6feaa Mon Sep 17 00:00:00 2001 From: David Webster Date: Thu, 9 Mar 2017 10:55:37 +0000 Subject: [PATCH 02/10] MNT-17550: Update POM to work around build issue (BDE-996) --- rm-server/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rm-server/pom.xml b/rm-server/pom.xml index 48e289188b..51c9be7a56 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -195,6 +195,12 @@ config + + org.testng + testng + 5.14.10 + test + junit junit From 217ec53966890193d8706b5bd021a93b5178171c Mon Sep 17 00:00:00 2001 From: Samuel Langlois Date: Thu, 9 Mar 2017 11:37:13 +0000 Subject: [PATCH 03/10] MNT-17550/BDE-996 Fix TestNG version to 6.10 --- rm-server/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-server/pom.xml b/rm-server/pom.xml index 51c9be7a56..947f6ac454 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -198,7 +198,7 @@ org.testng testng - 5.14.10 + 6.10 test @@ -279,4 +279,4 @@ 1.4.01 - \ No newline at end of file + From 23c901af64057cf17871cb4b9e7c6258a36661f5 Mon Sep 17 00:00:00 2001 From: David Webster Date: Thu, 9 Mar 2017 17:02:39 +0000 Subject: [PATCH 04/10] MNT-17550: Release 2.2.0.3 --- pom.xml | 2 +- rm-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 197172d10a..10531c872e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm-parent pom - 2.2.0.3-SNAPSHOT + 2.2.0.3 Alfresco Records Management http://www.alfresco.org/ diff --git a/rm-server/pom.xml b/rm-server/pom.xml index 947f6ac454..ac7eee6f0f 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-rm-parent - 2.2.0.3-SNAPSHOT + 2.2.0.3 4.0.0 alfresco-rm-server From 78bdeada80b32f41cf75bb6271a70e599596b9ca Mon Sep 17 00:00:00 2001 From: David Webster Date: Fri, 10 Mar 2017 14:48:11 +0000 Subject: [PATCH 05/10] Update versions following release of 2.2.0.3 --- pom.xml | 2 +- .../alfresco/module/org_alfresco_module_rm/module.properties | 2 +- rm-server/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 10531c872e..778fbfe1ef 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm-parent pom - 2.2.0.3 + 2.2.0.4-SNAPSHOT Alfresco Records Management http://www.alfresco.org/ diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties index f5c791e7ba..704d924b74 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties @@ -6,6 +6,6 @@ module.aliases=org_alfresco_module_dod5015 module.title=Records Management module.description=Alfresco Record Management Extension -module.version=2.2.0.3 +module.version=2.2.0.4 module.repo.version.min=4.2 \ No newline at end of file diff --git a/rm-server/pom.xml b/rm-server/pom.xml index ac7eee6f0f..9d9c8bad15 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-rm-parent - 2.2.0.3 + 2.2.0.4-SNAPSHOT 4.0.0 alfresco-rm-server From 6c6d9398b10cb44598192373b3e939c4311cf864 Mon Sep 17 00:00:00 2001 From: David Webster Date: Thu, 9 Mar 2017 10:55:37 +0000 Subject: [PATCH 06/10] MNT-17550: Update POM to work around build issue (BDE-996) --- rm-server/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rm-server/pom.xml b/rm-server/pom.xml index 12b59dee39..a8037e8dbe 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -195,6 +195,12 @@ config + + org.testng + testng + 5.14.10 + test + junit junit From 079c0a6823e17a14b4b0f609635fd9e108cf6094 Mon Sep 17 00:00:00 2001 From: Samuel Langlois Date: Thu, 9 Mar 2017 11:37:13 +0000 Subject: [PATCH 07/10] MNT-17550/BDE-996 Fix TestNG version to 6.10 --- rm-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-server/pom.xml b/rm-server/pom.xml index a8037e8dbe..611d48f9c7 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -198,7 +198,7 @@ org.testng testng - 5.14.10 + 6.10 test From ff748f7c3a7ff09966b195bdbd07ccfb5a739314 Mon Sep 17 00:00:00 2001 From: David Webster Date: Thu, 9 Mar 2017 10:55:37 +0000 Subject: [PATCH 08/10] MNT-17550: Update POM to work around build issue (BDE-996) --- rm-server/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rm-server/pom.xml b/rm-server/pom.xml index a61504994e..a237fe7ea5 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -189,6 +189,12 @@ ${alfresco.base.version} + + org.testng + testng + 5.14.10 + test + junit junit From a1a9684540a1b117223f40def090068655f073cb Mon Sep 17 00:00:00 2001 From: Samuel Langlois Date: Thu, 9 Mar 2017 11:37:13 +0000 Subject: [PATCH 09/10] MNT-17550/BDE-996 Fix TestNG version to 6.10 --- rm-server/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-server/pom.xml b/rm-server/pom.xml index a237fe7ea5..aa544e2621 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -192,7 +192,7 @@ org.testng testng - 5.14.10 + 6.10 test @@ -261,4 +261,4 @@ test - \ No newline at end of file + From fb48a1d90be7adcc1d845b1a27bf2b1f51a7787f Mon Sep 17 00:00:00 2001 From: David Webster Date: Fri, 10 Mar 2017 16:00:23 +0000 Subject: [PATCH 10/10] MNT-17550: Remove unnecessary file changes (should have been a record only merge from V2.3.0.x) --- rm-server/pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/rm-server/pom.xml b/rm-server/pom.xml index 4179a6006d..8803399995 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -215,12 +215,6 @@ 1.2.7 test - - org.testng - testng - 6.10 - test - junit junit