fix(deps): Update to Gradle 7

build.gradle

@@ -170,7 +170,7 @@ subprojects {
  * Problem is: You can't apply plugins 'java' and 'java-platform' at the same time.
  */
 configure(subprojects.findAll { !javaPlatformModules.contains(it.name) }) {
-  apply plugin: 'java'
+  apply plugin: 'java-library'
   apply plugin: 'jacoco'
 
   sourceCompatibility = JavaVersion.VERSION_1_8
@@ -192,7 +192,7 @@ configure(subprojects.findAll { !javaPlatformModules.contains(it.name) }) {
   }
 
   dependencies {
-    compile enforcedPlatform(project(':sda-commons-dependencies'))
+    api enforcedPlatform(project(':sda-commons-dependencies'))
   }
 
   sourceSets {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

sda-commons-client-jersey-example/build.gradle

@@ -1,7 +1,7 @@
 dependencies {
-  compile project(':sda-commons-server-dropwizard')
-  compile project(':sda-commons-client-jersey')
+  api project(':sda-commons-server-dropwizard')
+  api project(':sda-commons-client-jersey')
 
-  testCompile project(':sda-commons-server-testing')
-  testCompile project(':sda-commons-client-jersey-wiremock-testing')
+  testImplementation project(':sda-commons-server-testing')
+  testImplementation project(':sda-commons-client-jersey-wiremock-testing')
 }

sda-commons-client-jersey-wiremock-testing/build.gradle

@@ -1,13 +1,13 @@
 dependencies {
 
-  compile "com.github.tomakehurst:wiremock-jre8"
+  api "com.github.tomakehurst:wiremock-jre8"
 
-  compile 'org.glassfish.jersey.core:jersey-client'
-  compile 'org.glassfish.jersey.ext:jersey-proxy-client'
-  compile 'jakarta.servlet:jakarta.servlet-api'
-  compile 'org.junit.jupiter:junit-jupiter-api'
+  api 'org.glassfish.jersey.core:jersey-client'
+  api 'org.glassfish.jersey.ext:jersey-proxy-client'
+  api 'jakarta.servlet:jakarta.servlet-api'
+  api 'org.junit.jupiter:junit-jupiter-api'
 
-  testCompile 'org.assertj:assertj-core'
-  testCompile 'org.slf4j:jcl-over-slf4j'
+  testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.slf4j:jcl-over-slf4j'
   testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 }

sda-commons-client-jersey/build.gradle

@@ -1,22 +1,22 @@
 dependencies {
-  compile project(':sda-commons-server-dropwizard')
-  compile project(':sda-commons-server-opentracing')
-  compile project(':sda-commons-shared-tracing')
-  compile project(':sda-commons-shared-error')
+  api project(':sda-commons-server-dropwizard')
+  api project(':sda-commons-server-opentracing')
+  api project(':sda-commons-shared-tracing')
+  api project(':sda-commons-shared-error')
 
-  compile 'io.dropwizard:dropwizard-client'
-  compile 'jakarta.servlet:jakarta.servlet-api'
-  compile 'org.glassfish.jersey.core:jersey-client'
-  compile 'org.glassfish.jersey.ext:jersey-proxy-client'
-  compile 'org.codefetti.proxy:proxy-handler:1.0.0'
-  compile 'io.opentracing.contrib:opentracing-concurrent'
+  api 'io.dropwizard:dropwizard-client'
+  api 'jakarta.servlet:jakarta.servlet-api'
+  api 'org.glassfish.jersey.core:jersey-client'
+  api 'org.glassfish.jersey.ext:jersey-proxy-client'
+  api 'org.codefetti.proxy:proxy-handler:1.0.0'
+  api 'io.opentracing.contrib:opentracing-concurrent'
 
-  testCompile project(':sda-commons-server-testing')
-  testCompile project(':sda-commons-client-jersey-wiremock-testing')
-  testCompile project(':sda-commons-server-trace')
-  testCompile project(':sda-commons-shared-forms')
+  testImplementation project(':sda-commons-server-testing')
+  testImplementation project(':sda-commons-client-jersey-wiremock-testing')
+  testImplementation project(':sda-commons-server-trace')
+  testImplementation project(':sda-commons-shared-forms')
 
-  testCompile 'org.awaitility:awaitility'
-  testCompile 'org.assertj:assertj-core'
-  testCompile 'io.opentracing:opentracing-mock'
+  testImplementation 'org.awaitility:awaitility'
+  testImplementation 'org.assertj:assertj-core'
+  testImplementation 'io.opentracing:opentracing-mock'
 }

sda-commons-dependency-check/build.gradle

@@ -4,52 +4,52 @@ dependencies {
   components.all(BouncycastleAlignmentRule)
 
   // Add all new modules here to verify that there are no dependency clashes.
-  compile project(':sda-commons-client-jersey')
-  compile project(':sda-commons-client-jersey-wiremock-testing')
-  compile project(':sda-commons-server-auth')
-  compile project(':sda-commons-server-auth-testing')
-  compile project(':sda-commons-server-circuitbreaker')
-  compile project(':sda-commons-server-consumer')
-  compile project(':sda-commons-server-cors')
-  compile project(':sda-commons-server-key-mgmt')
-  compile project(':sda-commons-server-dropwizard')
-  compile project(':sda-commons-server-healthcheck')
-  compile project(':sda-commons-server-hibernate')
-  compile project(':sda-commons-server-hibernate-testing')
-  compile project(':sda-commons-server-jackson')
-  compile project(':sda-commons-server-jaeger')
-  compile project(':sda-commons-server-kafka')
-  compile project(':sda-commons-server-kafka-testing')
-  compile project(':sda-commons-server-mongo-testing')
-  compile project(':sda-commons-server-morphia')
-  compile project(':sda-commons-server-openapi')
-  compile project(':sda-commons-server-opentracing')
-  compile project(':sda-commons-server-prometheus')
-  compile project(':sda-commons-server-s3')
-  compile project(':sda-commons-server-s3-testing')
-  compile project(':sda-commons-server-security')
-  compile project(':sda-commons-server-starter'), {
+  api project(':sda-commons-client-jersey')
+  api project(':sda-commons-client-jersey-wiremock-testing')
+  api project(':sda-commons-server-auth')
+  api project(':sda-commons-server-auth-testing')
+  api project(':sda-commons-server-circuitbreaker')
+  api project(':sda-commons-server-consumer')
+  api project(':sda-commons-server-cors')
+  api project(':sda-commons-server-key-mgmt')
+  api project(':sda-commons-server-dropwizard')
+  api project(':sda-commons-server-healthcheck')
+  api project(':sda-commons-server-hibernate')
+  api project(':sda-commons-server-hibernate-testing')
+  api project(':sda-commons-server-jackson')
+  api project(':sda-commons-server-jaeger')
+  api project(':sda-commons-server-kafka')
+  api project(':sda-commons-server-kafka-testing')
+  api project(':sda-commons-server-mongo-testing')
+  api project(':sda-commons-server-morphia')
+  api project(':sda-commons-server-openapi')
+  api project(':sda-commons-server-opentracing')
+  api project(':sda-commons-server-prometheus')
+  api project(':sda-commons-server-s3')
+  api project(':sda-commons-server-s3-testing')
+  api project(':sda-commons-server-security')
+  api project(':sda-commons-server-starter'), {
     // we intentionally allow this conflict. the swagger and openapi module can't be used in one project.
     // since the sda-commons-server-starter will be replaced by sda-commons-starter in the future, we
     // don't check the swagger-related dependencies anymore.
     exclude group: 'io.openapitools.hal', module: 'swagger-hal'
   }
-  compile project(':sda-commons-server-swagger'), {
+  api project(':sda-commons-server-swagger'), {
     // we intentionally allow this conflict. the swagger and openapi module can't be used in one project.
     // since the sda-commons-server-swagger will be replaced by sda-commons-server-openapi in the
     // future, we don't check the swagger-related dependencies anymore.
     exclude group: 'io.openapitools.hal', module: 'swagger-hal'
   }
-  compile project(':sda-commons-server-testing')
-  compile project(':sda-commons-server-trace')
-  compile project(':sda-commons-server-weld')
-  compile project(':sda-commons-server-weld-testing')
-  compile project(':sda-commons-shared-asyncapi')
-  compile project(':sda-commons-shared-error')
-  compile project(':sda-commons-shared-forms')
-  compile project(':sda-commons-shared-tracing')
-  compile project(':sda-commons-shared-yaml')
-  compile project(':sda-commons-starter')
+  api project(':sda-commons-server-testing')
+  api project(':sda-commons-server-trace')
+  api project(':sda-commons-server-weld')
+  api project(':sda-commons-server-weld-testing')
+  api project(':sda-commons-shared-asyncapi')
+  api project(':sda-commons-shared-error')
+  api project(':sda-commons-shared-forms')
+  api project(':sda-commons-shared-tracing')
+  api project(':sda-commons-shared-yaml')
+  api project(':sda-commons-starter')
 }
 
 /**

sda-commons-server-auth-testing/build.gradle

@@ -1,16 +1,16 @@
 dependencies {
-  compile project(':sda-commons-server-dropwizard')
-  compile project(':sda-commons-server-testing')
-  compile project(':sda-commons-server-auth')
-  compile 'com.auth0:java-jwt'
-  compile project(':sda-commons-client-jersey-wiremock-testing')
+  api project(':sda-commons-server-dropwizard')
+  api project(':sda-commons-server-testing')
+  api project(':sda-commons-server-auth')
+  api 'com.auth0:java-jwt'
+  api project(':sda-commons-client-jersey-wiremock-testing')
 
   // the following modules ship with different versions of the swagger-hal library.
   // since swagger-hal is not needed in these tests, they are excluded from both.
-  testCompile project(':sda-commons-server-openapi'), {
+  testImplementation project(':sda-commons-server-openapi'), {
     exclude group: 'io.openapitools.hal', module: 'swagger-hal'
   }
-  testCompile project(':sda-commons-server-swagger'), {
+  testImplementation project(':sda-commons-server-swagger'), {
     exclude group: 'io.openapitools.hal', module: 'swagger-hal'
   }
 

sda-commons-server-auth/build.gradle

@@ -1,15 +1,15 @@
 dependencies {
-  compile project(':sda-commons-server-dropwizard')
-  compile project(':sda-commons-shared-error')
-  compile project(':sda-commons-server-opentracing')
-  compile project(':sda-commons-shared-tracing')
-  compile 'io.dropwizard:dropwizard-auth'
-  compile 'io.dropwizard:dropwizard-client'
-  compile 'jakarta.servlet:jakarta.servlet-api'
+  api project(':sda-commons-server-dropwizard')
+  api project(':sda-commons-shared-error')
+  api project(':sda-commons-server-opentracing')
+  api project(':sda-commons-shared-tracing')
+  api 'io.dropwizard:dropwizard-auth'
+  api 'io.dropwizard:dropwizard-client'
+  api 'jakarta.servlet:jakarta.servlet-api'
 
-  compile 'com.auth0:java-jwt'
+  api 'com.auth0:java-jwt'
 
-  testCompile project(':sda-commons-server-testing')
-  testCompile project(':sda-commons-client-jersey-wiremock-testing')
-  testCompile 'org.awaitility:awaitility'
+  testImplementation project(':sda-commons-server-testing')
+  testImplementation project(':sda-commons-client-jersey-wiremock-testing')
+  testImplementation 'org.awaitility:awaitility'
 }

sda-commons-server-circuitbreaker/build.gradle

@@ -1,12 +1,12 @@
 dependencies {
-  compile project(':sda-commons-server-dropwizard')
+  api project(':sda-commons-server-dropwizard')
 
-  compile 'org.javassist:javassist'
-  compile 'io.github.resilience4j:resilience4j-circuitbreaker'
-  compile 'io.github.resilience4j:resilience4j-prometheus'
-  compile 'org.objenesis:objenesis'
+  api 'org.javassist:javassist'
+  api 'io.github.resilience4j:resilience4j-circuitbreaker'
+  api 'io.github.resilience4j:resilience4j-prometheus'
+  api 'org.objenesis:objenesis'
 
-  testCompile project(':sda-commons-server-prometheus')
-  testCompile project(':sda-commons-server-testing')
-  testCompile project(':sda-commons-client-jersey-wiremock-testing')
+  testImplementation project(':sda-commons-server-prometheus')
+  testImplementation project(':sda-commons-server-testing')
+  testImplementation project(':sda-commons-client-jersey-wiremock-testing')
 }

sda-commons-server-consumer/build.gradle

@@ -1,17 +1,17 @@
 dependencies {
-  compile project(':sda-commons-server-dropwizard')
-  compile project(':sda-commons-shared-tracing')
-  compile project(':sda-commons-shared-error')
+  api project(':sda-commons-server-dropwizard')
+  api project(':sda-commons-shared-tracing')
+  api project(':sda-commons-shared-error')
 
-  testCompile project(':sda-commons-server-jackson')
-  testCompile project(':sda-commons-server-testing')
+  testImplementation project(':sda-commons-server-jackson')
+  testImplementation project(':sda-commons-server-testing')
 
   // the following modules ship with different versions of the swagger-hal library.
   // since swagger-hal is not needed in these tests, they are excluded from both.
-  testCompile project(':sda-commons-server-openapi'), {
+  testImplementation project(':sda-commons-server-openapi'), {
     exclude group: 'io.openapitools.hal', module: 'swagger-hal'
   }
-  testCompile project(':sda-commons-server-swagger'), {
+  testImplementation project(':sda-commons-server-swagger'), {
     exclude group: 'io.openapitools.hal', module: 'swagger-hal'
   }
 }

sda-commons-server-cors/build.gradle

@@ -1,8 +1,8 @@
 dependencies {
-  compile project(':sda-commons-server-dropwizard')
-  compile project(':sda-commons-shared-tracing')
+  api project(':sda-commons-server-dropwizard')
+  api project(':sda-commons-shared-tracing')
 
-  testCompile project(':sda-commons-server-testing')
+  testImplementation project(':sda-commons-server-testing')
 }
 
 test {

sda-commons-server-dropwizard/build.gradle

@@ -1,7 +1,7 @@
 dependencies {
-  compile 'io.dropwizard:dropwizard-core'
-  compile 'jakarta.servlet:jakarta.servlet-api'
-  compile 'io.dropwizard:dropwizard-json-logging'
+  api 'io.dropwizard:dropwizard-core'
+  api 'jakarta.servlet:jakarta.servlet-api'
+  api 'io.dropwizard:dropwizard-json-logging'
 
-  testCompile project(':sda-commons-server-testing')
+  testImplementation project(':sda-commons-server-testing')
 }

sda-commons-server-errorhandling-example/build.gradle

@@ -1,7 +1,7 @@
 dependencies {
 
-  compile project(':sda-commons-server-dropwizard')
-  compile project(':sda-commons-server-jackson')
+  api project(':sda-commons-server-dropwizard')
+  api project(':sda-commons-server-jackson')
 
-  testCompile project(':sda-commons-server-testing')
+  testImplementation project(':sda-commons-server-testing')
 }

sda-commons-server-healthcheck-example/build.gradle

@@ -1,5 +1,5 @@
 dependencies {
-  compile project(':sda-commons-server-healthcheck')
-  testCompile project(':sda-commons-server-testing')
-  testCompile project(':sda-commons-client-jersey-wiremock-testing')
+  api project(':sda-commons-server-healthcheck')
+  testImplementation project(':sda-commons-server-testing')
+  testImplementation project(':sda-commons-client-jersey-wiremock-testing')
 }

sda-commons-server-healthcheck/build.gradle

@@ -1,5 +1,5 @@
 dependencies {
-  compile project(':sda-commons-server-dropwizard')
+  api project(':sda-commons-server-dropwizard')
 
-  testCompile project(':sda-commons-server-testing')
+  testImplementation project(':sda-commons-server-testing')
 }

sda-commons-server-hibernate-example/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
-  compile project(':sda-commons-server-hibernate')
+  api project(':sda-commons-server-hibernate')
 
-  testCompile project(':sda-commons-server-hibernate-testing')
-  testCompile 'org.assertj:assertj-core'
+  testImplementation project(':sda-commons-server-hibernate-testing')
+  testImplementation 'org.assertj:assertj-core'
 }

sda-commons-server-hibernate-testing/build.gradle

@@ -1,11 +1,11 @@
 dependencies {
-  compile project(':sda-commons-server-testing')
-  compile 'com.h2database:h2'
-  compile 'com.github.database-rider:rider-core', {
+  api project(':sda-commons-server-testing')
+  api 'com.h2database:h2'
+  api 'com.github.database-rider:rider-core', {
     // excluded due to licensing issues
     exclude group: 'mysql', module: 'mysql-connector-java'
   }
-  compile 'com.github.database-rider:rider-junit5', {
+  api 'com.github.database-rider:rider-junit5', {
     // excluded due to licensing issues
     exclude group: 'mysql', module: 'mysql-connector-java'
   }

sda-commons-server-hibernate/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
-  compile project(':sda-commons-server-dropwizard')
-  compile 'io.dropwizard:dropwizard-hibernate', {
+  api project(':sda-commons-server-dropwizard')
+  api 'io.dropwizard:dropwizard-hibernate', {
     /**
      * dropwizard-hibernate provides javax.transaction:javax.transaction-api through
      * jackson-datatype-hibernate5 and
@@ -10,10 +10,10 @@ dependencies {
      */
     exclude group: 'org.jboss.spec.javax.transaction', module: 'jboss-transaction-api_1.2_spec'
   }
-  compile 'jakarta.servlet:jakarta.servlet-api'
-  compile 'org.postgresql:postgresql'
-  compile 'org.flywaydb:flyway-core'
+  api 'jakarta.servlet:jakarta.servlet-api'
+  api 'org.postgresql:postgresql'
+  api 'org.flywaydb:flyway-core'
 
-  testCompile project(':sda-commons-server-hibernate-testing')
-  testCompile 'org.assertj:assertj-core'
+  testImplementation project(':sda-commons-server-hibernate-testing')
+  testImplementation 'org.assertj:assertj-core'
 }