From 3c98f67e1a5e888d928f17a6cf775b954b81151d Mon Sep 17 00:00:00 2001
From: Cristian Turlica <cristian.turlica@ness.com>
Date: Fri, 8 Sep 2017 15:51:43 +0300
Subject: [PATCH 1/2] REPO-2705: Service Pack: MNT-17961: Cannot create new
 Alfresco NON-versioned document with CMIS API Calls    - added possibility to
 create cmis document with VersioningState.NONE

---
 .../java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java b/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
index 0e01b2d199..6da2629133 100644
--- a/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
+++ b/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
@@ -1283,11 +1283,6 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
             throw new CmisConstraintException("This document type does requires content!");
         }
 
-        if (docType.isVersionable() && (versioningState == VersioningState.NONE))
-        {
-            throw new CmisConstraintException("This document type is versionable!");
-        }
-
         if (!docType.isVersionable() && (versioningState != VersioningState.NONE))
         {
             throw new CmisConstraintException("This document type is not versionable!");

From 28366861fcf8f5f46887d8f3ddea6ff4de931a8c Mon Sep 17 00:00:00 2001
From: Ancuta Morarasu <ancuta.morarasu@ness.com>
Date: Fri, 8 Sep 2017 16:20:44 +0300
Subject: [PATCH 2/2] REPO-2705 / MNT-17961: Cannot create new Alfresco
 NON-versioned document with CMIS API Calls - test

---
 .../java/org/alfresco/opencmis/CMISTest.java  | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/src/test/java/org/alfresco/opencmis/CMISTest.java b/src/test/java/org/alfresco/opencmis/CMISTest.java
index dc1043a8a6..b0a69bb7cb 100644
--- a/src/test/java/org/alfresco/opencmis/CMISTest.java
+++ b/src/test/java/org/alfresco/opencmis/CMISTest.java
@@ -3668,6 +3668,64 @@ public class CMISTest
             AuthenticationUtil.popAuthentication();
         }
     }
+    
+    @Test
+    public void testCreateDocWithVersioningStateNone() throws Exception
+    {
+        AuthenticationUtil.pushAuthentication();
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+
+        try
+        {
+            // get repository id
+            final String repositoryId = withCmisService(new CmisServiceCallback<String>()
+            {
+                @Override
+                public String execute(CmisService cmisService)
+                {
+                    List<RepositoryInfo> repositories = cmisService.getRepositoryInfos(null);
+                    assertTrue(repositories.size() > 0);
+                    RepositoryInfo repo = repositories.get(0);
+                    final String repositoryId = repo.getId();
+                    return repositoryId;
+                }
+            }, CmisVersion.CMIS_1_1);
+
+            final NodeRef documentNodeRef = withCmisService(new CmisServiceCallback<NodeRef>()
+            {
+                @Override
+                public NodeRef execute(CmisService cmisService)
+                {
+                    final PropertiesImpl properties = new PropertiesImpl();
+                    String objectTypeId = "cmis:document";
+                    properties.addProperty(new PropertyIdImpl(PropertyIds.OBJECT_TYPE_ID, objectTypeId));
+                    String fileName = "textFile" + GUID.generate();
+                    properties.addProperty(new PropertyStringImpl(PropertyIds.NAME, fileName));
+                    final ContentStreamImpl contentStream = new ContentStreamImpl(fileName, MimetypeMap.MIMETYPE_TEXT_PLAIN, "Simple text plain document");
+
+                    String nodeId = cmisService.create(repositoryId, properties, repositoryHelper.getCompanyHome().getId(), contentStream, VersioningState.NONE, null, null);
+                    return new NodeRef(nodeId.substring(0, nodeId.indexOf(';')));
+                }
+            }, CmisVersion.CMIS_1_1);
+
+            // check versioning properties
+            transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<List<Void>>()
+            {
+                @Override
+                public List<Void> execute() throws Throwable
+                {
+                    assertTrue(nodeService.exists(documentNodeRef));
+                    assertFalse(nodeService.hasAspect(documentNodeRef, ContentModel.ASPECT_VERSIONABLE));
+
+                    return null;
+                }
+            });
+        }
+        finally
+        {
+            AuthenticationUtil.popAuthentication();
+        }
+    }
     
     /**
      * MNT-14951: Test that the list of parents can be retrieved for a folder.