From 8aec4da081e5180183ff06e3338a82b7154b6b1d Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Thu, 4 Feb 2021 16:22:36 -0500 Subject: [PATCH] wip1 --- backend/build.gradle | 14 +++++++------- beacon/build.gradle | 2 +- beacon/spring/build.gradle | 4 ++-- pac4j-module/build.gradle | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index a6c3f2dc8..77ec52afc 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -11,8 +11,8 @@ plugins { apply plugin: 'io.spring.dependency-management' apply plugin: 'jacoco' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = 11 +targetCompatibility = 11 repositories { jcenter() @@ -152,7 +152,7 @@ dependencies { //For easy data mocking capabilities compile 'net.andreinc.mockneat:mockneat:0.1.4' - compile 'org.codehaus.groovy:groovy-all:2.4.15' + compile 'org.codehaus.groovy:groovy-all:3.0.7' //So it works on Java 9 without explicitly requiring to load that module (needed by Hibernate) runtimeOnly 'javax.xml.bind:jaxb-api:2.3.0' @@ -170,8 +170,8 @@ dependencies { testCompile "org.springframework.boot:spring-boot-starter-test" testCompile "org.springframework.security:spring-security-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:2.0-groovy-3.0-SNAPSHOT" + testCompile "org.spockframework:spock-spring:2.0-groovy-3.0-SNAPSHOT" testCompile "org.xmlunit:xmlunit-core:2.5.1" testRuntime 'cglib:cglib-nodep:3.2.5' @@ -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:1.1-groovy-2.4" - integrationTestCompile "org.spockframework:spock-spring:1.1-groovy-2.4" + integrationTestCompile "org.spockframework:spock-core:2.0-groovy-3.0-SNAPSHOT" + integrationTestCompile "org.spockframework:spock-spring:2.0-groovy-3.0-SNAPSHOT" // CSV file support compile 'com.opencsv:opencsv:4.4' diff --git a/beacon/build.gradle b/beacon/build.gradle index a0d845ead..e38845294 100644 --- a/beacon/build.gradle +++ b/beacon/build.gradle @@ -1,4 +1,4 @@ allprojects { group = 'edu.internet2.tap.beacon' - version = '1.0.0-SNAPSHOT' + version = '1.0.0' } \ No newline at end of file diff --git a/beacon/spring/build.gradle b/beacon/spring/build.gradle index bb895f0e6..61ab07be5 100644 --- a/beacon/spring/build.gradle +++ b/beacon/spring/build.gradle @@ -6,8 +6,8 @@ plugins { } apply plugin: 'java' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = 11 +targetCompatibility = 11 repositories { jcenter() diff --git a/pac4j-module/build.gradle b/pac4j-module/build.gradle index 1e4a304ee..9e3a69da9 100644 --- a/pac4j-module/build.gradle +++ b/pac4j-module/build.gradle @@ -5,8 +5,8 @@ plugins { id 'io.spring.dependency-management' version '1.0.7.RELEASE' } -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = 11 +targetCompatibility = 11 repositories { jcenter() @@ -34,8 +34,8 @@ dependencies { testCompile project(':backend') 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:2.0-groovy-3.0-SNAPSHOT" + testCompile "org.spockframework:spock-spring:2.0-groovy-3.0-SNAPSHOT" annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" } \ No newline at end of file