diff --git a/backend/build.gradle b/backend/build.gradle index d49e8817b..08583ffc4 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -1,7 +1,7 @@ plugins { id 'groovy' id 'war' - id 'org.springframework.boot' version '2.1.5.RELEASE' + id 'org.springframework.boot' version '2.4.2' id 'com.gorylenko.gradle-git-properties' version '1.4.21' id 'io.franzbecker.gradle-lombok' version '1.13' id 'com.palantir.docker' version '0.20.1' @@ -132,7 +132,7 @@ dependencies { } // spring boot auto-config starters - ['starter-web', 'starter-data-jpa', 'starter-security', 'starter-actuator', 'devtools', 'starter-webflux', 'starter-thymeleaf', 'starter-mail'].each { + ['starter-web', 'starter-data-jpa', 'starter-security', 'starter-actuator', 'devtools', 'starter-webflux', 'starter-thymeleaf', 'starter-mail', 'starter-validation'].each { compile "org.springframework.boot:spring-boot-${it}" } // TODO: figure out what this should really be @@ -191,8 +191,8 @@ dependencies { integrationTestCompile 'jp.vmi:selenese-runner-java:3.20.0' integrationTestCompile "org.springframework.boot:spring-boot-starter-test" integrationTestCompile "org.springframework.security:spring-security-test" - integrationTestCompile "org.spockframework:spock-core:2.0-groovy-3.0-SNAPSHOT" - integrationTestCompile "org.spockframework:spock-spring:2.0-groovy-3.0-SNAPSHOT" + integrationTestCompile "org.spockframework:spock-core:1.3-groovy-2.5" + integrationTestCompile "org.spockframework:spock-spring:1.3-groovy-2.5" // CSV file support compile 'com.opencsv:opencsv:4.4' diff --git a/beacon/core/build.gradle b/beacon/core/build.gradle index 5c9689ebd..c80df0931 100644 --- a/beacon/core/build.gradle +++ b/beacon/core/build.gradle @@ -1,13 +1,13 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin plugins { - id 'org.springframework.boot' version '2.0.0.RELEASE' apply false + id 'org.springframework.boot' version '2.4.2' apply false id 'io.spring.dependency-management' version '1.0.6.RELEASE' } apply plugin: 'groovy' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = 11 +targetCompatibility = 11 repositories { jcenter() @@ -21,8 +21,8 @@ dependencyManagement { dependencies { testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile "org.spockframework:spock-core:1.1-groovy-2.4" - testCompile "org.spockframework:spock-spring:1.1-groovy-2.4" + testCompile "org.spockframework:spock-core:1.3-groovy-2.5" + testCompile "org.spockframework:spock-spring:1.3-groovy-2.5" testCompile 'org.junit.jupiter:junit-jupiter-api:5.5.2' testCompile 'org.junit.jupiter:junit-jupiter-engine:5.5.2' @@ -30,4 +30,4 @@ dependencies { jar { archiveName = "beacon-core-${version}.jar" -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index 71b9f0b2b..779b57b73 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ version=2.0.0-RC1-SNAPSHOT shibboleth.version=3.4.4 opensaml.version=3.4.3 -spring-boot.version=2.1.5.RELEASE +spring-boot.version=2.4.2 hibernate.version=5.3.14.Final