Skip to content

Commit 236ee88

Browse files
committed
Merge spring-batch-core-tests in spring-batch-core
1 parent bf61265 commit 236ee88

File tree

72 files changed

+1602
-2125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1602
-2125
lines changed

build.gradle

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -299,10 +299,14 @@ project('spring-batch-core') {
299299
testCompile "javax.inject:javax.inject:$javaxInjectVersion"
300300
testCompile "org.hsqldb:hsqldb:$hsqldbVersion"
301301
testCompile "com.h2database:h2:$h2databaseVersion"
302+
testCompile "org.apache.derby:derby:$derbyVersion"
302303
testCompile "commons-io:commons-io:$commonsIoVersion"
303304
testCompile "org.apache.commons:commons-dbcp2:$commonsDdbcpVersion"
304305
testCompile "junit:junit:${junitVersion}"
305306
testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion"
307+
testCompile "org.testcontainers:mysql:$testcontainersVersion"
308+
testCompile "mysql:mysql-connector-java:$mysqlVersion"
309+
306310
optional "com.ibm.jbatch:com.ibm.jbatch-tck-spi:$jbatchTckSpi"
307311
optional "com.thoughtworks.xstream:xstream:$xstreamVersion"
308312
optional "org.aspectj:aspectjrt:$aspectjVersion"
@@ -417,44 +421,6 @@ project('spring-batch-docs') {
417421
description = 'Spring Batch Docs'
418422
}
419423

420-
project('spring-batch-core-tests') {
421-
description = 'Spring Batch Core Tests'
422-
project.tasks.findByPath("artifactoryPublish")?.enabled = false
423-
dependencies {
424-
compile project(":spring-batch-core")
425-
compile project(":spring-batch-infrastructure")
426-
compile "org.apache.commons:commons-dbcp2:$commonsDdbcpVersion"
427-
compile "org.springframework:spring-jdbc:$springVersion"
428-
compile "org.springframework.retry:spring-retry:$springRetryVersion"
429-
compile "org.springframework:spring-tx:$springVersion"
430-
compile "org.springframework:spring-aop:$springVersion"
431-
432-
testCompile "org.hsqldb:hsqldb:$hsqldbVersion"
433-
testCompile "commons-io:commons-io:$commonsIoVersion"
434-
testCompile "org.apache.derby:derby:$derbyVersion"
435-
testCompile "junit:junit:${junitVersion}"
436-
testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion"
437-
testCompile "org.apache.logging.log4j:log4j-api:$log4jVersion"
438-
testCompile "org.apache.logging.log4j:log4j-core:$log4jVersion"
439-
testCompile "org.springframework:spring-test:$springVersion"
440-
testCompile "org.springframework:spring-jdbc:$springVersion"
441-
testCompile "org.testcontainers:mysql:$testcontainersVersion"
442-
testCompile "mysql:mysql-connector-java:$mysqlVersion"
443-
444-
runtime "org.postgresql:postgresql:$postgresqlVersion"
445-
runtime "javax.batch:javax.batch-api:$javaxBatchApiVersion"
446-
447-
optional "org.aspectj:aspectjrt:$aspectjVersion"
448-
optional "org.aspectj:aspectjweaver:$aspectjVersion"
449-
optional "org.springframework.ldap:spring-ldap-core:$springLdapVersion"
450-
optional "org.springframework.ldap:spring-ldap-core-tiger:$springLdapVersion"
451-
optional "org.springframework.ldap:spring-ldap-ldif-core:$springLdapVersion"
452-
}
453-
test {
454-
enabled = project.hasProperty('alltests')
455-
}
456-
}
457-
458424
//Domain for batch job testing
459425
project('spring-batch-test') {
460426
description = 'Spring Batch Test'

spring-batch-core-tests/.springBeans

Lines changed: 0 additions & 299 deletions
This file was deleted.

spring-batch-core-tests/src/main/resources/log4j.properties

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)