diff --git a/acceptance-test/build.gradle b/acceptance-test/build.gradle
index fe0e54ba55..c794beaf96 100644
--- a/acceptance-test/build.gradle
+++ b/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"
     }
diff --git a/acceptance-test/settings.gradle b/acceptance-test/settings.gradle
deleted file mode 100644
index 6ea2b81bd2..0000000000
--- a/acceptance-test/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'acceptance-test'
diff --git a/api-consumption/build.gradle b/api-consumption/build.gradle
index 2f4ac34352..0cf21e3310 100644
--- a/api-consumption/build.gradle
+++ b/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[]
 
diff --git a/api-consumption/settings.gradle b/api-consumption/settings.gradle
deleted file mode 100644
index 5d63330116..0000000000
--- a/api-consumption/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'api-consumption'
diff --git a/api-cursors/build.gradle b/api-cursors/build.gradle
index 8555435cb0..dba03e6fef 100644
--- a/api-cursors/build.gradle
+++ b/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[]
 
diff --git a/api-cursors/settings.gradle b/api-cursors/settings.gradle
deleted file mode 100644
index 3bab235b6b..0000000000
--- a/api-cursors/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'api-cursors'
diff --git a/api-metastore/build.gradle b/api-metastore/build.gradle
index 2c7b566b93..bee4f585be 100644
--- a/api-metastore/build.gradle
+++ b/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 {
diff --git a/api-metastore/settings.gradle b/api-metastore/settings.gradle
deleted file mode 100644
index bd4c45a597..0000000000
--- a/api-metastore/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'api-metastore'
diff --git a/api-misc/build.gradle b/api-misc/build.gradle
index f0b3c69dfb..395a11caa0 100644
--- a/api-misc/build.gradle
+++ b/api-misc/build.gradle
@@ -29,55 +29,41 @@ dependencies {
     implementation project(':core-services')
 
     // 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'
     }
-
-    // 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-security') {
         exclude module: "logback-classic"
     }
+    implementation "org.springframework.boot:spring-boot-starter-json"
+    implementation 'org.springframework.boot:spring-boot:2.5.12'
+    implementation "org.springframework:spring-beans:$springframeworkVersion"
+    implementation "org.springframework:spring-context:$springframeworkVersion"
+    implementation "org.springframework:spring-web:$springframeworkVersion"
 
-    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 "com.fasterxml.jackson.core:jackson-core:$fasterXmlJacksonVersion"
+    implementation "com.fasterxml.jackson.core:jackson-databind:$fasterXmlJacksonDatabindVersion"
+    implementation 'jakarta.annotation:jakarta.annotation-api:1.3.5'
+    implementation 'javax.validation:validation-api:2.0.1.Final'
+    implementation 'org.slf4j:slf4j-api:1.7.36'
+    implementation "org.apache.avro:avro:1.11.0"
+    implementation 'org.json:json:20180130'
+    implementation "org.zalando:nakadi-plugin-api:$nakadiPluginApiVersion"
+    implementation 'org.zalando:problem:0.22.0'
+    implementation 'org.zalando:problem-spring-web:0.23.0'
 
