move version definitions to external platform

This commit is contained in:
Carsten Otto
2022-11-01 10:13:04 +01:00
parent 8b66bef0fa
commit c8d624fc68
22 changed files with 117 additions and 57 deletions

View File

@@ -13,8 +13,8 @@ dependencies {
runtimeOnly 'org.postgresql:postgresql'
runtimeOnly 'org.flywaydb:flyway-core'
runtimeOnly 'com.h2database:h2'
integrationTestImplementation 'com.ryantenney.metrics:metrics-spring:3.1.3'
integrationTestImplementation 'io.grpc:grpc-stub:1.45.1'
integrationTestImplementation 'com.ryantenney.metrics:metrics-spring'
integrationTestImplementation 'io.grpc:grpc-stub'
integrationTestImplementation project(':backend')
integrationTestImplementation project(':grpc-adapter')
}

View File

@@ -7,11 +7,13 @@ repositories {
}
dependencies {
implementation 'de.aaschmid:gradle-cpd-plugin:3.3'
implementation 'net.ltgt.gradle:gradle-errorprone-plugin:3.0.1'
implementation 'net.ltgt.gradle:gradle-nullaway-plugin:1.4.0'
implementation 'com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.13'
implementation 'org.springframework.boot:spring-boot-gradle-plugin:2.7.5'
implementation 'com.adarshr:gradle-test-logger-plugin:3.2.0'
implementation 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.9.0'
implementation platform('de.cotto.lndmanagej:platform')
implementation 'de.aaschmid:gradle-cpd-plugin'
implementation 'net.ltgt.gradle:gradle-errorprone-plugin'
implementation 'net.ltgt.gradle:gradle-nullaway-plugin'
implementation 'com.github.spotbugs.snom:spotbugs-gradle-plugin'
implementation 'org.springframework.boot:spring-boot-gradle-plugin'
implementation 'com.adarshr:gradle-test-logger-plugin'
implementation 'info.solidsoft.gradle.pitest:gradle-pitest-plugin'
implementation 'com.google.protobuf:protobuf-gradle-plugin'
}

View File

@@ -3,6 +3,5 @@ plugins {
}
checkstyle {
toolVersion '10.3.1'
maxWarnings = 0
}

View File

@@ -2,7 +2,3 @@ plugins {
id 'de.aaschmid.cpd'
}
check.dependsOn cpdCheck
cpd {
toolVersion = '6.51.0'
}

View File

