SGF-564 - Upgrade Gradle build to Java 8.
Upgrade AssertJ version to 3.5.2. Upgrade Jackson version to 2.8.4. Upgrade Spring Framework to 5.0.0.M3. Upgrade Spring Data Build to 2.0.0.BUILD-SNAPSHOT. Upgrade Spring Data Commons to 2.0.0.BUILD-SNAPSHOT. Set Spring Data GemFire version to 2.0.0.BUILD-SNAPSHOT.
This commit is contained in:
19
build.gradle
19
build.gradle
@@ -13,10 +13,6 @@ buildscript {
|
||||
}
|
||||
}
|
||||
|
||||
configurations {
|
||||
sharedResources
|
||||
}
|
||||
|
||||
apply plugin: "java"
|
||||
apply plugin: 'eclipse'
|
||||
apply plugin: 'idea'
|
||||
@@ -29,8 +25,12 @@ apply plugin: 'org.asciidoctor.gradle.asciidoctor'
|
||||
description = 'Spring Data GemFire'
|
||||
group = 'org.springframework.data'
|
||||
|
||||
sourceCompatibility = 1.6
|
||||
targetCompatibility = 1.6
|
||||
sourceCompatibility = 1.8
|
||||
targetCompatibility = 1.8
|
||||
|
||||
configurations {
|
||||
sharedResources
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
main {
|
||||
@@ -102,25 +102,24 @@ dependencies {
|
||||
runtime("antlr:antlr:$antlrVersion")
|
||||
|
||||
optional "javax.enterprise:cdi-api:$cdiVersion"
|
||||
compile "org.aspectj:aspectjweaver:$aspectjVersion"
|
||||
compile "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion"
|
||||
compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
|
||||
compile "org.aspectj:aspectjweaver:$aspectjVersion"
|
||||
|
||||
// Testing
|
||||
testCompile("org.springframework:spring-test:$springVersion") {
|
||||
exclude group: "commons-logging", module: "commons-logging"
|
||||
}
|
||||
testCompile "junit:junit:$junitVersion"
|
||||
testCompile "javax.annotation:jsr250-api:1.0", optional
|
||||
testCompile "org.apache.openwebbeans.test:cditest-owb:$openwebbeansVersion"
|
||||
testCompile "org.assertj:assertj-core:$assertjVersion"
|
||||
testCompile "org.hamcrest:hamcrest-core:$hamcrestVersion"
|
||||
testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion"
|
||||
testCompile "org.projectlombok:lombok:$lombokVersion"
|
||||
testCompile "org.mockito:mockito-core:$mockitoVersion"
|
||||
testCompile "junit:junit:$junitVersion"
|
||||
testCompile "edu.umd.cs.mtc:multithreadedtc:$multiThreadedtcVersion"
|
||||
|
||||
testCompile "javax.annotation:jsr250-api:1.0", optional
|
||||
|
||||
testRuntime "javax.el:el-api:$cdiVersion"
|
||||
testRuntime "javax.servlet:servlet-api:$servletApiVersion"
|
||||
testRuntime "log4j:log4j:$log4jVersion"
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
antlrVersion=2.7.7
|
||||
aspectjVersion=1.8.9
|
||||
assertjVersion=2.5.0
|
||||
assertjVersion=3.5.2
|
||||
cdiVersion=1.0
|
||||
gemfireVersion=8.2.1
|
||||
#gemfireVersion=8.2.2
|
||||
#gemfireVersion=9.0.0
|
||||
googleCodeFindbugsVersion=2.0.2
|
||||
hamcrestVersion=1.3
|
||||
jacksonVersion=2.8.1
|
||||
jacksonVersion=2.8.4
|
||||
junitVersion=4.12
|
||||
log4jVersion=1.2.17
|
||||
lombokVersion=1.16.10
|
||||
@@ -14,9 +16,9 @@ multiThreadedtcVersion=1.01
|
||||
openwebbeansVersion=1.2.8
|
||||
servletApiVersion=2.5
|
||||
slf4jVersion=1.7.21
|
||||
spring.range="[4.0.0, 5.0.0)"
|
||||
springVersion=4.3.3.RELEASE
|
||||
springDataBuildVersion=1.9.0.BUILD-SNAPSHOT
|
||||
springDataCommonsVersion=1.13.0.BUILD-SNAPSHOT
|
||||
spring.range="[5.0.0, 6.0.0)"
|
||||
springVersion=5.0.0.M3
|
||||
springDataBuildVersion=2.0.0.BUILD-SNAPSHOT
|
||||
springDataCommonsVersion=2.0.0.BUILD-SNAPSHOT
|
||||
springShellVersion=1.0.0.RELEASE
|
||||
version=1.9.0.BUILD-SNAPSHOT
|
||||
version=2.0.0.BUILD-SNAPSHOT
|
||||
|
||||
1
pom.xml
1
pom.xml
@@ -19,6 +19,7 @@
|
||||
<antlr.version>2.7.7</antlr.version>
|
||||
<assertj.version>2.5.0</assertj.version>
|
||||
<gemfire.version>8.2.1</gemfire.version>
|
||||
<!-- gemfire.version>9.0.0</gemfire.version -->
|
||||
<google-code-findbugs.version>2.0.2</google-code-findbugs.version>
|
||||
<multithreadedtc.version>1.01</multithreadedtc.version>
|
||||
<servlet-api.version>2.5</servlet-api.version>
|
||||
|
||||
Reference in New Issue
Block a user