Update to Gradle 7

acceptance-test/build.gradle

@@ -27,7 +27,7 @@ sourceSets {
 configurations {
     all*.exclude module: 'spring-boot-starter-logging'
     all*.exclude group: "com.vaadin.external.google", module: "android-json"
-    acceptanceTestCompile.extendsFrom testCompile
+    acceptanceTestImplementation.extendsFrom testImplementation
     acceptanceTestRuntime.extendsFrom testRuntime
 }
 
@@ -37,74 +37,35 @@ dependencies {
     ext['json-path'] = '2.4.0'
     ext['jsonassert'] = '1.5.0'
 
-    compile project(':core-common')
-    compile project(':core-metastore')
-    compile project(':core-services')
-
-    compile "org.springframework.boot:spring-boot-starter-parent:${springBootVersion}"
-    compile project(':api-publishing')
-    compile project(':api-consumption')
-    compile project(':api-metastore')
-    compile project(':api-cursors')
-    compile project(':api-misc')
-    compile project(':app')
+    implementation project(':core-services')
+    implementation project(':api-metastore')
+    implementation project(':api-cursors')
 
     // spring
-    compile("org.springframework.boot:spring-boot-starter-web") {
+    implementation("org.springframework.boot:spring-boot-starter-web") {
         exclude module: 'logback-classic'
         exclude module: 'log4j-over-slf4j'
         exclude module: 'spring-boot-starter-tomcat'
     }
-    compile "org.springframework:spring-context"
-    compile "org.springframework:spring-web"
-    compile "org.springframework:spring-webmvc"
-    compile "org.springframework.boot:spring-boot-starter-jetty"
-
-    compile('org.springframework.boot:spring-boot-starter-security') {
+    implementation "org.springframework.boot:spring-boot-starter-jetty"
+    implementation "org.springframework.boot:spring-boot-starter-json"
+    implementation('org.springframework.boot:spring-boot-starter-security') {
         exclude module: "logback-classic"
     }
 
-    compile "org.apache.kafka:kafka-clients:$kafkaClientVersion"
-
-    compile 'org.slf4j:slf4j-log4j12'
-
-    compile "org.springframework.boot:spring-boot-starter-json"
-    compile 'org.zalando:jackson-datatype-problem:0.22.0'
-    compile 'org.zalando:problem:0.22.0'
-    compile 'org.json:json:20180130'
-
-    compile('org.zalando.stups:stups-spring-oauth2-server:1.0.24') {
-        exclude module: "httpclient"
-    }
+    runtimeOnly 'org.zalando:jackson-datatype-problem:0.22.0'
+    runtimeOnly "org.apache.kafka:kafka-clients:$kafkaClientVersion"
 
     // tests
-    testCompile 'org.hamcrest:hamcrest-all:1.3'
-    testCompile('org.junit.jupiter:junit-jupiter-api:5.5.2') {
-        exclude module: "hamcrest-core"
-    }
-    testCompile "org.springframework:spring-test"
-    testCompile 'org.springframework.boot:spring-boot-test'
-    testCompile 'org.springframework.boot:spring-boot-starter-test'
-    testCompile 'org.skyscreamer:jsonassert'
-    testCompile 'uk.co.datumedge:hamcrest-json:0.2'
-    testCompile('com.jayway.restassured:rest-assured:2.9.0') {
-        exclude module: "hamcrest-core"
-        exclude module: "hamcrest-library"
-    }
-    testCompile 'com.jayway.jsonpath:json-path'
-    testRuntime 'org.pegdown:pegdown:1.6.0'
-    testCompile project(path: ':core-common', configuration: 'testOutput')
-    testCompile project(path: ':core-services', configuration: 'testOutput')
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation project(path: ':core-services', configuration: 'testOutput')
 
-    testCompile 'junit:junit:4.13.1'
+    testRuntimeOnly 'org.pegdown:pegdown:1.6.0'
 }
 
-task acceptanceTest(type: Test) {
+tasks.register("acceptanceTest", Test.class) {
     classpath = sourceSets.acceptanceTest.runtimeClasspath
     testClassesDirs = sourceSets.acceptanceTest.output.classesDirs
-}
-
-acceptanceTest {
     testLogging {
         events "passed", "skipped", "failed"
     }

api-consumption/build.gradle

@@ -30,79 +30,66 @@ dependencies {
     implementation project(':core-metastore')
 
     // spring
-    compile("org.springframework.boot:spring-boot-starter-web") {
+    implementation("org.springframework.boot:spring-boot-starter-web") {
         exclude module: 'logback-classic'
         exclude module: 'log4j-over-slf4j'
         exclude module: 'spring-boot-starter-tomcat'
     }
-    compile "org.springframework.boot:spring-boot-starter-jetty"
-
-    // oauth
-    compile('org.springframework.security.oauth:spring-security-oauth2:2.5.0.RELEASE') {
-        exclude module: 'spring-webmvc'
-        exclude module: 'spring-security-config'
-        exclude module: 'spring-beans'
-        exclude module: 'spring-core'
-        exclude module: 'spring-context'
-    }
-    compile('org.springframework.boot:spring-boot-starter-security') {
+    implementation "org.springframework.boot:spring-boot-starter-json"
+    implementation "org.springframework.boot:spring-boot-starter-jetty"
+    implementation('org.springframework.boot:spring-boot-starter-security') {
         exclude module: "logback-classic"
     }
+    implementation("org.springframework.boot:spring-boot-starter-jdbc") {
+        exclude module: 'HikariCP'
+    }
 
-    compile 'org.zalando:nakadi-plugin-api:3.2.1'
-    compile 'com.google.guava:guava:30.1-jre'
-    compile 'org.apache.commons:commons-lang3:3.8.1'
-
-    compile "org.springframework.boot:spring-boot-starter-json"
-    compile 'org.zalando:jackson-datatype-problem:0.22.0'
-    compile 'org.zalando:problem:0.22.0'
-    compile 'org.json:json:20180130'
-
-    compile 'org.slf4j:slf4j-log4j12'
+    implementation "org.apache.avro:avro:1.11.0"
+    implementation 'org.zalando:problem:0.22.0'
+    implementation 'org.zalando:problem-spring-web:0.23.0'
+    implementation 'com.google.guava:guava:30.1-jre'
+    implementation "org.zalando:nakadi-plugin-api:$nakadiPluginApiVersion"
+    implementation "org.apache.kafka:kafka-clients:$kafkaClientVersion"
+    implementation "io.dropwizard.metrics:metrics-core:$dropwizardVersion"
+
+    //Previously transitive dependencies
+    implementation "com.fasterxml.jackson.core:jackson-core:$fasterXmlJacksonVersion"
+    implementation "com.fasterxml.jackson.core:jackson-databind:$fasterXmlJacksonDatabindVersion"
+    implementation 'com.google.code.findbugs:jsr305:3.0.2'
+    implementation 'jakarta.annotation:jakarta.annotation-api:1.3.5'
+    implementation 'jakarta.servlet:jakarta.servlet-api:4.0.4'
+    implementation 'javax.validation:validation-api:2.0.1.Final'
+    implementation 'org.slf4j:slf4j-api:1.7.36'
+    implementation "org.springframework:spring-beans:$springframeworkVersion"
+    implementation "org.springframework:spring-context:$springframeworkVersion"
+    implementation "org.springframework:spring-core:$springframeworkVersion"
+    implementation "org.springframework:spring-web:$springframeworkVersion"
+    implementation "org.springframework:spring-webmvc:$springframeworkVersion"
 
     // open tracing
-    compile "io.opentracing:opentracing-api:$opentracingVersion"
-    compile "io.opentracing:opentracing-util:$opentracingVersion"
+    implementation "io.opentracing:opentracing-api:$opentracingVersion"
 
-    compile "org.apache.kafka:kafka-clients:$kafkaClientVersion"
-
-    compile("org.apache.curator:curator-recipes:$curatorVersion") {
-        exclude module: "zookeeper"
-    }
-    compile("org.apache.zookeeper:zookeeper:$zookeeperVersion"){
-        exclude module: "log4j"
-    }
-
-    compile 'org.echocat.jomon:runtime:1.6.3'
-    compile 'com.googlecode.libphonenumber:libphonenumber:8.12.7'
-
-    compile "io.dropwizard.metrics:metrics-core:$dropwizardVersion"
-    compile ("com.ryantenney.metrics:metrics-spring:$dropwizardVersion") {
+    runtimeOnly("com.ryantenney.metrics:metrics-spring:$dropwizardVersion") {
         exclude module: 'spring-core'
     }
-    compile "io.dropwizard.metrics:metrics-servlets:$dropwizardVersion"
-    compile "io.dropwizard.metrics:metrics-jvm:$dropwizardVersion"
-
-    compile("org.springframework.boot:spring-boot-starter-jdbc") {
-        exclude module: 'HikariCP'
-    }
-    compile 'org.apache.tomcat:tomcat-jdbc'
-    compile 'org.postgresql:postgresql:42.3.2'
-
-    compile('commons-beanutils:commons-beanutils:1.9.4')
-    compile('com.github.everit-org.json-schema:org.everit.json.schema:1.8.0') {
-        exclude module: "json"
-    }
+    runtimeOnly 'org.zalando:jackson-datatype-problem:0.22.0'
+    runtimeOnly 'org.echocat.jomon:runtime:1.6.3'
+    runtimeOnly "org.postgresql:postgresql:$postgresqlVersion"
 
     // tests
-    testCompile 'org.hamcrest:hamcrest-all:1.3'
-    testCompile('org.junit.jupiter:junit-jupiter-api:5.5.2') {
+    testImplementation 'org.json:json:20180130'
+    testImplementation 'org.hamcrest:hamcrest-all:1.3'
+    testImplementation('org.junit.jupiter:junit-jupiter-api:5.5.2') {
         exclude module: "hamcrest-core"
     }
-    testCompile "org.springframework:spring-test"
-    testCompile 'org.springframework.boot:spring-boot-test'
-    testCompile 'org.springframework.boot:spring-boot-starter-test'
-    testCompile project(path: ':core-common', configuration: 'testOutput')
+    testImplementation "org.springframework:spring-test"
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'com.vaadin.external.google:android-json:0.0.20131108.vaadin1'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.hamcrest:hamcrest:2.2'
+    testImplementation 'org.mockito:mockito-core:3.9.0'
+    testImplementation 'uk.co.datumedge:hamcrest-json:0.2'
+    testImplementation project(path: ':core-common', configuration: 'testOutput')
 }
 // end::dependencies[]
 

api-cursors/build.gradle

@@ -30,62 +30,42 @@ dependencies {
     implementation project(':core-metastore')
 
     // spring
-    compile("org.springframework.boot:spring-boot-starter-web") {
+    implementation("org.springframework.boot:spring-boot-starter-web") {
         exclude module: 'logback-classic'
         exclude module: 'log4j-over-slf4j'
         exclude module: 'spring-boot-starter-tomcat'
     }
-
-    // validation
-    compile("org.springframework.boot:spring-boot-starter-validation")
-
-    // oauth
-    compile('org.springframework.security.oauth:spring-security-oauth2:2.5.0.RELEASE') {
-        exclude module: 'spring-webmvc'
-        exclude module: 'spring-security-config'
-        exclude module: 'spring-beans'
-        exclude module: 'spring-core'
-        exclude module: 'spring-context'
-    }
-    compile('org.springframework.boot:spring-boot-starter-security') {
+    implementation "org.springframework:spring-beans:$springframeworkVersion"
+    implementation "org.springframework:spring-context:$springframeworkVersion"
+    implementation "org.springframework:spring-web:$springframeworkVersion"
+    implementation "org.springframework.boot:spring-boot-starter-json"
+    implementation("org.springframework.boot:spring-boot-starter-validation")
+    implementation('org.springframework.boot:spring-boot-starter-security') {
         exclude module: "logback-classic"
     }
 
-    compile 'org.zalando:nakadi-plugin-api:3.2.1'
-    compile 'com.google.guava:guava:30.1-jre'
-    compile 'org.apache.commons:commons-lang3:3.8.1'
-
-    compile "org.springframework.boot:spring-boot-starter-json"
-    compile 'org.zalando:jackson-datatype-problem:0.22.0'
-    compile 'org.zalando:problem:0.22.0'
-    compile 'org.json:json:20180130'
-
-    compile 'org.slf4j:slf4j-log4j12'
-
-    // open tracing
-    compile "io.opentracing:opentracing-api:$opentracingVersion"
-    compile "io.opentracing:opentracing-util:$opentracingVersion"
+    implementation 'org.zalando:problem:0.22.0'
+    implementation 'org.zalando:problem-spring-web:0.23.0'
+    implementation 'com.google.guava:guava:30.1-jre'
+    implementation "io.opentracing:opentracing-api:$opentracingVersion"
+    implementation 'jakarta.annotation:jakarta.annotation-api:1.3.5'
+    implementation 'jakarta.validation:jakarta.validation-api:2.0.2'
+    implementation 'javax.validation:validation-api:2.0.1.Final'
+    implementation 'org.slf4j:slf4j-api:1.7.36'
 
-    compile("org.apache.curator:curator-recipes:$curatorVersion") {
-        exclude module: "zookeeper"
-    }
-    compile("org.apache.zookeeper:zookeeper:$zookeeperVersion"){
-        exclude module: "log4j"
-    }
-
-    compile 'org.zalando:problem-spring-web:0.23.0'
+    runtimeOnly 'org.zalando:jackson-datatype-problem:0.22.0'
 
     // tests
-    testCompile 'org.hamcrest:hamcrest-all:1.3'
-    testCompile('org.junit.jupiter:junit-jupiter-api:5.5.2') {
-        exclude module: "hamcrest-core"
-    }
-    testCompile "org.springframework:spring-test"
-    testCompile 'org.springframework.boot:spring-boot-test'
-    testCompile 'org.springframework.boot:spring-boot-starter-test'
-
-    testCompile project(path: ':core-common', configuration: 'testOutput')
-
+    testImplementation "org.zalando:nakadi-plugin-api:$nakadiPluginApiVersion"
+    testImplementation 'org.hamcrest:hamcrest-all:1.3'
+    testImplementation "org.springframework:spring-test"
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation "com.fasterxml.jackson.core:jackson-databind:$fasterXmlJacksonDatabindVersion"
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.hamcrest:hamcrest:2.2'
+    testImplementation 'org.mockito:mockito-core:3.9.0'
+    testImplementation 'uk.co.datumedge:hamcrest-json:0.2'
+    testImplementation project(path: ':core-common', configuration: 'testOutput')
 }
 // end::dependencies[]
 

api-metastore/build.gradle

@@ -24,20 +24,49 @@ dependencies {
     implementation project(':core-services')
     implementation project(':core-metastore')
 
-    compile 'org.json:json:20180130'
-
-    // validation
-    compile("org.springframework.boot:spring-boot-starter-validation")
+    implementation 'org.json:json:20180130'
+    implementation 'com.google.guava:guava:30.1-jre'
+    implementation 'commons-lang:commons-lang:2.6'
+    implementation "org.springframework:spring-beans:$springframeworkVersion"
+    implementation "org.springframework:spring-context:$springframeworkVersion"
+    implementation "org.springframework:spring-core:$springframeworkVersion"
+    implementation "org.springframework:spring-tx:$springframeworkVersion"
+    implementation "org.springframework:spring-web"
+    implementation("org.springframework.boot:spring-boot-starter-jdbc") {
+        exclude module: 'HikariCP'
+    }
+    implementation('com.github.everit-org.json-schema:org.everit.json.schema:1.8.0') {
+        exclude module: "json"
+    }
+    implementation "org.apache.avro:avro:1.11.0"
+    implementation "org.zalando:nakadi-plugin-api:$nakadiPluginApiVersion"
+    implementation 'org.zalando:problem:0.22.0'
+    implementation 'org.zalando:problem-spring-web:0.23.0'
+    implementation 'org.slf4j:slf4j-api:1.7.36'
+    implementation 'org.echocat.jomon:runtime:1.6.3'
+    implementation "io.opentracing:opentracing-api:$opentracingVersion"
+    implementation "org.springframework.boot:spring-boot-starter-validation"
+    implementation "com.fasterxml.jackson.core:jackson-annotations:$fasterXmlJacksonVersion"
+    implementation "com.fasterxml.jackson.core:jackson-core:$fasterXmlJacksonVersion"
+    implementation "com.fasterxml.jackson.core:jackson-databind:$fasterXmlJacksonDatabindVersion"
+    implementation 'com.google.code.findbugs:jsr305:3.0.2'
+    implementation 'jakarta.annotation:jakarta.annotation-api:1.3.5'
+    implementation 'jakarta.validation:jakarta.validation-api:2.0.2'
+    implementation 'javax.validation:validation-api:2.0.1.Final'
 
-    testCompile 'org.hamcrest:hamcrest-all:1.3'
-    testCompile('org.junit.jupiter:junit-jupiter-api:5.5.2') {
+    testImplementation 'org.hamcrest:hamcrest-all:1.3'
+    testImplementation('org.junit.jupiter:junit-jupiter-api:5.5.2') {
         exclude module: "hamcrest-core"
     }
-    testCompile "org.springframework:spring-test"
-    testCompile 'org.springframework.boot:spring-boot-test'
-    testCompile 'org.springframework.boot:spring-boot-starter-test'
-    testCompile project(path: ':core-common', configuration: 'testOutput')
-    testCompile project(path: ':core-services', configuration: 'testOutput')
+    testImplementation "org.springframework:spring-test"
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'com.vaadin.external.google:android-json:0.0.20131108.vaadin1'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.hamcrest:hamcrest:2.2'
+    testImplementation 'org.mockito:mockito-core:3.9.0'
+    testImplementation 'uk.co.datumedge:hamcrest-json:0.2'
+    testImplementation project(path: ':core-common', configuration: 'testOutput')
+    testImplementation project(path: ':core-services', configuration: 'testOutput')
 }
 
 bootJar {