Skip to content

Commit 0088bff

Browse files
committed
Dependencies update
1 parent 807f7c8 commit 0088bff

File tree

7 files changed

+19
-23
lines changed

7 files changed

+19
-23
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
gradle.properties
44
.gradle
55
build
6-
classes
6+
classes
7+
out

build.gradle

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
1-
buildscript {
2-
repositories {
3-
mavenCentral()
4-
}
5-
dependencies {
6-
classpath group: 'io.codearte.gradle.nexus', name: 'gradle-nexus-staging-plugin', version: '0.11.0'
7-
}
8-
}
9-
101
plugins {
112
id 'groovy'
123
id 'maven-publish'
134
id 'jacoco'
145
id 'nebula.optional-base' version '3.2.0'
15-
id 'com.github.kt3k.coveralls' version '2.8.1'
6+
id 'com.github.kt3k.coveralls' version '2.8.2'
167
id 'maven'
178
id 'signing'
18-
id 'pl.allegro.tech.build.axion-release' version '1.7.2'
9+
id 'pl.allegro.tech.build.axion-release' version '1.9.0'
1910
id 'io.codearte.nexus-staging' version '0.11.0'
2011
}
2112

@@ -36,19 +27,19 @@ repositories {
3627
mavenCentral()
3728
}
3829

39-
ext.springBootVersion = '1.5.6.RELEASE'
30+
ext.springBootVersion = '1.5.11.RELEASE'
4031

4132
dependencies {
4233

4334
compile group: 'org.springframework.boot', name: 'spring-boot-starter', version: springBootVersion
4435
compile("org.springframework.boot:spring-boot-starter-data-couchbase:$springBootVersion") {
4536
exclude group: 'org.springframework', module: 'spring-web'
4637
}
47-
compile group: 'org.springframework.session', name: 'spring-session', version: '1.3.1.RELEASE'
48-
compile group: 'org.springframework.retry', name: 'spring-retry', version: '1.2.1.RELEASE'
38+
compile group: 'org.springframework.session', name: 'spring-session', version: '1.3.2.RELEASE'
39+
compile group: 'org.springframework.retry', name: 'spring-retry', version: '1.2.2.RELEASE'
4940
compile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
5041
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.9'
51-
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5'
42+
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
5243
compile group: 'org.apache.commons', name: 'commons-collections4', version: '4.1'
5344

5445
compile group: 'org.springframework.boot', name: 'spring-boot-configuration-processor', version: springBootVersion, optional
@@ -63,6 +54,10 @@ configurations {
6354
all*.exclude group: 'org.mortbay.jetty', module: 'servlet-api'
6455
}
6556

57+
task wrapper(type: Wrapper) {
58+
gradleVersion = '4.6'
59+
}
60+
6661
task javadocJar(type: Jar) {
6762
classifier = 'javadoc'
6863
from javadoc

gradle/wrapper/gradle-wrapper.jar

500 Bytes
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Mon Sep 04 14:49:51 CEST 2017
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
zipStoreBase=GRADLE_USER_HOME
54
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip

gradlew

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/test/groovy/com/github/mkopylec/sessioncouchbase/BasicSpec.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import spock.lang.Specification
2121

2222
import static com.couchbase.client.java.query.N1qlQuery.simple
2323
import static com.github.mkopylec.sessioncouchbase.SessionController.PRINCIPAL_NAME
24+
import static com.github.mkopylec.sessioncouchbase.TestApplication.TestConfiguration.COOKIE_NAME
2425
import static java.net.HttpCookie.parse
2526
import static org.apache.commons.collections4.CollectionUtils.isNotEmpty
2627
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT
@@ -296,7 +297,7 @@ abstract class BasicSpec extends Specification {
296297
if (cookiesHeader == null) {
297298
return
298299
}
299-
def cookieHeader = cookiesHeader.find { it -> it.contains(TestApplication.Config.COOKIE_NAME) }
300+
def cookieHeader = cookiesHeader.find { it -> it.contains(COOKIE_NAME) }
300301
if (cookieHeader == null) {
301302
return
302303
}

src/test/java/com/github/mkopylec/sessioncouchbase/TestApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static void main(String[] args) {
1616
}
1717

1818
@Configuration
19-
public static class Config {
19+
public static class TestConfiguration {
2020

2121
public static final String COOKIE_NAME = "sessionCookie";
2222

0 commit comments

Comments
 (0)