Merge branch '4.1' into 4.0-master

Author: kkanthet

marklogic-client-api/src/test/java/com/marklogic/client/test/FailedRequestTest.java

@@ -18,6 +18,7 @@
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
+import org.junit.Ignore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -99,8 +100,8 @@ public void testFailedRequest()
 
   }
 
-
-  @Test
+  // Test testErrorOnNonREST commented out because of Git issue #865
+  @Ignore
   public void testErrorOnNonREST() throws ForbiddenUserException {
     DatabaseClient badClient = DatabaseClientFactory.newClient(Common.HOST,
       8001, new DigestAuthContext(Common.USER, Common.PASS));

marklogic-development-tools/build.gradle renamed to ml-development-tools/build.gradle

@@ -31,31 +31,27 @@ dependencies {
     testCompileOnly gradleTestKit()
 }
 
-task pluginJar(type: Jar) {
-    version = '4.1'
+task mlDevelopmentToolsPlugin(type: Jar) {
+    baseName = 'ml-development-tools'
 }
 
 publishing {
     publications {
         main(MavenPublication) {
-            artifact pluginJar
+            artifact mlDevelopmentToolsPlugin
         }
     }
 }
 
 pluginBundle {
-    website = 'http://www.gradle.org/'
+    website = 'https://github.com/marklogic/java-client-api'
     vcsUrl = 'git@github.com:marklogic/java-client-api.git'
-    description = 'ml-development-tools plugin for developing data services on MarkLogic'
-    tags = ['marklogic', 'development tools', 'data services']
-
     plugins {
-        marklogicClientToolsPlugin {
+        mlDevelopmentToolsPlugin {
             id = 'com.marklogic.ml-development-tools'
             displayName = 'ml-development-tools MarkLogic Data Service Tools'
-            description = 'Gradle plugin for developing data services on MarkLogic'
+            description = 'ml-development-tools plugin for developing data services on MarkLogic'
             tags = ['marklogic', 'development tools', 'data services']
-            version = project.version
         }
     }
 }