diff --git a/dependencies.gradle b/dependencies.gradle index 8e8121d0c..dc459ec86 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -13,24 +13,34 @@ * - add a 'Version' suffix * * e.g.: com.asyncapi:asyncapi-core' will be 'asyncapiCoreVersion' - * e.g.: 'io.swagger.core.v3:swagger-core-jakarta' will be 'swaggerCoreVersion' + * e.g.: 'io.swagger.core.v3:swagger-core-jakarta' will be 'swaggerCoreJakartaVersion' + * + * + * For multiple dependencies that are released together, we reduce the artifactId to the common prefix. + * The above rules still apply. + * + * e.g.: 'jackson-core', 'jackson-annotations' is combined to 'jacksonVersion' + * * * The dependencies are sorted alphabetically. */ ext { androidJsonVersion = '0.0.20131108.vaadin1' + assertjCoreVersion = '3.24.2' + asyncapiCoreVersion = '1.0.0-EAP-2' + awaitilityVersion = '4.2.0' + commonsIoVersion = '2.13.0' - findbugsJSR305Version = '3.0.2' + jsr305Version = '3.0.2' kafkaClientsVersion = '3.5.0' kafkaStreamsVersion = '3.5.0' - jacksonCoreVersion = '2.15.2' - + jacksonVersion = '2.15.2' jakartaAnnotationApiVersion = '2.1.1' mockitoCoreVersion = '5.4.0' @@ -45,7 +55,7 @@ ext { slf4jApiVersion = '2.0.7' - swaggerCoreVersion = '2.2.15' + swaggerVersion = '2.2.15' swaggerInflectorVersion = '2.0.9' testcontainersVersion = '1.18.3' diff --git a/springwolf-add-ons/springwolf-common-model-converters/build.gradle b/springwolf-add-ons/springwolf-common-model-converters/build.gradle index 67022688c..466f37271 100644 --- a/springwolf-add-ons/springwolf-common-model-converters/build.gradle +++ b/springwolf-add-ons/springwolf-common-model-converters/build.gradle @@ -9,12 +9,12 @@ plugins { dependencies { implementation "org.springframework:spring-context" - implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonCoreVersion}" - implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonCoreVersion}" + implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}" + implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" - implementation "io.swagger.core.v3:swagger-annotations-jakarta:${swaggerCoreVersion}" - implementation "io.swagger.core.v3:swagger-core-jakarta:${swaggerCoreVersion}" - implementation "io.swagger.core.v3:swagger-models-jakarta:${swaggerCoreVersion}" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:${swaggerVersion}" + implementation "io.swagger.core.v3:swagger-core-jakarta:${swaggerVersion}" + implementation "io.swagger.core.v3:swagger-models-jakarta:${swaggerVersion}" implementation "javax.money:money-api:${moneyApiVersion}" diff --git a/springwolf-core/build.gradle b/springwolf-core/build.gradle index ae3a147f8..61e3fad0d 100644 --- a/springwolf-core/build.gradle +++ b/springwolf-core/build.gradle @@ -23,13 +23,13 @@ dependencies { exclude group: "javax.validation" } - implementation "io.swagger.core.v3:swagger-annotations-jakarta:${swaggerCoreVersion}@jar" - implementation "io.swagger.core.v3:swagger-core-jakarta:${swaggerCoreVersion}" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:${swaggerVersion}@jar" + implementation "io.swagger.core.v3:swagger-core-jakarta:${swaggerVersion}" - implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonCoreVersion}" - implementation "com.fasterxml.jackson.core:jackson-core:${jacksonCoreVersion}" - implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonCoreVersion}" - implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonCoreVersion}" + implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}" + implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}" + implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" + implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}" implementation "org.slf4j:slf4j-api:${slf4jApiVersion}" @@ -41,7 +41,7 @@ dependencies { implementation "org.springframework:spring-core" implementation "org.springframework.boot:spring-boot-autoconfigure" - implementation "io.swagger.core.v3:swagger-models-jakarta:${swaggerCoreVersion}" + implementation "io.swagger.core.v3:swagger-models-jakarta:${swaggerVersion}" implementation "jakarta.annotation:jakarta.annotation-api:${jakartaAnnotationApiVersion}" compileOnly "org.projectlombok:lombok:${lombokVersion}" diff --git a/springwolf-examples/springwolf-amqp-example/build.gradle b/springwolf-examples/springwolf-amqp-example/build.gradle index 7accde6bc..ec7a1e565 100644 --- a/springwolf-examples/springwolf-amqp-example/build.gradle +++ b/springwolf-examples/springwolf-amqp-example/build.gradle @@ -19,7 +19,7 @@ dependencies { implementation "org.springframework.amqp:spring-rabbit" implementation "org.slf4j:slf4j-api:${slf4jApiVersion}" - implementation "io.swagger.core.v3:swagger-annotations:${swaggerCoreVersion}" + implementation "io.swagger.core.v3:swagger-annotations:${swaggerVersion}" implementation "com.asyncapi:asyncapi-core:${asyncapiCoreVersion}" implementation "org.springframework.amqp:spring-amqp" diff --git a/springwolf-examples/springwolf-cloud-stream-example/build.gradle b/springwolf-examples/springwolf-cloud-stream-example/build.gradle index a53ab04df..e1d014da0 100644 --- a/springwolf-examples/springwolf-cloud-stream-example/build.gradle +++ b/springwolf-examples/springwolf-cloud-stream-example/build.gradle @@ -30,7 +30,7 @@ dependencies { implementation "com.asyncapi:asyncapi-core:${asyncapiCoreVersion}" implementation "org.apache.kafka:kafka-streams:${kafkaStreamsVersion}" implementation "org.slf4j:slf4j-api:${slf4jApiVersion}" - implementation "io.swagger.core.v3:swagger-annotations:${swaggerCoreVersion}" + implementation "io.swagger.core.v3:swagger-annotations:${swaggerVersion}" implementation "org.springframework.boot:spring-boot-autoconfigure" implementation "org.springframework.boot:spring-boot" diff --git a/springwolf-examples/springwolf-kafka-example/build.gradle b/springwolf-examples/springwolf-kafka-example/build.gradle index c24cd3f23..b8fc40643 100644 --- a/springwolf-examples/springwolf-kafka-example/build.gradle +++ b/springwolf-examples/springwolf-kafka-example/build.gradle @@ -33,7 +33,7 @@ dependencies { implementation "org.springframework.security:spring-security-web" implementation "com.asyncapi:asyncapi-core:${asyncapiCoreVersion}" - implementation "io.swagger.core.v3:swagger-annotations:${swaggerCoreVersion}" + implementation "io.swagger.core.v3:swagger-annotations:${swaggerVersion}" implementation "org.slf4j:slf4j-api:${slf4jApiVersion}" implementation "javax.money:money-api:${moneyApiVersion}" diff --git a/springwolf-plugins/springwolf-amqp-plugin/build.gradle b/springwolf-plugins/springwolf-amqp-plugin/build.gradle index db7567f43..db1ddfaeb 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/build.gradle +++ b/springwolf-plugins/springwolf-amqp-plugin/build.gradle @@ -20,8 +20,8 @@ dependencies { implementation "org.springframework.amqp:spring-amqp" implementation "org.springframework.amqp:spring-rabbit" - compileOnly "com.google.code.findbugs:jsr305:${findbugsJSR305Version}" - permitUnusedDeclared "com.google.code.findbugs:jsr305:${findbugsJSR305Version}" + compileOnly "com.google.code.findbugs:jsr305:${jsr305Version}" + permitUnusedDeclared "com.google.code.findbugs:jsr305:${jsr305Version}" annotationProcessor "org.projectlombok:lombok:${lombokVersion}" annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" @@ -63,4 +63,3 @@ publishing { } } } - diff --git a/springwolf-plugins/springwolf-kafka-plugin/build.gradle b/springwolf-plugins/springwolf-kafka-plugin/build.gradle index d0789ae0e..1a608b6bd 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/build.gradle +++ b/springwolf-plugins/springwolf-kafka-plugin/build.gradle @@ -10,7 +10,7 @@ dependencies { api project(":springwolf-core") implementation "com.asyncapi:asyncapi-core:${asyncapiCoreVersion}" - implementation "io.swagger.core.v3:swagger-models:${swaggerCoreVersion}" + implementation "io.swagger.core.v3:swagger-models:${swaggerVersion}" implementation "org.apache.kafka:kafka-clients:${kafkaClientsVersion}" implementation "org.slf4j:slf4j-api:${slf4jApiVersion}" @@ -24,8 +24,8 @@ dependencies { implementation "org.springframework.kafka:spring-kafka" - compileOnly "com.google.code.findbugs:jsr305:${findbugsJSR305Version}" - permitUnusedDeclared "com.google.code.findbugs:jsr305:${findbugsJSR305Version}" + compileOnly "com.google.code.findbugs:jsr305:${jsr305Version}" + permitUnusedDeclared "com.google.code.findbugs:jsr305:${jsr305Version}" annotationProcessor "org.projectlombok:lombok:${lombokVersion}" annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"