Merge pull request springwolf#689 from ctasada/ctasada/minor-gradle-t…

…weaks chore: Minor Gradle tweaks
sam0r040 · Apr 7, 2024 · 353045d · 353045d
2 parents 487e268 + fa60e1f
commit 353045d
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -237,7 +237,7 @@ allprojects {
 }
 
 dependencyCheck {
-    outputDirectory = "$buildDir/reports/owasp-dependency-check"
+    outputDirectory = "${rootProject.layout.buildDirectory}/reports/owasp-dependency-check"
     formats = [ReportGenerator.Format.SARIF.toString()]
     nvd.apiKey = project.findProperty("OWASP_API_KEY")
     analyzers.ossIndex.warnOnlyOnRemoteErrors = true

diff --git a/springwolf-add-ons/springwolf-common-model-converters/build.gradle b/springwolf-add-ons/springwolf-common-model-converters/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'java'
+    id 'java-library'
 
     id 'org.springframework.boot'
     id 'io.spring.dependency-management'

diff --git a/springwolf-add-ons/springwolf-kotlinx-serialization-model-converter/build.gradle b/springwolf-add-ons/springwolf-kotlinx-serialization-model-converter/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 }
 
 plugins {
-    id 'java'
+    id 'java-library'
 
     id 'org.springframework.boot'
     id 'io.spring.dependency-management'

diff --git a/springwolf-asyncapi/build.gradle b/springwolf-asyncapi/build.gradle
@@ -1,5 +1,4 @@
 plugins {
-    id 'java'
     id 'java-library'
 
     id 'org.springframework.boot'

diff --git a/springwolf-core/build.gradle b/springwolf-core/build.gradle
@@ -1,5 +1,4 @@
 plugins {
-    id 'java'
     id 'java-library'
 
     id 'org.springframework.boot'

diff --git a/springwolf-examples/springwolf-amqp-example/build.gradle b/springwolf-examples/springwolf-amqp-example/build.gradle
@@ -22,7 +22,7 @@ dependencies {
 
     implementation "org.springframework.amqp:spring-rabbit"
     implementation "org.slf4j:slf4j-api:${slf4jApiVersion}"
-    implementation "io.swagger.core.v3:swagger-annotations:${swaggerVersion}"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:${swaggerVersion}"
 
     implementation "org.springframework.amqp:spring-amqp"
     implementation "org.springframework.boot:spring-boot-autoconfigure"

diff --git a/springwolf-examples/springwolf-cloud-stream-example/build.gradle b/springwolf-examples/springwolf-cloud-stream-example/build.gradle
@@ -31,7 +31,7 @@ dependencies {
 
     implementation "org.apache.kafka:kafka-streams:${kafkaStreamsVersion}"
     implementation "org.slf4j:slf4j-api:${slf4jApiVersion}"
-    implementation "io.swagger.core.v3:swagger-annotations:${swaggerVersion}"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:${swaggerVersion}"
 
     implementation "org.springframework.boot:spring-boot-autoconfigure"
     implementation "org.springframework.boot:spring-boot"

diff --git a/springwolf-examples/springwolf-jms-example/build.gradle b/springwolf-examples/springwolf-jms-example/build.gradle
@@ -23,7 +23,7 @@ dependencies {
 
     implementation "org.slf4j:slf4j-api:${slf4jApiVersion}"
 
-    implementation "io.swagger.core.v3:swagger-annotations:${swaggerVersion}"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:${swaggerVersion}"
 
     implementation "org.springframework:spring-context"
     implementation "org.springframework:spring-jms"

diff --git a/springwolf-examples/springwolf-kafka-example/build.gradle b/springwolf-examples/springwolf-kafka-example/build.gradle
@@ -107,7 +107,7 @@ test {
 openApi {
     apiDocsUrl = "http://localhost:8080/springwolf/docs"
     // For testing purposes we put the generated json into the test resources, but it could be any other directory
-    outputDir = file("$buildDir/resources/test")
+    outputDir = layout.buildDirectory.dir("resources/test")
     outputFileName = "openapi-generated.json"
 }
 

diff --git a/springwolf-examples/springwolf-sns-example/build.gradle b/springwolf-examples/springwolf-sns-example/build.gradle
@@ -28,7 +28,7 @@ dependencies {
     runtimeOnly "org.springframework.boot:spring-boot-starter-web"
 
     implementation "org.slf4j:slf4j-api:${slf4jApiVersion}"
-    implementation "io.swagger.core.v3:swagger-annotations:${swaggerVersion}"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:${swaggerVersion}"
 
     implementation 'io.awspring.cloud:spring-cloud-aws-sns'
     implementation 'io.awspring.cloud:spring-cloud-aws-starter-sns'

diff --git a/springwolf-plugins/springwolf-kafka-plugin/build.gradle b/springwolf-plugins/springwolf-kafka-plugin/build.gradle
@@ -10,8 +10,8 @@ dependencies {
     api project(":springwolf-asyncapi")
     api project(":springwolf-core")
 
-    implementation "io.swagger.core.v3:swagger-models:${swaggerVersion}"
-    permitUnusedDeclared "io.swagger.core.v3:swagger-models:${swaggerVersion}"
+    implementation "io.swagger.core.v3:swagger-models-jakarta:${swaggerVersion}"
+    permitUnusedDeclared "io.swagger.core.v3:swagger-models-jakarta:${swaggerVersion}"
     implementation "org.apache.kafka:kafka-clients:${kafkaClientsVersion}"
     implementation "org.slf4j:slf4j-api:${slf4jApiVersion}"