-    // open tracing
-    compile "io.opentracing:opentracing-api:$opentracingVersion"
-    compile "io.opentracing:opentracing-util:$opentracingVersion"
-
-    compile("org.apache.curator:curator-recipes:$curatorVersion") {
-        exclude module: "zookeeper"
-    }
-    compile("org.apache.zookeeper:zookeeper:$zookeeperVersion"){
-        exclude module: "log4j"
-    }
+    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 'com.google.guava:guava:30.1-jre'
+    testImplementation 'com.vaadin.external.google:android-json:0.0.20131108.vaadin1'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:3.9.0'
+    testImplementation "org.springframework:spring-test"
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation project(path: ':core-common', configuration: 'testOutput')
 }
 
 bootJar {
diff --git a/api-misc/settings.gradle b/api-misc/settings.gradle
deleted file mode 100644
index db351805f1..0000000000
--- a/api-misc/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'api-misc'
diff --git a/api-publishing/build.gradle b/api-publishing/build.gradle
index c6bcf90881..106392c1b2 100644
--- a/api-publishing/build.gradle
+++ b/api-publishing/build.gradle
@@ -23,14 +23,34 @@ dependencies {
     implementation project(':core-common')
     implementation project(':core-services')
 
-    testCompile 'org.hamcrest:hamcrest-all:1.3'
-    testCompile('org.junit.jupiter:junit-jupiter-api:5.5.2') {
-        exclude module: "hamcrest-core"
+    implementation "org.apache.avro:avro:1.11.0"
+    implementation "org.springframework:spring-web"
+    implementation 'com.google.guava:guava:30.1-jre'
+    implementation 'org.zalando:problem:0.22.0'
+    implementation 'org.zalando:problem-spring-web:0.23.0'
+    implementation "io.opentracing:opentracing-api:$opentracingVersion"
+    implementation "org.springframework.boot:spring-boot-starter-jetty"
+    implementation('org.springframework.boot:spring-boot-starter-security') {
+        exclude module: "logback-classic"
     }
-    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')
+    implementation 'org.json:json:20180130'
+    implementation "org.zalando:nakadi-plugin-api:$nakadiPluginApiVersion"
+    implementation 'jakarta.annotation:jakarta.annotation-api:1.3.5'
+    implementation 'jakarta.servlet:jakarta.servlet-api:4.0.4'
+    implementation 'org.slf4j:slf4j-api:1.7.36'
+    implementation "org.springframework:spring-beans:$springframeworkVersion"
+    implementation "org.springframework:spring-context:$springframeworkVersion"
+
+    testImplementation 'org.hamcrest:hamcrest-all:1.3'
+    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 'io.dropwizard.metrics:metrics-core:4.1.31'
+    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[]
 
@@ -39,4 +59,4 @@ bootJar {
 }
 jar {
     enabled = true
-}
\ No newline at end of file
+}
diff --git a/api-publishing/settings.gradle b/api-publishing/settings.gradle
deleted file mode 100644
index dc5db37faf..0000000000
--- a/api-publishing/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'api-publishing'
diff --git a/app/build.gradle b/app/build.gradle
index ba74c683e0..e02dcab651 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,113 +27,109 @@ dependencies {
     ext['json-path'] = '2.4.0'
     ext['jsonassert'] = '1.5.0'
 
-    compile project(':core-common')
-    compile project(':core-metastore')
-    compile project(':core-services')
+    implementation project(':core-common')
+    implementation project(':core-metastore')
+    implementation project(':core-services')
 
-    compile project(':api-publishing')
-    compile project(':api-consumption')
-    compile project(':api-metastore')
-    compile project(':api-cursors')
-    compile project(':api-misc')
+    implementation project(':api-publishing')
+    implementation project(':api-consumption')
+    implementation project(':api-metastore')
+    implementation project(':api-cursors')
+    implementation project(':api-misc')
 
-    compile "org.glassfish.jaxb:jaxb-runtime"
-
-    compile "org.apache.kafka:kafka-clients:$kafkaClientVersion"
-
-    compile "org.springframework.boot:spring-boot-starter-parent:${springBootVersion}"
-    implementation 'org.springframework.boot:spring-boot-starter'
-
-    compile "org.springframework.boot:spring-boot-starter-security"
 
     // spring
-    compile("org.springframework.boot:spring-boot-starter-web") {
+    implementation 'org.springframework.boot:spring-boot-starter'
+    implementation "org.springframework.boot:spring-boot-starter-security"
+    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-core"
-    compile "org.springframework:spring-beans"
-    compile "org.springframework:spring-context"
-    compile "org.springframework:spring-web"
-    compile "org.springframework:spring-webmvc"
-    compile "org.springframework.boot:spring-boot-starter-jetty"
+    implementation "org.springframework:spring-core"
+    implementation "org.springframework:spring-beans"
+    implementation "org.springframework:spring-context"
+    implementation "org.springframework:spring-web"
+    implementation "org.springframework:spring-webmvc"
+    implementation "org.springframework.boot:spring-boot-starter-jetty"
 
     // oauth
-    compile('org.springframework.security.oauth:spring-security-oauth2:2.5.0.RELEASE') {
+    implementation('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-security') {
         exclude module: "logback-classic"
     }
 
     // actuator
-    compile "org.springframework.boot:spring-boot-starter-actuator"
-    compile('org.zalando.zmon:zmon-actuator:0.9.8') {
-        exclude module: 'spring-webmvc'
-        exclude module: 'spring-boot-autoconfigure'
-    }
+    implementation "org.springframework.boot:spring-boot-starter-actuator"
 
     // storage
-    compile("org.springframework.boot:spring-boot-starter-jdbc") {
+    implementation("org.springframework.boot:spring-boot-starter-jdbc") {
         exclude module: 'HikariCP'
     }
-    compile 'org.apache.tomcat:tomcat-jdbc'
-    compile 'org.postgresql:postgresql:42.3.2'
 
     // misc
-    compile 'org.apache.httpcomponents:httpclient'
-    compile('org.zalando.stups:stups-spring-oauth2-server:1.0.24') {
+    implementation 'org.apache.httpcomponents:httpclient'
+    implementation('org.zalando.stups:stups-spring-oauth2-server:1.0.24') {
         exclude module: "httpclient"
     }
-    compile 'org.zalando:jackson-datatype-problem:0.22.0'
-    compile 'org.zalando:problem:0.22.0'
-    compile 'org.zalando:problem-spring-web:0.23.0'
-    compile 'com.google.guava:guava:30.1-jre'
-    compile 'org.slf4j:slf4j-log4j12'
-    compile "io.dropwizard.metrics:metrics-core:$dropwizardVersion"
-    compile("com.ryantenney.metrics:metrics-spring:$dropwizardVersion") {
+    implementation 'org.zalando:problem:0.22.0'
+    implementation 'com.google.guava:guava:30.1-jre'
+    implementation "io.dropwizard.metrics:metrics-core:$dropwizardVersion"
+    implementation("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.apache.commons:commons-lang3:3.8.1'
-    compile 'org.zalando:nakadi-plugin-api:3.2.1'
-    compile 'org.echocat.jomon:runtime:1.6.3'
-    compile 'com.googlecode.libphonenumber:libphonenumber:8.12.7'
-
-    compile("org.apache.curator:curator-recipes:$curatorVersion") {
-        exclude module: "zookeeper"
-    }
-    compile("org.apache.zookeeper:zookeeper:$zookeeperVersion"){
+    implementation "io.dropwizard.metrics:metrics-servlets:$dropwizardVersion"
+    implementation "io.dropwizard.metrics:metrics-jvm:$dropwizardVersion"
+    implementation "org.zalando:nakadi-plugin-api:$nakadiPluginApiVersion"
+    implementation("org.apache.zookeeper:zookeeper:$zookeeperVersion"){
         exclude module: "log4j"
     }
-
-    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"
-    }
-    compile "org.springframework.boot:spring-boot-starter-json"
-    compile 'org.json:json:20180130'
-
-    // open tracing
-    compile "io.opentracing:opentracing-api:$opentracingVersion"
-    compile "io.opentracing:opentracing-util:$opentracingVersion"
+    implementation "org.springframework.boot:spring-boot-starter-json"
+    implementation 'javax.servlet:javax.servlet-api:4.0.1'
+    implementation 'log4j:log4j:1.2.17'
+    implementation "org.apache.avro:avro:1.11.0"
+    implementation 'ch.qos.reload4j:reload4j:1.2.19'
+    implementation "com.fasterxml.jackson.core:jackson-core:$fasterXmlJacksonVersion"
+    implementation "com.fasterxml.jackson.core:jackson-databind:$fasterXmlJacksonDatabindVersion"
+    implementation 'jakarta.annotation:jakarta.annotation-api:1.3.5'
+    implementation 'jakarta.servlet:jakarta.servlet-api:4.0.4'
+    implementation 'joda-time:joda-time:2.9.4'
+    implementation 'org.apache.curator:curator-client:5.1.0'
+    implementation 'org.apache.curator:curator-framework:5.1.0'
+    implementation 'org.apache.httpcomponents:httpcore:4.4.15'
+    implementation 'org.eclipse.jetty:jetty-http:9.4.45.v20220203'
+    implementation 'org.eclipse.jetty:jetty-server:9.4.45.v20220203'
+    implementation 'org.eclipse.jetty:jetty-util:9.4.45.v20220203'
+    implementation 'org.slf4j:slf4j-api:1.7.36'
+    implementation 'org.springframework.boot:spring-boot-autoconfigure:2.5.12'
+    implementation 'org.springframework.boot:spring-boot:2.5.12'
+    implementation 'org.springframework.security:spring-security-config:5.5.5'
+    implementation 'org.springframework.security:spring-security-core:5.5.5'
+    implementation 'org.springframework.security:spring-security-web:5.5.5'
+
+    runtimeOnly "org.postgresql:postgresql:$postgresqlVersion"
+    runtimeOnly "org.glassfish.jaxb:jaxb-runtime"
+    runtimeOnly 'org.echocat.jomon:runtime:1.6.3'
+    runtimeOnly "org.apache.kafka:kafka-clients:$kafkaClientVersion"
+    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')
-    testCompile project(path: ':core-services', configuration: 'testOutput')
+    testImplementation 'org.hamcrest:hamcrest-all:1.3'
+    testImplementation "org.springframework:spring-test"
+    testImplementation 'org.springframework.boot:spring-boot-test'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'com.google.code.findbugs:jsr305:3.0.2'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.hamcrest:hamcrest:2.2'
+    testImplementation 'org.mockito:mockito-core:3.9.0'
+    testImplementation project(path: ':core-common', configuration: 'testOutput')
+    testImplementation project(path: ':core-services', configuration: 'testOutput')
 }
 // end::dependencies[]
 
diff --git a/app/settings.gradle b/app/settings.gradle
deleted file mode 100644
index 0cdaa80e40..0000000000
--- a/app/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'app'
diff --git a/build.gradle b/build.gradle
index 110ec9e733..b12277af1b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,7 @@
+plugins {
+    id 'com.autonomousapps.dependency-analysis' version "1.17.0"
+}
+
 subprojects {
     buildscript {
         ext {
@@ -37,8 +41,8 @@ subprojects {
 
     jacocoTestReport {
         reports {
-            xml.enabled = true
-            html.enabled = true
+            xml.required = true
+            html.required = true
         }
     }
     test {
@@ -49,9 +53,9 @@ subprojects {
         maxParallelForks = Runtime.runtime.availableProcessors()
     }
 
-    task testWithReport() {
-        dependsOn test
-        finalizedBy jacocoTestReport
+    tasks.register("testWithReport") {
+        dependsOn tasks.named("test")
+        finalizedBy tasks.named("jacocoTestReport")
     }
     dependencies {
         ext {
@@ -61,33 +65,36 @@ subprojects {
             zookeeperVersion = '3.6.1'
             jacksonVersion = '2.9.8'
             opentracingVersion = '0.33.0'
+            springframeworkVersion = '5.3.18'
+            nakadiPluginApiVersion = '3.2.1'
+            fasterXmlJacksonVersion = '2.12.6'
+            fasterXmlJacksonDatabindVersion = '2.12.6.1'
+            postgresqlVersion = '42.3.2'
         }
     }
 }
 
-task startNakadi(type: Exec) {
+tasks.register("startNakadi", Exec.class) {
     commandLine "bash", "-c", "./nakadi.sh start-nakadi"
 }
 
-task fullAcceptanceTest(type: Exec) {
+tasks.register("fullAcceptanceTest", Exec.class) {
     commandLine "bash", "-c", "./nakadi.sh acceptance-tests"
 }
 
-task stopNakadi(type: Exec) {
+tasks.register("stopNakadi", Exec.class) {
     commandLine "bash", "-c", "./nakadi.sh stop-nakadi"
 }
 
-task startStorages(type: Exec) {
+tasks.register("startStorages", Exec.class) {
     commandLine "bash", "-c", "./nakadi.sh start-storages"
 }
 
-task checkstyle {
+tasks.register("checkstyle") {
     subprojects.each { dependsOn(":${it.name}:checkstyleMain") }
     subprojects.each { dependsOn(":${it.name}:checkstyleTest") }
-    dependsOn(":acceptance-test:checkstyleMain")
-    dependsOn(":acceptance-test:checkstyleAcceptanceTest")
 }
 
-task test {
+tasks.register("test") {
     subprojects.each { dependsOn(":${it.name}:testWithReport") }
 }
diff --git a/core-common/build.gradle b/core-common/build.gradle
index e98b901ffe..f511004816 100644
--- a/core-common/build.gradle
+++ b/core-common/build.gradle
@@ -32,109 +32,120 @@ dependencies {
     ext['jsonassert'] = '1.5.0'
 
     // 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"
+    implementation "org.springframework.boot:spring-boot-starter-jetty"
 
     // oauth
-    compile('org.springframework.security.oauth:spring-security-oauth2:2.5.0.RELEASE') {
+    implementation('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-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 "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jacksonVersion"
-    compile 'org.zalando:jackson-datatype-problem:0.22.0'
-    compile 'org.zalando:problem:0.22.0'
-    compile 'org.json:json:20180130'
-
+    implementation "org.zalando:nakadi-plugin-api:$nakadiPluginApiVersion"
+    implementation 'com.google.guava:guava:30.1-jre'
+    implementation 'org.apache.commons:commons-lang3:3.8.1'
+    implementation "org.springframework.boot:spring-boot-starter-json"
+    implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jacksonVersion"
+    implementation 'org.zalando:jackson-datatype-problem:0.22.0'
+    implementation 'org.zalando:problem:0.22.0'
+    implementation 'org.json:json:20180130'
 
     // open tracing
-    compile "io.opentracing:opentracing-api:$opentracingVersion"
-    compile "io.opentracing:opentracing-util:$opentracingVersion"
-
-    compile "org.apache.kafka:kafka-clients:$kafkaClientVersion"
+    implementation "io.opentracing:opentracing-api:$opentracingVersion"
+    implementation "io.opentracing:opentracing-util:$opentracingVersion"
 
-    compile("org.apache.curator:curator-recipes:$curatorVersion") {
+    implementation "org.apache.kafka:kafka-clients:$kafkaClientVersion"
+    implementation("org.apache.curator:curator-recipes:$curatorVersion") {
         exclude module: "zookeeper"
     }
-    compile("org.apache.zookeeper:zookeeper:$zookeeperVersion") {
+    implementation("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") {
-        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") {
+    implementation 'org.echocat.jomon:runtime:1.6.3'
+    implementation "io.dropwizard.metrics:metrics-core:$dropwizardVersion"
+    implementation "io.dropwizard.metrics:metrics-servlets:$dropwizardVersion"
+    implementation("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') {
+    implementation('com.github.everit-org.json-schema:org.everit.json.schema:1.8.0') {
         exclude module: "json"
     }
-    compile 'org.zalando:problem-spring-web:0.23.0'
-
-    // avro
-    compile "org.apache.avro:avro:1.11.0"
-    compile "com.fasterxml.jackson.dataformat:jackson-dataformat-avro:2.8.5"
-
-    compile 'com.github.luben:zstd-jni:1.5.2-2'
+    implementation "org.apache.avro:avro:1.11.0"
+    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-avro:2.8.5"
+    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.fasterxml.jackson.datatype:jackson-datatype-jdk8:$fasterXmlJacksonVersion"
+    implementation 'com.github.luben:zstd-jni:1.5.2-2'
+    implementation 'com.google.code.findbugs:jsr305:3.0.2'
+    implementation 'commons-codec:commons-codec:1.15'
+    implementation 'org.slf4j:slf4j-api:1.7.36'
+    implementation 'joda-time:joda-time:2.9.4'
+    implementation 'jakarta.servlet:jakarta.servlet-api:4.0.4'
+    implementation 'javax.validation:validation-api:2.0.1.Final'
+    implementation 'org.apache.curator:curator-client:5.1.0'
+    implementation 'org.apache.curator:curator-framework:5.1.0'
+    implementation 'org.apache.zookeeper:zookeeper-jute:3.6.1'
+    implementation 'org.springframework.boot:spring-boot:2.5.12'
+    implementation 'org.springframework.security:spring-security-core:5.5.5'
+    implementation "org.springframework:spring-beans:$springframeworkVersion"
+    implementation "org.springframework:spring-context:$springframeworkVersion"
+    implementation "org.springframework:spring-core:$springframeworkVersion"
+    implementation "org.springframework:spring-jdbc:$springframeworkVersion"
+    implementation "org.springframework:spring-tx:$springframeworkVersion"
+    implementation "org.springframework:spring-web:$springframeworkVersion"
+
+    runtimeOnly "org.postgresql:postgresql:$postgresqlVersion"
+    runtimeOnly("com.ryantenney.metrics:metrics-spring:$dropwizardVersion") {
+        exclude module: 'spring-core'
+    }
 
     // tests
-    testCompile 'org.slf4j:slf4j-log4j12'
-    testCompile 'org.hamcrest:hamcrest-all:1.3'
-    testCompile("org.springframework.boot:spring-boot-starter-validation")
-    testCompile('org.junit.jupiter:junit-jupiter:5.7.2') {
+    testImplementation 'org.slf4j:slf4j-log4j12'
+    testImplementation 'org.hamcrest:hamcrest-all:1.3'
+    testImplementation("org.springframework.boot:spring-boot-starter-validation")
+    testImplementation 'junit:junit:4.13.1'
+    testImplementation "org.springframework:spring-test"
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'uk.co.datumedge:hamcrest-json:0.2'
+    testImplementation('com.jayway.restassured:rest-assured:2.9.0') {
         exclude module: "hamcrest-core"
+        exclude module: "hamcrest-library"
     }
-    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.7.2'
-    testCompile 'junit:junit:4.13.1'
-
-
-    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') {
+    testImplementation 'org.hamcrest:hamcrest:2.2'
+    testImplementation 'org.mockito:mockito-core:3.9.0'
+    testImplementation 'commons-io:commons-io:2.5'
+    testImplementation 'jakarta.validation:jakarta.validation-api:2.0.2'
+    testImplementation 'org.eclipse.jetty:jetty-server:9.4.45.v20220203'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
+    testImplementation('org.junit.jupiter:junit-jupiter:5.7.2') {
         exclude module: "hamcrest-core"
-        exclude module: "hamcrest-library"
     }
-    testCompile 'com.jayway.jsonpath:json-path'
-    testRuntime 'org.pegdown:pegdown:1.6.0'
+
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.7.2'
+    testRuntimeOnly 'org.pegdown:pegdown:1.6.0'
 }
 // end::dependencies[]
 
 configurations {
-    testOutput.extendsFrom(testCompile)
+    testOutput.extendsFrom(testImplementation)
 }
 
-task jarTest(type: Jar, dependsOn: testClasses) {
-    from sourceSets.test.output
-    classifier = 'test'
+tasks.register("jarTest", Jar.class) {
+    from sourceSets.getByName("test").output
+    archiveClassifier ="test"
 }
 
 artifacts {
@@ -163,6 +174,11 @@ tasks.named("compileJava").configure {
     source(generateAvro)
 }
 
+tasks.named("checkstyleMain").configure {
+    dependsOn(generateAvro)
+    dependsOn(tasks.named('compileTestJava')) //Probably incorrect dependency but Gradle did not recognise the above one
+}
+
 sourceSets {
     main {
         java {
diff --git a/core-common/settings.gradle b/core-common/settings.gradle
deleted file mode 100644
index 2d5786eaf9..0000000000
--- a/core-common/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'core-common'
\ No newline at end of file
diff --git a/core-metastore/build.gradle b/core-metastore/build.gradle
index a93854a36e..898d99e760 100644
--- a/core-metastore/build.gradle
+++ b/core-metastore/build.gradle
@@ -28,79 +28,42 @@ dependencies {
     implementation project(':core-common')
 
     // 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-jetty"
+    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"
-
-    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") {
-        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") {
+    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 'joda-time:joda-time:2.9.4'
+    implementation 'org.slf4j:slf4j-api:1.7.36'
+    implementation "org.springframework:spring-beans:$springframeworkVersion"
+    implementation "org.springframework:spring-context:$springframeworkVersion"
+    implementation "org.springframework:spring-jdbc:$springframeworkVersion"
+    implementation "org.springframework:spring-tx:$springframeworkVersion"
+    implementation "org.zalando:nakadi-plugin-api:$nakadiPluginApiVersion"
+    implementation 'com.google.guava:guava:30.1-jre'
+    implementation 'org.apache.commons:commons-lang3:3.8.1'
+    implementation "org.springframework.boot:spring-boot-starter-json"
+    implementation("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.apache.kafka:kafka-clients:$kafkaClientVersion"
+    runtimeOnly 'org.echocat.jomon:runtime:1.6.3'
+    runtimeOnly("com.ryantenney.metrics:metrics-spring:$dropwizardVersion") {
+        exclude module: 'spring-core'
     }
-    compile 'org.zalando:problem-spring-web:0.23.0'
+    runtimeOnly "org.postgresql:postgresql:$postgresqlVersion"
 
     // 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'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 // end::dependencies[]
 
diff --git a/core-metastore/settings.gradle b/core-metastore/settings.gradle
deleted file mode 100644
index 0ca26a56c2..0000000000
--- a/core-metastore/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'core-metastore'
diff --git a/core-services/build.gradle b/core-services/build.gradle
index c9b9b9d9b8..d0b3c96670 100644
--- a/core-services/build.gradle
+++ b/core-services/build.gradle
@@ -28,91 +28,92 @@ dependencies {
     implementation project(':core-common')
     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') {
+    implementation "org.springframework.boot:spring-boot-starter-jetty"
+    implementation('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-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"
-
-    compile "org.apache.kafka:kafka-clients:$kafkaClientVersion"
-
-    compile("org.apache.curator:curator-recipes:$curatorVersion") {
+    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 'com.google.re2j:re2j:1.1'
+    implementation 'jakarta.annotation:jakarta.annotation-api:1.3.5'
+    implementation 'joda-time:joda-time:2.9.4'
+    implementation 'org.apache.curator:curator-framework:5.1.0'
+    implementation 'org.apache.zookeeper:zookeeper-jute:3.6.1'
+    implementation 'org.eclipse.jetty:jetty-io:9.4.45.v20220203'
+    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-tx:$springframeworkVersion"
+    implementation "org.springframework:spring-web:$springframeworkVersion"
+    implementation "org.apache.avro:avro:1.11.0"
+    implementation "org.zalando:nakadi-plugin-api:$nakadiPluginApiVersion"
+    implementation 'com.google.guava:guava:30.1-jre'
+    implementation 'org.apache.commons:commons-lang3:3.8.1'
+    implementation "org.springframework.boot:spring-boot-starter-json"
+    implementation 'org.zalando:problem:0.22.0'
+    implementation 'org.json:json:20180130'
+    implementation "io.opentracing:opentracing-api:$opentracingVersion"
+    implementation "org.apache.kafka:kafka-clients:$kafkaClientVersion"
+    implementation("org.apache.curator:curator-recipes:$curatorVersion") {
         exclude module: "zookeeper"
     }
-    compile("org.apache.zookeeper:zookeeper:$zookeeperVersion"){
+    implementation("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") {
-        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") {
+    implementation("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') {
+    implementation('com.github.everit-org.json-schema:org.everit.json.schema:1.8.0') {
         exclude module: "json"
     }
-    compile 'org.zalando:problem-spring-web:0.23.0'
+    implementation 'org.zalando:problem-spring-web:0.23.0'
+
+    runtimeOnly 'org.zalando:jackson-datatype-problem:0.22.0'
+    runtimeOnly 'org.echocat.jomon:runtime:1.6.3'
+    runtimeOnly "org.postgresql:postgresql:$postgresqlVersion"
+    runtimeOnly("com.ryantenney.metrics:metrics-spring:$dropwizardVersion") {
+        exclude module: 'spring-core'
+    }
 
     // tests
-    testCompile 'org.hamcrest:hamcrest-all:1.3'
-    testCompile('org.junit.jupiter:junit-jupiter-api:5.5.2') {
+    testImplementation 'com.vaadin.external.google:android-json:0.0.20131108.vaadin1'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.assertj:assertj-core:3.19.0'
+    testImplementation 'org.echocat.jomon:runtime:1.6.3'
+    testImplementation 'org.hamcrest:hamcrest:2.2'
+    testImplementation 'org.mockito:mockito-core:3.9.0'
+    testImplementation 'uk.co.datumedge:hamcrest-json:0.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')
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation project(path: ':core-common', configuration: 'testOutput')
 }
 // end::dependencies[]
 
 configurations {
-    testOutput.extendsFrom(testCompile)
+    testOutput.extendsFrom(testImplementation)
 }
 
-task jarTest(type: Jar, dependsOn: testClasses) {
+tasks.register("jarTest", Jar.class) {
     from sourceSets.test.output
-    classifier = 'test'
+    archiveClassifier = "test"
 }
 
 artifacts {
diff --git a/core-services/settings.gradle b/core-services/settings.gradle
deleted file mode 100644
index ec04ecea76..0000000000
--- a/core-services/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'core-services'
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..943f0cbfa7 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 442d9132ea..700740e264 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0c81..65dcd68d65 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,105 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f938..6689b85bee 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal