Skip to content

Commit 043cb42

Browse files
committed
Extract spring-session-jdbc
Issue gh-806
1 parent c28f047 commit 043cb42

35 files changed

+15
-9
lines changed

docs/spring-session-docs.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ dependencies {
55
testCompile project(':spring-session-core')
66
testCompile project(':spring-session-data-redis')
77
testCompile project(':spring-session-hazelcast')
8+
testCompile project(':spring-session-jdbc')
89
testCompile "org.springframework:spring-jdbc"
910
testCompile "org.springframework:spring-messaging"
1011
testCompile "org.springframework:spring-webmvc"
@@ -40,5 +41,5 @@ asciidoctor {
4041
'docs-test-dir' : rootProject.projectDir.path + '/docs/src/test/java/',
4142
'docs-test-resources-dir' : rootProject.projectDir.path + '/docs/src/test/resources/',
4243
'samples-dir' : rootProject.projectDir.path + '/samples/',
43-
'session-main-resources-dir' : rootProject.projectDir.path + '/spring-session/src/main/resources/'
44+
'session-jdbc-main-resources-dir' : project(':spring-session-jdbc').projectDir.path + '/src/main/resources/'
4445
}

docs/src/docs/asciidoc/index.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -856,14 +856,14 @@ For example, with PostgreSQL database you would use the following schema script:
856856

857857
[source,sql,indent=0]
858858
----
859-
include::{session-main-resources-dir}org/springframework/session/jdbc/schema-postgresql.sql[]
859+
include::{session-jdbc-main-resources-dir}org/springframework/session/jdbc/schema-postgresql.sql[]
860860
----
861861

862862
And with MySQL database:
863863

864864
[source,sql,indent=0]
865865
----
866-
include::{session-main-resources-dir}org/springframework/session/jdbc/schema-mysql.sql[]
866+
include::{session-jdbc-main-resources-dir}org/springframework/session/jdbc/schema-mysql.sql[]
867867
----
868868

869869
==== Transaction management

spring-session-core/spring-session-core.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ dependencies {
1515

1616
provided "javax.servlet:javax.servlet-api"
1717

18-
integrationTestCompile "org.apache.commons:commons-pool2"
19-
integrationTestCompile "org.apache.derby:derby"
20-
integrationTestCompile "com.h2database:h2"
21-
integrationTestCompile "org.hsqldb:hsqldb"
22-
2318
testCompile "junit:junit"
2419
testCompile "org.mockito:mockito-core"
2520
testCompile "edu.umd.cs.mtc:multithreadedtc"
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
apply plugin: 'io.spring.convention.spring-pom'
22

3-
description = "Aggregator for Spring Session and Spring JDBC"
3+
description = "Spring Session and Spring JDBC integration"
44

55
dependencies {
66
compile project(':spring-session-core')
7+
compile "org.springframework:spring-context"
78
compile "org.springframework:spring-jdbc"
9+
10+
testCompile "javax.servlet:javax.servlet-api"
11+
testCompile "org.springframework.security:spring-security-core"
12+
testCompile "org.springframework.security:spring-security-web"
13+
14+
integrationTestCompile "org.apache.derby:derby"
15+
integrationTestCompile "com.h2database:h2"
16+
integrationTestCompile "org.hsqldb:hsqldb"
817
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
spring.session.cleanup.cron.expression=oops

0 commit comments

Comments
 (0)