Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Common naming of dependencies #290

Merged
merged 2 commits into from
Jul 21, 2023
Merged

chore: Common naming of dependencies #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2779849
chore: Common naming of dependencies
timonback Jul 14, 2023
e2d00e2
Update build.gradle
sam0r040 Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
10 changes: 5 additions & 5 deletions springwolf-add-ons/springwolf-common-model-converters/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
14 changes: 7 additions & 7 deletions springwolf-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand All @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion springwolf-examples/springwolf-amqp-example/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion springwolf-examples/springwolf-cloud-stream-example/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion springwolf-examples/springwolf-kafka-example/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
5 changes: 2 additions & 3 deletions springwolf-plugins/springwolf-amqp-plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -63,4 +63,3 @@ publishing {
}
}
}

6 changes: 3 additions & 3 deletions springwolf-plugins/springwolf-kafka-plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand All @@ -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"
Expand Down