Skip to content

changed: Use toml file for versions of dependencies #54

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.

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

Merged
merged 3 commits into from
Nov 20, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
26 changes: 13 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
alias(libs.plugins.nexus.publish)
}

def javaVersion = providers.environmentVariable("JAVA_BUILD_VERSION").getOrElse("17")
Expand All @@ -24,22 +24,22 @@ allprojects {
}

subprojects {
if(it.parent.name == 'examples') {
if(it.parent.name == 'examples' || it.parent.name == 'test') {
apply plugin: 'java'
} else {
apply plugin: 'java-library'
apply plugin: 'jacoco'

dependencies {
// Testing
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
testImplementation "org.mockito:mockito-core:$mockitoVersion"
testImplementation "org.mockito:mockito-junit-jupiter:$mockitoVersion"
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.engine)
testImplementation(libs.mockito.core)
testImplementation(libs.mockito.junit.jupiter)
}

jacoco {
toolVersion = jacocoVersion
toolVersion = "0.8.7"
}

jacocoTestReport {
Expand All @@ -60,21 +60,21 @@ subprojects {

dependencies {
// Lombok annotations to reduce boilerplate code
compileOnly "org.projectlombok:lombok:$lombokVersion"
annotationProcessor "org.projectlombok:lombok:$lombokVersion"
testCompileOnly "org.projectlombok:lombok:$lombokVersion"
testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion"
compileOnly(libs.lombok)
annotationProcessor(libs.lombok)
testCompileOnly(libs.lombok)
testAnnotationProcessor(libs.lombok)
}

checkstyle {
toolVersion = checkstyleVersion
toolVersion = "8.44"
configDirectory.set(file("$rootProject.projectDir/config"))
checkstyleMain.source = "src/main/java"
}

pmd {
toolVersion = "6.55.0"
consoleOutput = true
ruleSets = ["$rootDir/ruleset.xml"]
toolVersion = pmdVersion
}
}
12 changes: 6 additions & 6 deletions examples/example-spring-boot-starter-web/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id 'java'
id 'org.springframework.boot' version "$springBootVersion"
id 'io.spring.dependency-management' version "$springDependencyManagementVersion"
id 'org.openapi.generator' version "$openApiGeneratorPluginVersion"
alias(libs.plugins.spring.boot)
alias(libs.plugins.spring.dependencyManagement)
alias(libs.plugins.openapi.generator)
}


Expand All @@ -12,9 +12,9 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'

implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation "org.openapitools:jackson-databind-nullable:$openApiJacksonDatabindNullableVersion"
implementation "jakarta.validation:jakarta.validation-api:$jakartaValidationApiVersion"
implementation "io.swagger.core.v3:swagger-annotations:$swaggerAnnotationsVersion"
implementation(libs.openapi.tools.jacksonDatabindNullable)
implementation(libs.jakarta.validation.api)
implementation(libs.swagger.annotations)
}

test {
Expand Down
12 changes: 6 additions & 6 deletions examples/example-spring-boot-starter-webflux/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id 'java'
id 'org.springframework.boot' version "$springBootVersion"
id 'io.spring.dependency-management' version "$springDependencyManagementVersion"
id 'org.openapi.generator' version "$openApiGeneratorPluginVersion"
alias(libs.plugins.spring.boot)
alias(libs.plugins.spring.dependencyManagement)
alias(libs.plugins.openapi.generator)
}

dependencies {
Expand All @@ -12,9 +12,9 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-webflux'

implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation "org.openapitools:jackson-databind-nullable:$openApiJacksonDatabindNullableVersion"
implementation "jakarta.validation:jakarta.validation-api:$jakartaValidationApiVersion"
implementation "io.swagger.core.v3:swagger-annotations:$swaggerAnnotationsVersion"
implementation(libs.openapi.tools.jacksonDatabindNullable)
implementation(libs.jakarta.validation.api)
implementation(libs.swagger.annotations)
}

test {
Expand Down
2 changes: 1 addition & 1 deletion examples/examples-common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin

plugins {
id 'java-library'
id 'org.springframework.boot' version "$springBootVersion"
alias(libs.plugins.spring.boot)
}

dependencies {
Expand Down
20 changes: 0 additions & 20 deletions gradle.properties

This file was deleted.

39 changes: 39 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
[versions]
spring-boot = "3.0.2"
spring-dependency-management = "1.1.0"
openapi-generator = "6.2.1"
openapi-tools = "0.2.4"
swagger = "2.2.8"
swagger-request-validator = "2.39.0"
jakarta-validation = "3.0.2"
lombok = "1.18.24"
commons-codec = "1.16.0"
find-bugs = "3.0.2"
gradle-nexus-publish-plugin = "1.3.0"
datadog-statsd = "2.13.0"
# Testing
mockito = "4.11.0"
junit-jupiter = "5.9.1"

[libraries]
openapi-tools-jacksonDatabindNullable = { group = "org.openapitools", name = "jackson-databind-nullable", version.ref = "openapi-tools" }
swagger-annotations = { group = "io.swagger.core.v3", name = "swagger-annotations", version.ref = "swagger" }
swagger-request-validator-core = { group = "com.atlassian.oai", name = "swagger-request-validator-core", version.ref = "swagger-request-validator" }
jakarta-validation-api = { group = "jakarta.validation", name = "jakarta.validation-api", version.ref = "jakarta-validation" }
lombok = { group = "org.projectlombok", name = "lombok", version.ref = "lombok" }
datadog-statsdclient = { group = "com.datadoghq", name = "java-dogstatsd-client", version.ref = "datadog-statsd" }
commons-codec = { group = "commons-codec", name = "commons-codec", version.ref = "commons-codec" }
find-bugs = { group = "com.google.code.findbugs", name = "jsr305", version.ref = "find-bugs" }

# Testing
mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
mockito-junit-jupiter = { group = "org.mockito", name = "mockito-junit-jupiter", version.ref = "mockito" }
junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit-jupiter" }
junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit-jupiter" }


[plugins]
spring-boot = { id = "org.springframework.boot", version.ref = "spring-boot" }
spring-dependencyManagement = { id = "io.spring.dependency-management", version.ref = "spring-dependency-management" }
openapi-generator = { id = "org.openapi.generator", version.ref = "openapi-generator" }
nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "gradle-nexus-publish-plugin" }
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.springframework.boot.gradle.plugin.SpringBootPlugin

plugins {
id 'org.springframework.boot' version "$springBootVersion" apply false
alias(libs.plugins.spring.boot) apply false
}

apply from: "${rootDir}/gradle/publish-module.gradle"
Expand All @@ -12,7 +12,7 @@ dependencies {
testImplementation 'org.springframework.boot:spring-boot-test'

api project(':metrics-reporter:metrics-reporter-datadog')
implementation "com.datadoghq:java-dogstatsd-client:$datadogStatsdVersion"
implementation(libs.datadog.statsdclient)

implementation 'org.assertj:assertj-core'
}
2 changes: 1 addition & 1 deletion metrics-reporter/metrics-reporter-datadog/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ apply from: "${rootDir}/gradle/publish-module.gradle"
dependencies {
api project(':openapi-validation-api')

implementation "com.datadoghq:java-dogstatsd-client:$datadogStatsdVersion"
implementation(libs.datadog.statsdclient)
}
4 changes: 2 additions & 2 deletions openapi-validation-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ apply from: "${rootDir}/gradle/publish-module.gradle"
dependencies {
api project(':openapi-validation-api')

implementation 'com.atlassian.oai:swagger-request-validator-core:2.39.0'
implementation(libs.swagger.request.validator.core)
constraints {
implementation('commons-codec:commons-codec:1.16.0') {
implementation(libs.commons.codec) {
because 'Apache commons-codec before 1.13 is vulnerable to information exposure. See https://devhub.checkmarx.com/cve-details/Cxeb68d52e-5509/'
}
// implementation('org.yaml:snakeyaml:1.33') {
Expand Down
4 changes: 2 additions & 2 deletions spring-boot-starter/spring-boot-starter-core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.springframework.boot.gradle.plugin.SpringBootPlugin

plugins {
id 'org.springframework.boot' version "$springBootVersion" apply false
alias(libs.plugins.spring.boot) apply false
}

apply from: "${rootDir}/gradle/publish-module.gradle"
Expand All @@ -16,7 +16,7 @@ dependencies {
compileOnly 'org.springframework.boot:spring-boot-autoconfigure'

// TODO use spotbugs instead and also apply to all modules?
implementation "com.google.code.findbugs:jsr305:$findBugsVersion"
implementation(libs.find.bugs)

testImplementation platform(SpringBootPlugin.BOM_COORDINATES)
testImplementation 'org.springframework.boot:spring-boot-starter-test'
Expand Down
4 changes: 2 additions & 2 deletions spring-boot-starter/spring-boot-starter-web/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.springframework.boot.gradle.plugin.SpringBootPlugin

plugins {
id 'org.springframework.boot' version "$springBootVersion" apply false
alias(libs.plugins.spring.boot) apply false
}

apply from: "${rootDir}/gradle/publish-module.gradle"
Expand All @@ -18,7 +18,7 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-autoconfigure'

// TODO use spotbugs instead and also apply to all modules?
implementation "com.google.code.findbugs:jsr305:$findBugsVersion"
implementation(libs.find.bugs)

testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework:spring-web'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.springframework.boot.gradle.plugin.SpringBootPlugin

plugins {
id 'org.springframework.boot' version "$springBootVersion" apply false
alias(libs.plugins.spring.boot) apply false
}

apply from: "${rootDir}/gradle/publish-module.gradle"
Expand All @@ -18,7 +18,7 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-autoconfigure'

// TODO use spotbugs instead and also apply to all modules?
implementation "com.google.code.findbugs:jsr305:$findBugsVersion"
implementation(libs.find.bugs)

testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework:spring-webflux'
Expand Down