Merge pull request #18 from mkopylec/testcontainers

Testcontainers

Author: mkopylec

.travis.yml

@@ -1,14 +1,8 @@
 language: java
 jdk:
-  - oraclejdk8
-before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get install -y libssl1.0.0
-  - sudo wget http://packages.couchbase.com/releases/4.1.1/couchbase-server-community_4.1.1-ubuntu12.04_amd64.deb
-  - sudo dpkg -i couchbase-server-community_4.1.1-ubuntu12.04_amd64.deb
-  - sleep 10
-  - sudo /opt/couchbase/bin/couchbase-cli cluster-init -c localhost:8091 -u Administrator -p password --cluster-ramsize=256 --service=data,index,query
-  - sudo /opt/couchbase/bin/couchbase-cli bucket-create -c localhost:8091 -u Administrator -p password --bucket=default --bucket-ramsize=256 --bucket-replica=1
+  - openjdk8
+services:
+  - docker
 script:
   - ./gradlew test -i
 after_success:

README.md

@@ -101,8 +101,7 @@ The starter supports HTTP session namespaces to prevent session attribute's name
 The name of the namespace can be set in _application.yml_ file:
 
 ```yaml
-session-couchbase:
-    application-namespace: <application_namespace>
+session-couchbase.application-namespace: <application_namespace>
 ```
 
 Each web application in a distributed system can have one application namespace under which the application's session attributes are stored.
@@ -142,6 +141,16 @@ public void doSomething(HttpSession session) {
 
 When changing HTTP session ID every attribute is copied to the new session, no matter what namespace it belongs.
 
+## Metrics
+By default no metrics are collected.
+It can be enabled in _application.yml_ file:
+                     
+ ```yaml
+ session-couchbase.metrics.enabled: true
+ ```
+Metrics are collected using [Micrometer](https://micrometer.io/).
+When collecting metrics is enabled a `MeterRegistry` Spring bean must be created.
+
 ## Configuration properties list
 
 ```yaml
@@ -156,6 +165,8 @@ session-couchbase:
             max-attempts: 1 # Maximum number of attempts to repeat a query to Couchbase when an error occurs.
     in-memory:
         enabled: false # Flag for enabling and disabling in-memory mode.
+    metrics:
+        enabled: false # Flag for enabling and disabling metrics collecting.
 ```
 
 ## Examples

build.gradle

@@ -2,11 +2,11 @@ plugins {
     id 'groovy'
     id 'maven-publish'
     id 'jacoco'
-    id 'com.github.kt3k.coveralls' version '2.8.2'
+    id 'com.github.kt3k.coveralls' version '2.8.4'
     id 'maven'
     id 'signing'
-    id 'pl.allegro.tech.build.axion-release' version '1.9.2'
-    id 'io.codearte.nexus-staging' version '0.11.0'
+    id 'pl.allegro.tech.build.axion-release' version '1.10.2'
+    id 'io.codearte.nexus-staging' version '0.21.0'
 }
 
 scmVersion {
@@ -26,25 +26,27 @@ repositories {
     mavenCentral()
 }
 
-ext.springBootVersion = '2.0.3.RELEASE'
+ext.springBootVersion = '2.1.8.RELEASE'
 
 dependencies {
 
     compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springBootVersion
     compile group: 'org.springframework.boot', name: 'spring-boot-starter-data-couchbase', version: springBootVersion
-    compile group: 'org.springframework.session', name: 'spring-session-core', version: '2.0.4.RELEASE'
-    compile group: 'org.springframework.retry', name: 'spring-retry', version: '1.2.2.RELEASE'
-    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
-    compile group: 'org.apache.commons', name: 'commons-collections4', version: '4.1'
+    compile group: 'org.springframework.session', name: 'spring-session-core', version: '2.1.8.RELEASE'
+    compile group: 'org.springframework.retry', name: 'spring-retry', version: '1.2.4.RELEASE'
+    compile group: 'io.micrometer', name: 'micrometer-core', version: '1.1.5'
+    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
+    compile group: 'org.apache.commons', name: 'commons-collections4', version: '4.4'
 
     compileOnly group: 'org.springframework.boot', name: 'spring-boot-configuration-processor', version: springBootVersion
 
     testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: springBootVersion
-    testCompile group: 'org.spockframework', name: 'spock-spring', version: '1.1-groovy-2.4'
+    testCompile group: 'org.spockframework', name: 'spock-spring', version: '1.3-groovy-2.5'
+    testCompile group: 'org.testcontainers', name: 'couchbase', version: '1.12.4'
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.8'
+wrapper {
+    gradleVersion = '6.0.1'
 }
 
 task javadocJar(type: Jar) {
@@ -120,7 +122,7 @@ publishing {
 }
 
 jacoco {
-    toolVersion = '0.8.1'
+    toolVersion = '0.8.5'
 }
 
 jacocoTestReport {

gradle/wrapper/gradle-wrapper.jar

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