Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-08-05 17:57:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to Java 8 compatibility

Browse Source 
* Spring IO Athens-BUILD-SNAPSHOT -> Cairo-BUILD-SNAPSHOT
* CGLib 3.1 -> 3.2.5 latest release Issue related to ASM https://github.com/cglib/cglib/issues/20
* AssertJ 2.2.0 -> 3.6.2 latest release
* PowerMock 1.6.2 -> 1.6.5 latest release is 1.6.6 but has regression Issue https://github.com/powermock/powermock/issues/717
* Update maven-compiler-plugin source/target to 1.8
This commit is contained in:
Joe Grandja
2017-03-20 15:38:03 -04:00
parent 8a05548dcb
commit 2b81983f7c
4 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle/javaprojects.gradle
+6 -5
View File
@@ -5,13 +5,13 @@ apply plugin: 'javadocHotfix'
apply plugin: 'propdeps'
apply plugin: 'propdeps-maven'
sourceCompatibility = 1.6
targetCompatibility = 1.6
sourceCompatibility = 1.8
targetCompatibility = 1.8
ext.apacheDsVersion = '1.5.5'
ext.aspectjVersion = '1.8.4'
ext.casClientVersion = '3.4.1'
ext.cglibVersion = '3.1'
ext.cglibVersion = '3.2.5'
ext.commonsCodecVersion = '1.10'
ext.commonsCollectionsVersion = '3.2.2'
ext.commonsLoggingVersion = '1.2'
@@ -27,7 +27,7 @@ ext.jettyVersion = '6.1.26'
ext.jstlVersion = '1.2.1'
ext.junitVersion = '4.12'
ext.logbackVersion = '1.1.2'
ext.powerMockVersion = '1.6.2'
ext.powerMockVersion = '1.6.5'
ext.seleniumVersion = '2.44.0'
ext.servletApiVersion = '3.1.0'
ext.slf4jVersion = '1.7.7'
@@ -41,6 +41,7 @@ ext.thymeleafVersion = '3.0.2.RELEASE'
ext.jsonassertVersion = '1.3.0'
ext.validationApiVersion = '1.1.0.Final'
ext.spockDependencies = [
dependencies.create("org.spockframework:spock-spring:$spockVersion") {
exclude group: 'junit', module: 'junit-dep'
@@ -148,7 +149,7 @@ dependencies {
testCompile "junit:junit:$junitVersion",
'org.mockito:mockito-core:1.10.19',
"org.springframework:spring-test:$springVersion",
'org.assertj:assertj-core:2.2.0'
'org.assertj:assertj-core:3.6.2'
// Use slf4j/logback for logging
testRuntime "org.slf4j:jcl-over-slf4j:$slf4jVersion",
gradle/maven-deployment.gradle
+8 -3
View File
@@ -67,7 +67,12 @@ def customizePom(pom, gradleProject) {
developer {
id = 'rwinch'
name = 'Rob Winch'
email = 'rwinch@gopivotal.com'
email = 'rwinch@pivotal.io'
}
developer {
id = 'jgrandja'
name = 'Joe Grandja'
email = 'jgrandja@pivotal.io'
}
}
@@ -113,8 +118,8 @@ def customizePom(pom, gradleProject) {
.appendNode('plugin')
.appendNode('artifactId','maven-compiler-plugin').parent()
.appendNode('configuration')
.appendNode('source','1.7').parent()
.appendNode('target','1.7')
.appendNode('source','1.8').parent()
.appendNode('target','1.8')
if(isWar) {
plugins
.appendNode('plugin')