@@ -6,8 +6,9 @@ plugins {
}
dependencies {
errorprone 'com.google.errorprone:error_prone_core:2.14.0'
errorprone 'com.uber.nullaway:nullaway:0.9.8'
errorprone platform('de.cotto.lndmanagej:platform')
errorprone 'com.google.errorprone:error_prone_core'
errorprone 'com.uber.nullaway:nullaway'
}
nullaway {

View File

@@ -8,8 +8,9 @@ testing {
testType = TestSuiteType.INTEGRATION_TEST
dependencies {
implementation project
implementation 'com.tngtech.archunit:archunit:1.0.0'
implementation 'org.awaitility:awaitility:4.2.0'
implementation project.dependencies.platform('de.cotto.lndmanagej:platform')
implementation 'com.tngtech.archunit:archunit'
implementation 'org.awaitility:awaitility'
}
targets {

View File

@@ -47,7 +47,3 @@ jacocoTestCoverageVerification {
}
}
}
jacoco {
toolVersion = '0.8.8'
}

View File

@@ -12,6 +12,7 @@ plugins {
id 'io.spring.dependency-management'
id 'java-test-fixtures'
id 'lnd-manageJ.spotbugs'
id 'lnd-manageJ.versions'
}
java {
@@ -31,10 +32,11 @@ tasks.withType(JavaCompile).configureEach {
}
dependencies {
implementation platform('de.cotto.lndmanagej:platform')
implementation 'org.springframework.boot:spring-boot-starter'
implementation 'org.apache.commons:commons-lang3:3.12.0'
implementation 'com.google.code.findbugs:jsr305:3.0.2'
implementation 'io.dropwizard.metrics:metrics-core:4.2.10'
implementation 'com.ryantenney.metrics:metrics-spring:3.1.3'
implementation 'com.google.guava:guava:31.1-jre'
implementation 'org.apache.commons:commons-lang3'
implementation 'com.google.code.findbugs:jsr305'
implementation 'io.dropwizard.metrics:metrics-core'
implementation 'com.ryantenney.metrics:metrics-spring'
implementation 'com.google.guava:guava'
}

View File

@@ -1,3 +1,5 @@
import info.solidsoft.gradle.pitest.PitestTask
plugins {
id 'lnd-manageJ.tests'
id 'info.solidsoft.pitest'
@@ -5,8 +7,6 @@ plugins {
pitest {
targetClasses = ['de.cotto.*']
pitestVersion = '1.9.3'
junit5PluginVersion = '1.0.0'
outputFormats = ['XML', 'HTML']
timestampedReports = false
failWhenNoMutations = false
@@ -15,6 +15,6 @@ pitest {
testStrengthThreshold = 100
}
tasks.withType(info.solidsoft.gradle.pitest.PitestTask).configureEach {
tasks.withType(PitestTask).configureEach {
dependsOn test
}

View File

@@ -6,7 +6,6 @@ pmd {
ruleSetFiles = files("${rootDir}/config/pmd-ruleset.xml")
ruleSets = []
consoleOutput = true
toolVersion = '6.51.0'
}
tasks.withType(Test).forEach { testTask ->
tasks.withType(Pmd).forEach { pmdTask ->

View File

@@ -8,8 +8,8 @@ testing {
test {
useJUnitJupiter()
dependencies {
implementation 'nl.jqno.equalsverifier:equalsverifier:3.10.1'
implementation 'uk.org.lidalia:slf4j-test:1.2.0'
implementation 'nl.jqno.equalsverifier:equalsverifier'
implementation 'uk.org.lidalia:slf4j-test'
configurations.getByName('testRuntimeOnly').exclude group: 'ch.qos.logback', module: 'logback-classic'
configurations.getByName('testRuntimeOnly').exclude group: 'org.slf4j', module: 'slf4j-nop'
}

View File

@@ -0,0 +1,16 @@
checkstyle {
toolVersion '10.3.1'
}
cpd {
toolVersion = '6.51.0'
}
pmd {
toolVersion = '6.51.0'
}
jacoco {
toolVersion = '0.8.8'
}
pitest {
pitestVersion = '1.9.3'
junit5PluginVersion = '1.0.0'
}

View File

@@ -3,9 +3,9 @@ plugins {
}
dependencies {
api 'com.github.ben-manes.caffeine:caffeine:3.0.4'
api 'com.github.ben-manes.caffeine:caffeine'
}
pitest {
testStrengthThreshold = 90
}
}

View File

@@ -5,6 +5,6 @@ plugins {
dependencies {
implementation project(':model')
implementation project(':caching')
implementation 'org.ini4j:ini4j:0.5.4'
implementation 'org.ini4j:ini4j'
testImplementation testFixtures(project(':model'))
}
}

View File

@@ -7,7 +7,7 @@ dependencies {
implementation project(':grpc-client')
implementation project(':configuration')
implementation project(':model')
testImplementation 'org.awaitility:awaitility:4.1.1'
testImplementation 'org.awaitility:awaitility'
testImplementation testFixtures(project(':model'))
}

View File

@@ -1,14 +1,16 @@
plugins {
id 'java-library'
id 'com.google.protobuf' version '0.8.18'
id 'com.google.protobuf'
}
dependencies {
api 'io.grpc:grpc-stub:1.45.1'
api 'io.grpc:grpc-protobuf:1.45.1'
implementation 'io.grpc:grpc-netty:1.45.1'
implementation 'commons-codec:commons-codec:1.13'
implementation 'javax.annotation:javax.annotation-api:1.3.2'
api platform('de.cotto.lndmanagej:platform')
protobuf platform('de.cotto.lndmanagej:platform')
api 'io.grpc:grpc-stub'
api 'io.grpc:grpc-protobuf'
implementation 'io.grpc:grpc-netty'
implementation 'commons-codec:commons-codec'
implementation 'javax.annotation:javax.annotation-api'
}
protobuf {
@@ -45,4 +47,4 @@ java {
repositories {
mavenCentral()
}
}

View File

@@ -8,10 +8,10 @@ dependencies {
implementation project(':configuration')
implementation project(':model')
implementation project(':grpc-adapter')
implementation 'com.google.ortools:ortools-java:9.3.10497'
implementation 'org.eclipse.collections:eclipse-collections:11.0.0'
implementation 'com.google.ortools:ortools-java'
implementation 'org.eclipse.collections:eclipse-collections'
testImplementation testFixtures(project(':model'))
testImplementation 'org.awaitility:awaitility:4.1.1'
testImplementation 'org.awaitility:awaitility'
integrationTestImplementation project(':backend')
integrationTestImplementation project(':grpc-adapter')
integrationTestImplementation testFixtures(project(':model'))

47
platform/build.gradle Normal file
View File

@@ -0,0 +1,47 @@
plugins {
id 'java-platform'
}
group = 'de.cotto.lndmanagej'
javaPlatform {
allowDependencies()
}
dependencies {
api platform('org.springframework.cloud:spring-cloud-dependencies:2021.0.3')
constraints {
api 'com.adarshr:gradle-test-logger-plugin:3.2.0'
api 'com.github.ben-manes.caffeine:caffeine:3.0.4'
api 'com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.13'
api 'com.google.code.findbugs:jsr305:3.0.2'
api 'com.google.errorprone:error_prone_core:2.14.0'
api 'com.google.guava:guava:31.1-jre'
api 'com.google.ortools:ortools-java:9.3.10497'
api 'com.ryantenney.metrics:metrics-spring:3.1.3'
api 'com.tngtech.archunit:archunit:1.0.0'
api 'com.uber.nullaway:nullaway:0.9.8'
api 'commons-codec:commons-codec:1.13'
api 'de.aaschmid:gradle-cpd-plugin:3.3'
api 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.9.0'
api 'io.dropwizard.metrics:metrics-core:4.2.10'
api 'io.github.resilience4j:resilience4j-spring-boot2:1.7.1'
api 'io.grpc:grpc-netty:1.45.1'
api 'io.grpc:grpc-protobuf:1.45.1'
api 'io.grpc:grpc-stub:1.45.1'
api 'javax.annotation:javax.annotation-api:1.3.2'
api 'net.ltgt.gradle:gradle-errorprone-plugin:3.0.1'
api 'net.ltgt.gradle:gradle-nullaway-plugin:1.4.0'
api 'nl.jqno.equalsverifier:equalsverifier:3.10.1'
api 'org.apache.commons:commons-lang3:3.12.0'
api 'org.awaitility:awaitility:4.2.0'
api 'org.eclipse.collections:eclipse-collections:11.0.0'
api 'org.ini4j:ini4j:0.5.4'
api 'org.springframework.boot:spring-boot-gradle-plugin:2.7.5'
api 'org.webjars:bootstrap:5.2.0'
api 'org.webjars:webjars-locator:0.45'
api 'uk.org.lidalia:slf4j-test:1.2.0'
api 'com.google.protobuf:protobuf-gradle-plugin:0.8.18'
}
}

View File

@@ -19,3 +19,7 @@ include 'ui-demo'
include 'grpc-adapter'
include 'grpc-client'
include 'application'
dependencyResolutionManagement {
includeBuild('platform/')
}

View File

@@ -2,16 +2,11 @@ plugins {
id 'lnd-manageJ.java-library-conventions'
}
ext {
set('springCloudVersion', '2021.0.3')
}
dependencies {
api platform("org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}")
implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'
implementation 'org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'io.github.resilience4j:resilience4j-spring-boot2:1.7.1'
implementation 'io.github.resilience4j:resilience4j-spring-boot2'
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation project(':model')
implementation project(':caching')

View File

@@ -5,8 +5,8 @@ plugins {
dependencies {
implementation('org.springframework.boot:spring-boot-starter-web')
implementation('org.springframework.boot:spring-boot-starter-thymeleaf')
implementation 'org.webjars:webjars-locator:0.45'
implementation 'org.webjars:bootstrap:5.2.0'
implementation 'org.webjars:webjars-locator'
implementation 'org.webjars:bootstrap'
implementation project(':backend')
implementation project(':model')
implementation project(':web')

View File

@@ -9,7 +9,7 @@ dependencies {
implementation project(':model')
testImplementation testFixtures(project(':model'))
testImplementation testFixtures(project(':pickhardt-payments'))
integrationTestImplementation 'com.ryantenney.metrics:metrics-spring:3.1.3'
integrationTestImplementation 'com.ryantenney.metrics:metrics-spring'
integrationTestImplementation('org.springframework.boot:spring-boot-starter-web')
integrationTestImplementation project(':backend')
integrationTestImplementation project(':grpc-adapter')