Dependencies update

Author: mkopylec

build.gradle

@@ -130,6 +130,10 @@ publishing {
     }
 }
 
+jacoco {
+    toolVersion = '0.8.1'
+}
+
 jacocoTestReport {
     reports {
         xml.enabled = true

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,13 +1,15 @@
 package com.github.mkopylec.sessioncouchbase.configuration;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import com.github.mkopylec.sessioncouchbase.data.PersistentDao;
 import com.github.mkopylec.sessioncouchbase.data.RetryLoggingListener;
 import com.github.mkopylec.sessioncouchbase.data.SessionDao;
-import org.springframework.beans.factory.annotation.Autowired;
+
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.couchbase.CouchbaseProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -16,18 +18,18 @@
 import org.springframework.retry.policy.SimpleRetryPolicy;
 import org.springframework.retry.support.RetryTemplate;
 
-import java.util.HashMap;
-import java.util.Map;
-
 @Configuration
 @EnableCouchbaseRepositories
-@EnableConfigurationProperties({SessionCouchbaseProperties.class, CouchbaseProperties.class})
+@EnableConfigurationProperties(SessionCouchbaseProperties.class)
 @ConditionalOnProperty(name = "session-couchbase.in-memory.enabled", havingValue = "false", matchIfMissing = true)
 public class PersistentConfiguration {
 
-    @Autowired
     protected SessionCouchbaseProperties sessionCouchbase;
 
+    public PersistentConfiguration(SessionCouchbaseProperties sessionCouchbase) {
+        this.sessionCouchbase = sessionCouchbase;
+    }
+
     @Bean
     @ConditionalOnMissingBean
     public RetryLoggingListener retryLoggingListener() {

src/main/java/com/github/mkopylec/sessioncouchbase/configuration/PersistentConfiguration.java

@@ -5,6 +5,7 @@
 import com.github.mkopylec.sessioncouchbase.core.DelegatingSessionStrategy;
 import com.github.mkopylec.sessioncouchbase.core.Serializer;
 import com.github.mkopylec.sessioncouchbase.data.SessionDao;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -22,10 +23,12 @@
 @EnableConfigurationProperties(SessionCouchbaseProperties.class)
 public class SessionCouchbaseAutoConfiguration {
 
-    @Autowired
     protected SessionCouchbaseProperties sessionCouchbase;
+    protected CookieSerializer cookieSerializer;
 
-    private CookieSerializer cookieSerializer;
+    public SessionCouchbaseAutoConfiguration(SessionCouchbaseProperties sessionCouchbase) {
+        this.sessionCouchbase = sessionCouchbase;
+    }
 
     @Bean
     @ConditionalOnMissingBean
@@ -59,5 +62,4 @@ public ObjectMapper objectMapper() {
     public void setCookieSerializer(CookieSerializer cookieSerializer) {
         this.cookieSerializer = cookieSerializer;
     }
-
 }