diff --git a/build.gradle b/build.gradle index bb66d88cbbd..bdaa0c6d753 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,6 @@ subprojects { apacheHttpComponentsVersion = "4.5.14" assertjCoreVersion = '3.26.3' awaitilityVersion = "4.2.1" - bcryptVersion = "0.10.2" caffeineVersion = "3.1.8" checkstyleVersion = "8.45" commonsCodecVersion = "1.17.1" @@ -56,25 +55,17 @@ subprojects { commonsMathVersion = "3.6.1" commonsTextVersion = "1.12.0" databaseRiderVersion = "1.43.0" - dropwizardVersion = "2.1.0" dropwizardWebsocketsVersion = "1.3.14" equalsVerifierVersion = "3.16.1" - feignCoreVersion = "13.3" - feignGsonVersion = "13.3" - javaWebSocketVersion = "1.5.7" + feignVersion = "13.3" gsonVersion = "2.11.0" guavaVersion = "33.2.1-jre" - hamcrestJsonVersion = "0.3" hamcrestOptionalVersion = "2.0.0" hamcrestVersion = "2.0.0.0" jacksonDataTypeVersion = "2.17.2" jakartaMailVersion = "2.0.1" - javaWebsocketVersion = "1.5.3" - javaxActivationVersion = "1.1.1" - jaxbApiVersion = "2.3.1" - jaxbCoreVersion = "4.0.5" + javaWebSocketVersion = "1.5.7" jaxbImplVersion = "4.0.5" - jdbiVersion = "3.45.2" jetbrainsAnnotationsVersion = "24.1.0" jlayerVersion = "1.0.1.4" junitJupiterVersion = "5.10.3" @@ -82,7 +73,6 @@ subprojects { logbackClassicVersion = "1.5.6" mockitoVersion = "5.11.0" openFeignVersion = "13.3" - postgresqlVersion = "42.7.3" snakeYamlVersion = "2.7" sonatypeGoodiesPrefsVersion = "2.3.9" substanceVersion = "4.5.0" @@ -98,16 +88,49 @@ subprojects { } dependencies { + implementation ("com.googlecode.soundlibs:jlayer:$jlayerVersion") { + exclude group: 'junit', module: 'junit' + } implementation "ch.qos.logback:logback-classic:$logbackClassicVersion" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonDataTypeVersion" + implementation "com.github.ben-manes.caffeine:caffeine:$caffeineVersion" + implementation "com.github.database-rider:rider-junit5:$databaseRiderVersion" + implementation "com.google.code.gson:gson:$gsonVersion" implementation "com.google.guava:guava:$guavaVersion" - testImplementation "org.assertj:assertj-core:$assertjCoreVersion" + implementation "com.liveperson:dropwizard-websockets:$dropwizardWebsocketsVersion" + implementation "com.sun.mail:jakarta.mail:$jakartaMailVersion" + implementation "com.sun.xml.bind:jaxb-impl:$jaxbImplVersion" + implementation "commons-codec:commons-codec:$commonsCodecVersion" + implementation "commons-io:commons-io:$commonsIoVersion" + implementation "io.github.openfeign:feign-core:$feignVersion" + implementation "io.github.openfeign:feign-gson:$feignVersion" + implementation "org.apache.commons:commons-math3:$commonsMathVersion" + implementation "org.apache.commons:commons-text:$commonsTextVersion" + implementation "org.apache.httpcomponents:httpclient:$apacheHttpComponentsVersion" + implementation "org.apache.httpcomponents:httpmime:$apacheHttpComponentsVersion" + implementation "org.java-websocket:Java-WebSocket:$javaWebSocketVersion" + implementation "org.jetbrains:annotations:$jetbrainsAnnotationsVersion" + implementation "org.knowm.xchart:xchart:$xchartVersion" + implementation "org.pushing-pixels:radiance-substance:$substanceVersion" + implementation "org.snakeyaml:snakeyaml-engine:$snakeYamlVersion" + testImplementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonDataTypeVersion" + testImplementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonDataTypeVersion" testImplementation "com.github.npathai:hamcrest-optional:$hamcrestOptionalVersion" + testImplementation "com.github.tomakehurst:wiremock:$wireMockVersion" testImplementation "nl.jqno.equalsverifier:equalsverifier:$equalsVerifierVersion" + testImplementation "org.apache.httpcomponents:httpclient:$apacheHttpComponentsVersion" + testImplementation "org.assertj:assertj-core:$assertjCoreVersion" + testImplementation "org.awaitility:awaitility:$awaitilityVersion" testImplementation "org.hamcrest:java-hamcrest:$hamcrestVersion" testImplementation "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion" testImplementation "org.junit.jupiter:junit-jupiter-params:$junitJupiterVersion" testImplementation "org.mockito:mockito-core:$mockitoVersion" testImplementation "org.mockito:mockito-junit-jupiter:$mockitoVersion" + testImplementation "org.mockito:mockito-subclass:$mockitoVersion" + testImplementation "org.sonatype.goodies:goodies-prefs:$sonatypeGoodiesPrefsVersion" + testImplementation "org.xmlunit:xmlunit-core:$xmlUnitCore" + testImplementation "org.xmlunit:xmlunit-matchers:$xmlUnitMatchers" + testImplementation "ru.lanwen.wiremock:wiremock-junit5:$wireMockJunit5Version" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion" testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junitPlatformLauncherVersion" } diff --git a/game-app/game-core/build.gradle b/game-app/game-core/build.gradle index d3bc92b0cd3..bf8f2c2cf7c 100644 --- a/game-app/game-core/build.gradle +++ b/game-app/game-core/build.gradle @@ -1,18 +1,4 @@ dependencies { - implementation ("com.googlecode.soundlibs:jlayer:$jlayerVersion") { - exclude group: 'junit', module: 'junit' - } - implementation "org.jetbrains:annotations:$jetbrainsAnnotationsVersion" - implementation "com.sun.mail:jakarta.mail:$jakartaMailVersion" - implementation "com.sun.xml.bind:jaxb-impl:$jaxbImplVersion" - implementation "commons-codec:commons-codec:$commonsCodecVersion" - implementation "commons-io:commons-io:$commonsIoVersion" - implementation "io.github.openfeign:feign-gson:$openFeignVersion" - implementation "org.apache.commons:commons-math3:$commonsMathVersion" - implementation "org.apache.commons:commons-text:$commonsTextVersion" - implementation "org.apache.httpcomponents:httpclient:$apacheHttpComponentsVersion" - implementation "org.apache.httpcomponents:httpmime:$apacheHttpComponentsVersion" - implementation "org.knowm.xchart:xchart:$xchartVersion" implementation project(":game-app:domain-data") implementation project(":game-app:map-data") implementation project(":game-app:game-relay-server") @@ -23,11 +9,8 @@ dependencies { implementation project(":lib:swing-lib") implementation project(":lib:websocket-client") implementation project(":lib:xml-reader") - testImplementation "org.awaitility:awaitility:$awaitilityVersion" - testImplementation "org.sonatype.goodies:goodies-prefs:$sonatypeGoodiesPrefsVersion" testImplementation project(":lib:swing-lib-test-support") testImplementation project(":lib:test-common") // Configures mockito to use the legacy "subclass mock maker" // see https://github.com/mockito/mockito/releases/tag/v5.0.0 for more information - testImplementation "org.mockito:mockito-subclass:$mockitoVersion" } diff --git a/game-app/game-headed/build.gradle b/game-app/game-headed/build.gradle index 0482d6d6b5f..785d3798279 100644 --- a/game-app/game-headed/build.gradle +++ b/game-app/game-headed/build.gradle @@ -14,8 +14,6 @@ ext { } dependencies { - implementation "io.github.openfeign:feign-gson:$openFeignVersion" - implementation "org.pushing-pixels:radiance-substance:$substanceVersion" implementation project(":game-app:ai") implementation project(":game-app:domain-data") implementation project(":game-app:game-core") @@ -27,7 +25,6 @@ dependencies { implementation project(":lib:java-extras") implementation project(":lib:swing-lib") implementation project(":lib:websocket-client") - testImplementation "org.sonatype.goodies:goodies-prefs:$sonatypeGoodiesPrefsVersion" testImplementation project(":lib:test-common") } diff --git a/game-app/game-relay-server/build.gradle b/game-app/game-relay-server/build.gradle index 2b186059c73..14bf897aa0b 100644 --- a/game-app/game-relay-server/build.gradle +++ b/game-app/game-relay-server/build.gradle @@ -1,7 +1,5 @@ dependencies { - implementation "org.java-websocket:Java-WebSocket:$javaWebSocketVersion" implementation project(":lib:websocket-client") implementation project(":lib:websocket-server") - testImplementation "org.awaitility:awaitility:$awaitilityVersion" testImplementation project(":lib:test-common") } diff --git a/game-app/map-data/build.gradle b/game-app/map-data/build.gradle index a1334c9ec99..a88055107b2 100644 --- a/game-app/map-data/build.gradle +++ b/game-app/map-data/build.gradle @@ -1,7 +1,4 @@ dependencies { - implementation "com.sun.xml.bind:jaxb-impl:$jaxbImplVersion" implementation project(":lib:java-extras") implementation project(":lib:xml-reader") - testImplementation "org.xmlunit:xmlunit-core:$xmlUnitCore" - testImplementation "org.xmlunit:xmlunit-matchers:$xmlUnitMatchers" } diff --git a/game-app/smoke-testing/build.gradle b/game-app/smoke-testing/build.gradle index 809b5c5630e..2cc7cad8d77 100644 --- a/game-app/smoke-testing/build.gradle +++ b/game-app/smoke-testing/build.gradle @@ -8,7 +8,6 @@ dependencies { testImplementation project(":game-app:game-headless") testImplementation project(":lib:java-extras") testImplementation project(":lib:test-common") - testImplementation "org.sonatype.goodies:goodies-prefs:$sonatypeGoodiesPrefsVersion" } test { diff --git a/http-clients/game-support-server/build.gradle b/http-clients/game-support-server/build.gradle index 8ab4f017750..4be1abf70cf 100644 --- a/http-clients/game-support-server/build.gradle +++ b/http-clients/game-support-server/build.gradle @@ -1,6 +1,6 @@ dependencies { - implementation "io.github.openfeign:feign-core:$feignCoreVersion" - implementation "io.github.openfeign:feign-gson:$feignGsonVersion" + implementation "io.github.openfeign:feign-core:$feignVersion" + implementation "io.github.openfeign:feign-gson:$feignVersion" implementation project(":lib:feign-common") implementation project(":lib:http-client-lib") implementation project(":lib:java-extras") diff --git a/http-clients/lobby-client/build.gradle b/http-clients/lobby-client/build.gradle index d69d6f53a0f..c3f44bed7dc 100644 --- a/http-clients/lobby-client/build.gradle +++ b/http-clients/lobby-client/build.gradle @@ -6,19 +6,13 @@ plugins { version = System.getenv("JAR_VERSION") dependencies { - implementation "io.github.openfeign:feign-core:$feignCoreVersion" implementation project(":game-app:domain-data") implementation project(":lib:feign-common") implementation project(":lib:java-extras") implementation project(":lib:websocket-client") - testImplementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonDataTypeVersion" - testImplementation "com.google.code.gson:gson:$gsonVersion" - testImplementation "ru.lanwen.wiremock:wiremock-junit5:$wireMockJunit5Version" - testImplementation "org.apache.httpcomponents:httpclient:$apacheHttpComponentsVersion" testImplementation project(":lib:test-common") } - def getGitCommitCount = { -> def stdout = new ByteArrayOutputStream() exec { diff --git a/http-clients/maps-server/build.gradle b/http-clients/maps-server/build.gradle index 7061a526799..fbeefc26439 100644 --- a/http-clients/maps-server/build.gradle +++ b/http-clients/maps-server/build.gradle @@ -1,6 +1,4 @@ dependencies { - implementation "io.github.openfeign:feign-core:$feignCoreVersion" - implementation "io.github.openfeign:feign-gson:$feignGsonVersion" implementation project(":lib:feign-common") implementation project(":lib:http-client-lib") implementation project(":lib:java-extras") diff --git a/lib/feign-common/build.gradle b/lib/feign-common/build.gradle index 9dd06e7eb9e..a371c885274 100644 --- a/lib/feign-common/build.gradle +++ b/lib/feign-common/build.gradle @@ -1,11 +1,5 @@ dependencies { - implementation "com.google.code.gson:gson:$gsonVersion" - implementation "io.github.openfeign:feign-core:$feignCoreVersion" - implementation "io.github.openfeign:feign-gson:$feignGsonVersion" implementation project(":game-app:domain-data") implementation project(":lib:java-extras") - testImplementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonDataTypeVersion" - testImplementation "com.github.tomakehurst:wiremock:$wireMockVersion" - testImplementation "ru.lanwen.wiremock:wiremock-junit5:$wireMockJunit5Version" testImplementation project(":lib:test-common") } diff --git a/lib/java-extras/build.gradle b/lib/java-extras/build.gradle index d7ee72070b0..6cd5a231667 100644 --- a/lib/java-extras/build.gradle +++ b/lib/java-extras/build.gradle @@ -1,9 +1,5 @@ description = "TripleA library for low-level helper APIs, ie: syntactic sugar" dependencies { - implementation "com.github.ben-manes.caffeine:caffeine:$caffeineVersion" - implementation "org.apache.httpcomponents:httpclient:$apacheHttpComponentsVersion" - implementation "org.snakeyaml:snakeyaml-engine:$snakeYamlVersion" - implementation "commons-io:commons-io:$commonsIoVersion" testImplementation project(":lib:test-common") } diff --git a/lib/swing-lib/build.gradle b/lib/swing-lib/build.gradle index b785f3b2985..7fbaa0492d1 100644 --- a/lib/swing-lib/build.gradle +++ b/lib/swing-lib/build.gradle @@ -2,6 +2,5 @@ description = "TripleA library for utilities and components that depend only on dependencies { implementation project(":lib:java-extras") - testImplementation "org.awaitility:awaitility:$awaitilityVersion" testImplementation project(":lib:test-common") } diff --git a/lib/test-common/build.gradle b/lib/test-common/build.gradle index e5fc2a1d1e8..269b6340a8d 100644 --- a/lib/test-common/build.gradle +++ b/lib/test-common/build.gradle @@ -2,9 +2,6 @@ description = "Test utility library, generic test utilities useful for TripleA p dependencies { implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonDataTypeVersion" - implementation "com.github.database-rider:rider-junit5:$databaseRiderVersion" implementation "org.hamcrest:java-hamcrest:$hamcrestVersion" - implementation "org.jdbi:jdbi3-core:$jdbiVersion" - implementation "org.jdbi:jdbi3-sqlobject:$jdbiVersion" implementation "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion" } diff --git a/lib/websocket-client/build.gradle b/lib/websocket-client/build.gradle index 5e182cf9c03..297a40b9579 100644 --- a/lib/websocket-client/build.gradle +++ b/lib/websocket-client/build.gradle @@ -1,4 +1,3 @@ dependencies { - implementation "com.google.code.gson:gson:$gsonVersion" implementation project(":lib:java-extras") } diff --git a/lib/websocket-server/build.gradle b/lib/websocket-server/build.gradle index 0e29c31edb7..7c1e5a01bf6 100644 --- a/lib/websocket-server/build.gradle +++ b/lib/websocket-server/build.gradle @@ -1,8 +1,4 @@ dependencies { - implementation "com.github.ben-manes.caffeine:caffeine:$caffeineVersion" - implementation "com.google.code.gson:gson:$gsonVersion" - implementation "com.liveperson:dropwizard-websockets:$dropwizardWebsocketsVersion" - implementation "org.java-websocket:Java-WebSocket:$javaWebSocketVersion" implementation project(":lib:feign-common") implementation project(":lib:java-extras") implementation project(":lib:websocket-client")