Merge branch 'release-4.1.1' into 4.0-master

Author: itsshivaverma

CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 4.1.1
+#### New Functionality
+- [#1006](https://github.com/marklogic/java-client-api/issues/1006) - Data Services First - MarkLogic's support for microservices
+
+#### Improvements and Bug Fixes
+- [#999](https://github.com/marklogic/java-client-api/issues/999) - Connect only to primary host for load balancer scenario
+- [#991](https://github.com/marklogic/java-client-api/issues/991) - Correct cookie expiration for Application Load Balancer
+- [#989](https://github.com/marklogic/java-client-api/issues/989) - Manage cookies for used for host affinity in Transaction
+- [#968](https://github.com/marklogic/java-client-api/issues/968) - Deprecate XOMHandle
+
 ## 4.1.0
 
 #### New Functionality

LEGALNOTICES.TXT

@@ -60,7 +60,7 @@ To use the API in your maven project, include the following in your pom.xml:
     <dependency>
         <groupId>com.marklogic</groupId>
         <artifactId>marklogic-client-api</artifactId>
-        <version>4.1.0</version>
+        <version>4.1.1</version>
     </dependency>
 
 And add this repository to your pom.xml repositories section:
@@ -73,7 +73,7 @@ And add this repository to your pom.xml repositories section:
 For gradle projects, include the following:
 
     dependencies {
-        compile group: 'com.marklogic', name: 'marklogic-client-api', version: '4.1.0'
+        compile group: 'com.marklogic', name: 'marklogic-client-api', version: '4.1.1'
     }
 
 Use gradle 1.7+ and add this to your build.gradle repositories section:

README.md

@@ -1,5 +1,5 @@
 group=com.marklogic
-version=4.1.0
-releaseVersion=4.1.0
+version=4.1.1
+releaseVersion=4.1.1
 describedName=MarkLogic Java Client API
 publishUrl=file:../marklogic-java/releases

gradle.properties

@@ -6,6 +6,7 @@ test {
   exclude 'com/marklogic/client/functionaltest/TestSSLConnection.class'
   exclude 'com/marklogic/client/functionaltest/TestBug18993.class'
   exclude 'com/marklogic/client/functionaltest/TestDatabaseClientWithKerberos.class'
+  exclude 'com/marklogic/client/functionaltest/TestDatabaseClientWithCertBasedAuth.class'
   exclude 'com/marklogic/client/functionaltest/TestSandBox.class'
 }
 
@@ -22,16 +23,12 @@ repositories {
   maven { url "http://developer.marklogic.com/maven2" }
 }
 
-jacocoTestReport {
-  group = "Reporting"
-  description = "Generate Jacoco coverage reports after running tests."
-  additionalSourceDirs = files(sourceSets.main.allJava.srcDirs)
-}
-
 dependencies {  
   compile project (':marklogic-client-api')
   compile group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.0'
   compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
   compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
+  compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.25'
+  testCompile group: 'ch.qos.logback', name: 'logback-classic', version:'1.2.3'
   compile group: 'commons-io', name: 'commons-io', version: '2.6'
 }