Skip to content

Commit

Permalink
build: Fixed Swagger-Core dependencies (springwolf#242)
Browse files Browse the repository at this point in the history
https://github.com/swagger-api/swagger-core is a monorepo and all the group dependencies are released together.

With the merge of springwolf#240 a breaking change was
introduced and the code was not compiling anymore. Also, for some reason DependaBot was not identifying
the need to update the rest of the dependencies.

Now we align all the Swagger-Core related dependencies.
  • Loading branch information
Carlos Tasada authored and ctasada committed Jul 1, 2023
1 parent c00d77f commit 3ca3e5b
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 11 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
build/
springwolf-add-ons/build/
springwolf-core/build/
springwolf-examples/build/
springwolf-plugins/build/
springwolf-ui/build/
springwolf-add-ons/springwolf-common-model-converters/build/
springwolf-examples/springwolf-amqp-example/build/
springwolf-examples/springwolf-cloud-stream-example/build/
springwolf-examples/springwolf-kafka-example/build/
springwolf-plugins/springwolf-amqp-plugin/build/
springwolf-plugins/springwolf-cloud-stream-plugin/build/
springwolf-plugins/springwolf-kafka-plugin/build/
springwolf-add-ons/springwolf-common-model-converters/build/

.gradle/
.idea/
Expand Down
3 changes: 0 additions & 3 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,7 @@ ext {
slf4jApiVersion = '2.0.7'

swaggerCoreJakartaVersion = '2.2.13'
swaggerModelsJakartaVersion = '2.2.11'

swaggerAnnotationsJakartaVersion = '2.2.11'
swaggerAnnotationsVersion = '2.2.12'
swaggerInflectorVersion = '2.0.9'
swaggerModelsVersion = '2.2.12'
swaggerParserCoreVersion = '2.1.15'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ dependencies {
implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonAnnotationsVersion}"
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"

implementation "io.swagger.core.v3:swagger-annotations-jakarta:${swaggerAnnotationsJakartaVersion}"
implementation "io.swagger.core.v3:swagger-annotations-jakarta:${swaggerCoreJakartaVersion}"
implementation "io.swagger.core.v3:swagger-core-jakarta:${swaggerCoreJakartaVersion}"
implementation "io.swagger.core.v3:swagger-models-jakarta:${swaggerModelsJakartaVersion}"
implementation "io.swagger.core.v3:swagger-models-jakarta:${swaggerCoreJakartaVersion}"

implementation "javax.money:money-api:${moneyApiVersion}"

Expand Down
4 changes: 2 additions & 2 deletions springwolf-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies {
exclude group: "javax.validation"
}

implementation "io.swagger.core.v3:swagger-annotations-jakarta:${swaggerAnnotationsVersion}@jar"
implementation "io.swagger.core.v3:swagger-annotations-jakarta:${swaggerCoreJakartaVersion}@jar"
implementation "io.swagger.core.v3:swagger-core-jakarta:${swaggerCoreJakartaVersion}"

implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonAnnotationsVersion}"
Expand All @@ -48,7 +48,7 @@ dependencies {
implementation "org.springframework:spring-core"
implementation "org.springframework.boot:spring-boot-autoconfigure"

implementation "io.swagger.core.v3:swagger-models-jakarta:${swaggerModelsJakartaVersion}"
implementation "io.swagger.core.v3:swagger-models-jakarta:${swaggerCoreJakartaVersion}"
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies {

implementation "org.springframework.amqp:spring-rabbit"
implementation "org.slf4j:slf4j-api:${slf4jApiVersion}"
implementation "io.swagger.core.v3:swagger-annotations:${swaggerAnnotationsVersion}"
implementation "io.swagger.core.v3:swagger-annotations:${swaggerCoreJakartaVersion}"
implementation "com.asyncapi:asyncapi-core:${asyncapiCoreVersion}"

implementation "org.springframework.amqp:spring-amqp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,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:${swaggerAnnotationsVersion}"
implementation "io.swagger.core.v3:swagger-annotations:${swaggerCoreJakartaVersion}"

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
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies {
implementation "org.springframework.security:spring-security-web"

implementation "com.asyncapi:asyncapi-core:${asyncapiCoreVersion}"
implementation "io.swagger.core.v3:swagger-annotations:${swaggerAnnotationsVersion}"
implementation "io.swagger.core.v3:swagger-annotations:${swaggerCoreJakartaVersion}"
implementation "org.slf4j:slf4j-api:${slf4jApiVersion}"

implementation "javax.money:money-api:${moneyApiVersion}"
Expand Down

0 comments on commit 3ca3e5b

Please sign in to comment.