Fixing the build post code move - start converting to a single module…

… project
triplea-game · Jul 4, 2024 · 7e9fa75 · 7e9fa75
1 parent b1859ac
commit 7e9fa75
Show file tree

Hide file tree

Showing 331 changed files with 1,948 additions and 382 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "java"
-    id "io.franzbecker.gradle-lombok" version "5.0.0" apply false
-    id "com.diffplug.spotless" version "6.25.0" apply false
+    id "io.freefair.lombok" version "8.6"
+    id "com.diffplug.spotless" version "6.25.0"
     id "com.avast.gradle.docker-compose" version "0.17.6"
 }
 
@@ -25,6 +25,12 @@ tasks.withType(JavaCompile).configureEach {
 }
 
 tasks.withType(Test).configureEach {
+    useJUnitPlatform()
+    testLogging {
+        exceptionFormat = "full"
+        events = ["standardOut", "standardError", "skipped", "failed"]
+    }
+
     testLogging {
         exceptionFormat = "full"
         events = ["standardOut", "standardError", "skipped", "failed"]
@@ -38,54 +44,89 @@ spotless {
     }
 }
 
-subprojects {
+ext {
+    apacheHttpComponentsVersion = "4.5.14"
+    awaitilityVersion = "4.2.1"
+    bcryptVersion = "0.10.2"
+    caffeineVersion = "3.1.8"
+    checkstyleVersion = "8.45"
+    commonsCliVersion = "1.8.0"
+    commonsCodecVersion = "1.17.0"
+    commonsIoVersion = "2.16.1"
+    commonsMathVersion = "3.6.1"
+    commonsTextVersion = "1.12.0"
+    databaseRiderVersion = "1.42.0"
+    dropwizardVersion = "2.1.0"
+    dropwizardWebsocketsVersion = "1.3.14"
+    equalsVerifierVersion = "3.16.1"
+    feignCoreVersion = "13.2.1"
+    feignGsonVersion = "13.2.1"
+    javaWebSocketVersion = "1.5.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.1"
+    jakartaMailVersion = "2.0.1"
+    javaWebsocketVersion = "1.5.3"
+    javaxActivationVersion = "1.1.1"
+    jaxbApiVersion = "2.3.1"
+    jaxbCoreVersion = "4.0.5"
+    jaxbImplVersion = "4.0.5"
+    jdbiVersion = "3.45.1"
+    jetbrainsAnnotationsVersion = "24.1.0"
+    jlayerVersion = "1.0.1.4"
+    junitJupiterVersion = "5.10.2"
+    junitPlatformLauncherVersion = "1.10.2"
+    logbackClassicVersion = "1.2.11"
+    mockitoVersion = "5.11.0"
+    openFeignVersion = "13.2.1"
+    postgresqlVersion = "42.7.3"
+    snakeYamlVersion = "2.7"
+    sonatypeGoodiesPrefsVersion = "2.3.9"
+    substanceVersion = "4.5.0"
+    wireMockJunit5Version = "1.3.1"
+    wireMockVersion = "3.0.1"
+    xchartVersion = "3.8.8"
+    xmlUnitCore = "2.10.0"
+    xmlUnitMatchers = "2.10.0"
+}
 
-    ext {
-        apacheHttpComponentsVersion = "4.5.14"
-        awaitilityVersion = "4.2.1"
-        bcryptVersion = "0.10.2"
-        caffeineVersion = "3.1.8"
-        checkstyleVersion = "8.45"
-        commonsCliVersion = "1.8.0"
-        commonsCodecVersion = "1.17.0"
-        commonsIoVersion = "2.16.1"
-        commonsMathVersion = "3.6.1"
-        commonsTextVersion = "1.12.0"
-        databaseRiderVersion = "1.42.0"
-        dropwizardVersion = "2.1.0"
-        dropwizardWebsocketsVersion = "1.3.14"
-        equalsVerifierVersion = "3.16.1"
-        feignCoreVersion = "13.2.1"
-        feignGsonVersion = "13.2.1"
-        javaWebSocketVersion = "1.5.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.1"
-        jakartaMailVersion = "2.0.1"
-        javaWebsocketVersion = "1.5.3"
-        javaxActivationVersion = "1.1.1"
-        jaxbApiVersion = "2.3.1"
-        jaxbCoreVersion = "4.0.5"
-        jaxbImplVersion = "4.0.5"
-        jdbiVersion = "3.45.1"
-        jetbrainsAnnotationsVersion = "24.1.0"
-        jlayerVersion = "1.0.1.4"
-        junitJupiterVersion = "5.10.2"
-        junitPlatformLauncherVersion = "1.10.2"
-        logbackClassicVersion = "1.2.11"
-        mockitoVersion = "5.11.0"
-        openFeignVersion = "13.2.1"
-        postgresqlVersion = "42.7.3"
-        snakeYamlVersion = "2.7"
-        sonatypeGoodiesPrefsVersion = "2.3.9"
-        substanceVersion = "4.5.0"
-        wireMockJunit5Version = "1.3.1"
-        wireMockVersion = "3.0.1"
-        xchartVersion = "3.8.8"
-        xmlUnitCore = "2.10.0"
-        xmlUnitMatchers = "2.10.0"
-    }
+dependencies {
+    implementation "at.favre.lib:bcrypt:$bcryptVersion"
+    implementation "com.liveperson:dropwizard-websockets:$dropwizardWebsocketsVersion"
+    implementation "com.sun.mail:jakarta.mail:$jakartaMailVersion"
+    implementation "com.sun.xml.bind:jaxb-core:$jaxbCoreVersion"
+    implementation "com.sun.xml.bind:jaxb-impl:$jaxbImplVersion"
+    implementation "io.dropwizard:dropwizard-auth:$dropwizardVersion"
+    implementation "io.dropwizard:dropwizard-core:$dropwizardVersion"
+    implementation "io.dropwizard:dropwizard-jdbi3:$dropwizardVersion"
+    implementation "io.github.openfeign:feign-core:$openFeignVersion"
+    implementation "io.github.openfeign:feign-gson:$openFeignVersion"
+    implementation "javax.activation:activation:$javaxActivationVersion"
+    implementation "javax.xml.bind:jaxb-api:$jaxbApiVersion"
+    implementation "org.java-websocket:Java-WebSocket:$javaWebSocketVersion"
+    implementation "org.jdbi:jdbi3-core:$jdbiVersion"
+    implementation "org.jdbi:jdbi3-sqlobject:$jdbiVersion"
+    implementation "triplea:lobby-client:2.6.14759"
+
+    testImplementation "com.github.database-rider:rider-junit5:$databaseRiderVersion"
+    testImplementation "com.github.npathai:hamcrest-optional:2.0.0"
+    testImplementation "com.sun.mail:jakarta.mail:$jakartaMailVersion"
+    testImplementation "io.dropwizard:dropwizard-testing:$dropwizardVersion"
+    testImplementation "org.awaitility:awaitility:$awaitilityVersion"
+    testImplementation "org.java-websocket:Java-WebSocket:$javaWebsocketVersion"
+    testImplementation "org.jdbi:jdbi3-core:$jdbiVersion"
+    testImplementation "org.jdbi:jdbi3-sqlobject:$jdbiVersion"
+    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.wiremock:wiremock:3.7.0"
+    testImplementation "ru.lanwen.wiremock:wiremock-junit5:1.3.1"
+    testImplementation "uk.co.datumedge:hamcrest-json:$hamcrestJsonVersion"
+
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junitPlatformLauncherVersion"
 }
diff --git a/server/database/.dockerignore → database/.dockerignore b/server/database/.dockerignore → database/.dockerignore
diff --git a/server/database/README.md → database/README.md b/server/database/README.md → database/README.md
diff --git a/server/database/build.gradle → database/build.gradle b/server/database/build.gradle → database/build.gradle
diff --git a/server/database/connect_to_docker_db → database/connect_to_docker_db b/server/database/connect_to_docker_db → database/connect_to_docker_db
diff --git a/server/database/load_sample_data → database/load_sample_data b/server/database/load_sample_data → database/load_sample_data
diff --git a/server/database/reset_docker_db → database/reset_docker_db b/server/database/reset_docker_db → database/reset_docker_db
diff --git a/server/database/sql/init/01-create-users.sql → database/sql/init/01-create-users.sql b/server/database/sql/init/01-create-users.sql → database/sql/init/01-create-users.sql
diff --git a/...database/sql/init/02-create-databases.sql → database/sql/init/02-create-databases.sql b/...database/sql/init/02-create-databases.sql → database/sql/init/02-create-databases.sql
diff --git a/.../sql/sample_data/lobby_db_sample_data.sql → .../sql/sample_data/lobby_db_sample_data.sql b/.../sql/sample_data/lobby_db_sample_data.sql → .../sql/sample_data/lobby_db_sample_data.sql
diff --git a/.../error_report/V1.00.00__create_tables.sql → .../error_report/V1.00.00__create_tables.sql b/.../error_report/V1.00.00__create_tables.sql → .../error_report/V1.00.00__create_tables.sql
diff --git a/...db/migration/lobby_db/V2.00.00__lobby.sql → ...db/migration/lobby_db/V2.00.00__lobby.sql b/...db/migration/lobby_db/V2.00.00__lobby.sql → ...db/migration/lobby_db/V2.00.00__lobby.sql
diff --git a/...n/lobby_db/V2.00.01__add_chat_history.sql → ...n/lobby_db/V2.00.01__add_chat_history.sql b/...n/lobby_db/V2.00.01__add_chat_history.sql → ...n/lobby_db/V2.00.01__add_chat_history.sql
diff --git a/..._db/V2.00.02__game_and_player_history.sql → ..._db/V2.00.02__game_and_player_history.sql b/..._db/V2.00.02__game_and_player_history.sql → ..._db/V2.00.02__game_and_player_history.sql
diff --git a/...b/V2.00.03__change_game_history_index.sql → ...b/V2.00.03__change_game_history_index.sql b/...b/V2.00.03__change_game_history_index.sql → ...b/V2.00.03__change_game_history_index.sql
diff --git a/...0.04__add_lobby_user_fk_to_access_log.sql → ...0.04__add_lobby_user_fk_to_access_log.sql b/...0.04__add_lobby_user_fk_to_access_log.sql → ...0.04__add_lobby_user_fk_to_access_log.sql
diff --git a/...bby_db/V2.00.05__drop_legacy_password.sql → ...bby_db/V2.00.05__drop_legacy_password.sql b/...bby_db/V2.00.05__drop_legacy_password.sql → ...bby_db/V2.00.05__drop_legacy_password.sql
diff --git a/...__error_report_issue_and_title_column.sql → ...__error_report_issue_and_title_column.sql b/...__error_report_issue_and_title_column.sql → ...__error_report_issue_and_title_column.sql
diff --git a/..._db/V2.01.00__fix_username_ban_casing.sql → ..._db/V2.01.00__fix_username_ban_casing.sql b/..._db/V2.01.00__fix_username_ban_casing.sql → ..._db/V2.01.00__fix_username_ban_casing.sql
diff --git a/.../lobby_db/V2.01.01__maps_index_tables.sql → .../lobby_db/V2.01.01__maps_index_tables.sql b/.../lobby_db/V2.01.01__maps_index_tables.sql → .../lobby_db/V2.01.01__maps_index_tables.sql
diff --git a/...migration/lobby_db/V2.01.02__map_tags.sql → ...migration/lobby_db/V2.01.02__map_tags.sql b/...migration/lobby_db/V2.01.02__map_tags.sql → ...migration/lobby_db/V2.01.02__map_tags.sql
diff --git a/...tion/lobby_db/V2.02.00__lobby_message.sql → ...tion/lobby_db/V2.02.00__lobby_message.sql b/...tion/lobby_db/V2.02.00__lobby_message.sql → ...tion/lobby_db/V2.02.00__lobby_message.sql
diff --git a/server/database/start_docker_db → database/start_docker_db b/server/database/start_docker_db → database/start_docker_db
diff --git a/http-clients/github-client/build.gradle b/http-clients/github-client/build.gradle
diff --git a/server/database-test-support/build.gradle b/server/database-test-support/build.gradle
diff --git a/.../java/org/triplea/spitfire/server/controllers/latest/version/LatestVersionController.java b/.../java/org/triplea/spitfire/server/controllers/latest/version/LatestVersionController.java
diff --git a/...ropwizard-server/src/test/java/org/triplea/spitfire/server/ControllerIntegrationTest.java b/...ropwizard-server/src/test/java/org/triplea/spitfire/server/ControllerIntegrationTest.java
@@ -18,13 +18,11 @@
 import org.triplea.domain.data.ApiKey;
 import org.triplea.domain.data.SystemIdLoader;
 import org.triplea.http.client.LobbyHttpClientConfig;
-import org.triplea.test.common.RequiresDatabase;
 
 @ExtendWith(SpitfireServerTestExtension.class)
 @ExtendWith(SpitfireDatabaseTestSupport.class)
 @ExtendWith(DBUnitExtension.class)
 @DataSet(value = ControllerIntegrationTest.DATA_SETS, useSequenceFiltering = false)
-@RequiresDatabase
 public abstract class ControllerIntegrationTest {
 
   @BeforeAll

diff --git a/server/latest-version-module/README.md b/server/latest-version-module/README.md
diff --git a/server/latest-version-module/build.gradle b/server/latest-version-module/build.gradle
diff --git a/...-version-module/src/main/java/org/triplea/modules/latest/version/LatestVersionModule.java b/...-version-module/src/main/java/org/triplea/modules/latest/version/LatestVersionModule.java
diff --git a/...on-module/src/main/java/org/triplea/modules/latest/version/LatestVersionModuleConfig.java b/...on-module/src/main/java/org/triplea/modules/latest/version/LatestVersionModuleConfig.java
diff --git a/server/lobby-module/build.gradle b/server/lobby-module/build.gradle
diff --git a/server/lobby-module/src/test/resources/logback-test.xml b/server/lobby-module/src/test/resources/logback-test.xml