Dependencies update

Author: Mariusz Kopylec

build.gradle

@@ -3,21 +3,21 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'io.codearte.gradle.nexus', name: 'gradle-nexus-staging-plugin', version: '0.5.3'
+        classpath group: 'io.codearte.gradle.nexus', name: 'gradle-nexus-staging-plugin', version: '0.11.0'
     }
 }
 
 plugins {
     id 'groovy'
     id 'maven-publish'
     id 'jacoco'
-    id 'nebula.optional-base' version '3.1.0'
-    id 'com.github.kt3k.coveralls' version '2.6.3'
+    id 'nebula.optional-base' version '3.2.0'
+    id 'com.github.kt3k.coveralls' version '2.8.1'
     id 'maven'
     id 'signing'
-    id 'pl.allegro.tech.build.axion-release' version '1.5.0'
+    id 'pl.allegro.tech.build.axion-release' version '1.7.2'
+    id 'io.codearte.nexus-staging' version '0.11.0'
 }
-apply plugin: 'io.codearte.nexus-staging'
 
 scmVersion {
     tag {
@@ -36,18 +36,18 @@ repositories {
     mavenCentral()
 }
 
-ext.springBootVersion = '1.5.1.RELEASE'
+ext.springBootVersion = '1.5.6.RELEASE'
 
 dependencies {
 
     compile group: 'org.springframework.boot', name: 'spring-boot-starter', version: springBootVersion
     compile("org.springframework.boot:spring-boot-starter-data-couchbase:$springBootVersion") {
         exclude group: 'org.springframework', module: 'spring-web'
     }
-    compile group: 'org.springframework.session', name: 'spring-session', version: '1.3.0.RELEASE'
-    compile group: 'org.springframework.retry', name: 'spring-retry', version: '1.1.5.RELEASE'
+    compile group: 'org.springframework.session', name: 'spring-session', version: '1.3.1.RELEASE'
+    compile group: 'org.springframework.retry', name: 'spring-retry', version: '1.2.1.RELEASE'
     compile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.6'
+    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.9'
     compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5'
     compile group: 'org.apache.commons', name: 'commons-collections4', version: '4.1'
 
@@ -56,7 +56,7 @@ dependencies {
     testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: springBootVersion
     testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springBootVersion
     testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-undertow', version: springBootVersion
-    testCompile group: 'org.spockframework', name: 'spock-spring', version: '1.1-groovy-2.4-rc-3'
+    testCompile group: 'org.spockframework', name: 'spock-spring', version: '1.1-groovy-2.4'
 }
 
 configurations {
@@ -141,7 +141,3 @@ jacocoTestReport {
         html.enabled = true
     }
 }
-
-nexusStaging {
-    numberOfRetries = 20
-}

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Fri Sep 09 10:34:20 CEST 2016
+#Mon Sep 04 14:49:51 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -8,5 +8,5 @@ if [ -z "$VERSION" ]; then
     echo "Set release version using -v option"
     exit 1
 else
-    ./gradlew clean test release -Prelease.forceVersion=$VERSION && ./gradlew uploadArchives -PsignArtifacts && ./gradlew closeAndPromoteRepository
+    ./gradlew clean test release -Prelease.forceVersion=$VERSION && ./gradlew uploadArchives -PsignArtifacts && ./gradlew closeAndReleaseRepository
 fi

gradlew

@@ -2,21 +2,15 @@
 
 import com.github.mkopylec.sessioncouchbase.data.InMemoryDao;
 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.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@EnableConfigurationProperties(SessionCouchbaseProperties.class)
 @ConditionalOnProperty(name = "session-couchbase.in-memory.enabled")
 public class InMemoryConfiguration {
 
-    @Autowired
-    protected SessionCouchbaseProperties sessionCouchbase;
-
     @Bean
     @ConditionalOnMissingBean
     public SessionDao sessionDao() {

gradlew.bat

@@ -7,7 +7,6 @@
 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.autoconfigure.couchbase.CouchbaseProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Bean;
@@ -19,7 +18,7 @@
 
 @Configuration
 @EnableSpringHttpSession
-@EnableConfigurationProperties(CouchbaseProperties.class)
+@EnableConfigurationProperties(SessionCouchbaseProperties.class)
 public class SessionCouchbaseAutoConfiguration {
 
     @Autowired

release

@@ -98,6 +98,7 @@ public boolean exists(String documentId) {
 
     @Override
     public void delete(String id) {
+        expirationTimes.remove(id);
         sessions.remove(id);
         principalSessions.remove(id);
     }
@@ -113,12 +114,13 @@ public void deleteAll() {
     public void afterPropertiesSet() throws Exception {
         expirationScheduler.initialize();
         expirationScheduler.scheduleAtFixedRate(() -> {
-            for(Iterator<Entry<String, Long>> iter = expirationTimes.entrySet().iterator(); iter.hasNext(); ) {
-                Entry<String, Long> entry = iter.next();
+            Iterator<Entry<String, Long>> iterator = expirationTimes.entrySet().iterator();
+            while (iterator.hasNext()) {
+                Entry<String, Long> entry = iterator.next();
                 if (entry.getValue() < currentTimeMillis()) {
                     sessions.remove(entry.getKey());
                     principalSessions.remove(entry.getKey());
-                    iter.remove();
+                    iterator.remove();
                 }
             }
         }, 1000);