diff --git a/.github/workflows/ci-lint.yml b/.github/workflows/ci-lint.yml index 8a8de000..278fb82d 100644 --- a/.github/workflows/ci-lint.yml +++ b/.github/workflows/ci-lint.yml @@ -2,38 +2,27 @@ name: CI Lint on: pull_request: - types: - - opened - - synchronize - - reopened + types: [opened, synchronize, reopened] push: - branches: - - main + branches: [main] concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }} cancel-in-progress: ${{ github.event_name == 'pull_request' }} jobs: - lint: - name: Static checks - runs-on: ubuntu-latest - permissions: - contents: read + maven-policy: + name: Shared Maven policy + uses: HauntedMC/HauntedPlatform/.github/workflows/maven-ci.yml@v1.2.0 + with: + maven-command: ./mvnw -U -B -ntp -DskipTests verify + secrets: + PACKAGES_USER: ${{ secrets.HAUNTEDMC_PACKAGES_USERNAME }} + PACKAGES_TOKEN: ${{ secrets.HAUNTEDMC_PACKAGES_TOKEN }} + shellcheck: + name: ShellCheck + runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v7 - - - name: Set up JDK 25 - uses: actions/setup-java@v5 - with: - distribution: temurin - java-version: "25" - cache: maven - - - name: Run Checkstyle - run: ./mvnw -U -B -ntp -DskipTests checkstyle:check - - - name: Lint shell scripts - run: shellcheck update_version.sh dataprovider-platform-acceptance/run-platform-acceptance.sh + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + - run: shellcheck update_version.sh dataprovider-platform-acceptance/run-platform-acceptance.sh diff --git a/.github/workflows/ci-tests-and-coverage.yml b/.github/workflows/ci-tests-and-coverage.yml index 9bc21427..d5b6ca8c 100644 --- a/.github/workflows/ci-tests-and-coverage.yml +++ b/.github/workflows/ci-tests-and-coverage.yml @@ -29,10 +29,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v7 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Set up JDK 25 - uses: actions/setup-java@v5 + uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0 with: distribution: temurin java-version: "25" @@ -85,10 +85,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v7 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Set up JDK 25 - uses: actions/setup-java@v5 + uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0 with: distribution: temurin java-version: "25" diff --git a/.github/workflows/release-package.yml b/.github/workflows/release-package.yml index 79f5dc29..7b8f6236 100644 --- a/.github/workflows/release-package.yml +++ b/.github/workflows/release-package.yml @@ -19,12 +19,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v7 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: fetch-depth: 0 - name: Set up JDK 25 - uses: actions/setup-java@v5 + uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0 with: distribution: temurin java-version: "25" diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 00000000..72fce392 --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1,2 @@ +--settings +.mvn/settings.xml diff --git a/.mvn/settings.xml b/.mvn/settings.xml new file mode 100644 index 00000000..cb9d6e9f --- /dev/null +++ b/.mvn/settings.xml @@ -0,0 +1,9 @@ + + + github${env.PACKAGES_USER}${env.PACKAGES_TOKEN} + hauntedmc-github-packages + centralhttps://repo.maven.apache.org/maven2githubhttps://maven.pkg.github.com/hauntedmc/*true + centralhttps://repo.maven.apache.org/maven2githubhttps://maven.pkg.github.com/hauntedmc/*true + + hauntedmc-github-packages + diff --git a/checkstyle.xml b/checkstyle.xml deleted file mode 100644 index 4af5804b..00000000 --- a/checkstyle.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/dataprovider-api/src/main/java/nl/hauntedmc/dataprovider/database/document/DocumentDataAccess.java b/dataprovider-api/src/main/java/nl/hauntedmc/dataprovider/database/document/DocumentDataAccess.java index b4b88373..14df32cd 100644 --- a/dataprovider-api/src/main/java/nl/hauntedmc/dataprovider/database/document/DocumentDataAccess.java +++ b/dataprovider-api/src/main/java/nl/hauntedmc/dataprovider/database/document/DocumentDataAccess.java @@ -13,7 +13,7 @@ /** * DocumentDataAccess defines typical CRUD and index operations for * a document–based database in a technology–agnostic way. - * Each "document" is represented as a Map. Document values may include null, + * Each "document" is represented as a {@code Map}. Document values may include null, * nested maps, and nested lists when supported by the selected document backend. * Queries and updates are represented by custom DSL classes * (DocumentQuery, DocumentUpdate, DocumentUpdateOptions). diff --git a/dataprovider-core/pom.xml b/dataprovider-core/pom.xml index e357ea36..821bc613 100644 --- a/dataprovider-core/pom.xml +++ b/dataprovider-core/pom.xml @@ -11,12 +11,6 @@ dataprovider-core DataProvider Core - - - 1.21.4 - 3.5.6 - - ${project.groupId} @@ -96,19 +90,16 @@ org.testcontainers junit-jupiter - ${testcontainers.version} test org.testcontainers mysql - ${testcontainers.version} test org.testcontainers mongodb - ${testcontainers.version} test diff --git a/dataprovider-core/src/test/java/nl/hauntedmc/dataprovider/core/DataProviderRegistryTest.java b/dataprovider-core/src/test/java/nl/hauntedmc/dataprovider/core/DataProviderRegistryTest.java index b88d7444..526aaef0 100644 --- a/dataprovider-core/src/test/java/nl/hauntedmc/dataprovider/core/DataProviderRegistryTest.java +++ b/dataprovider-core/src/test/java/nl/hauntedmc/dataprovider/core/DataProviderRegistryTest.java @@ -6,7 +6,6 @@ import nl.hauntedmc.dataprovider.database.DatabaseConnectionKey; import nl.hauntedmc.dataprovider.database.DatabaseProvider; import nl.hauntedmc.dataprovider.database.DatabaseType; -import nl.hauntedmc.dataprovider.core.ManagedDatabaseProvider; import nl.hauntedmc.dataprovider.core.testutil.RecordingLoggerAdapter; import org.junit.jupiter.api.Test; import org.spongepowered.configurate.CommentedConfigurationNode; diff --git a/dataprovider-core/src/test/java/nl/hauntedmc/dataprovider/core/api/CurrentApiTest.java b/dataprovider-core/src/test/java/nl/hauntedmc/dataprovider/core/api/CurrentApiTest.java index 05584a64..e003da17 100644 --- a/dataprovider-core/src/test/java/nl/hauntedmc/dataprovider/core/api/CurrentApiTest.java +++ b/dataprovider-core/src/test/java/nl/hauntedmc/dataprovider/core/api/CurrentApiTest.java @@ -28,7 +28,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/dataprovider-platform-acceptance/runtime/pom.xml b/dataprovider-platform-acceptance/runtime/pom.xml index 266411cf..a58f5224 100644 --- a/dataprovider-platform-acceptance/runtime/pom.xml +++ b/dataprovider-platform-acceptance/runtime/pom.xml @@ -17,7 +17,7 @@ org.codehaus.mojo exec-maven-plugin - ${exec.maven.plugin.version} + ${maven.exec.version} boot-packaged-platform-artifacts diff --git a/dataprovider-platform-common/src/test/java/nl/hauntedmc/dataprovider/platform/common/lifecycle/PlatformDataProviderRuntimeTest.java b/dataprovider-platform-common/src/test/java/nl/hauntedmc/dataprovider/platform/common/lifecycle/PlatformDataProviderRuntimeTest.java index 6441571f..93166ebb 100644 --- a/dataprovider-platform-common/src/test/java/nl/hauntedmc/dataprovider/platform/common/lifecycle/PlatformDataProviderRuntimeTest.java +++ b/dataprovider-platform-common/src/test/java/nl/hauntedmc/dataprovider/platform/common/lifecycle/PlatformDataProviderRuntimeTest.java @@ -13,7 +13,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/pom.xml b/pom.xml index c4765483..c2b136c9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,6 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + nl.hauntedmc.platform + haunted-library-parent + 1.2.0 + + + nl.hauntedmc.dataprovider dataprovider-parent ${revision} @@ -54,10 +61,6 @@ 3.2.0 - UTF-8 - UTF-8 - 25 - ${java.version} 26.2.build.112-stable @@ -67,44 +70,28 @@ 4.1.0-SNAPSHOT 9 635ffe27b4fe1b97e61479012121d4e7c61a9eec99e6bd5a1f923053c2a259ce - 5.2.0 + ${haunted.adventure.version} 1.0.0 - 4.2.0 + ${haunted.configurate.version} 26.7.0 7.1.0 5.10.0 8.0.0 - 7.4.5.Final - 3.2.0 - 4.0.5 - 4.0.9 - 3.6.3.Final - 2.50.0 - 26.1.0 - 1.0.1 - 2.0.18 - 2.14.0 + ${haunted.hibernate.version} + ${haunted.jpa.version} + ${haunted.jaxb.api.version} + ${haunted.jaxb.runtime.version} + ${haunted.jboss.logging.version} + ${haunted.errorprone.version} + ${haunted.jetbrains.annotations.version} + ${haunted.jspecify.version} + ${haunted.slf4j.version} + ${haunted.gson.version} - 6.1.3 - 5.23.0 - - 3.15.0 - 3.5.6 - 3.5.1 - 3.5.0 - 3.5.0 - 3.1.4 - 3.1.4 - 3.6.3 - 3.22.0 - 3.6.3 - 3.6.0 - 14.0.0 - 3.6.2 + ${haunted.junit.version} + ${haunted.mockito.version} 3.6.1 - 0.8.15 - 1.8.0 @@ -123,163 +110,17 @@ - - - - - jakarta.xml.bind - jakarta.xml.bind-api - ${jakarta.xml.bind.version} - - - org.jboss.logging - jboss-logging - ${jboss.logging.version} - - - org.glassfish.jaxb - jaxb-runtime - ${jaxb.runtime.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - com.google.errorprone - error_prone_annotations - ${errorprone.annotations.version} - - - org.jetbrains - annotations - ${jetbrains.annotations.version} - - - org.jspecify - jspecify - ${jspecify.version} - - - com.google.code.gson - gson - ${gson.version} - - - net.kyori - adventure-bom - ${adventure.version} - pom - import - - - + + githubhttps://maven.pkg.github.com/HauntedMC/* + - - org.codehaus.mojo - flatten-maven-plugin - ${flatten.plugin.version} - - resolveCiFriendliesOnly - - - - flatten-pom - process-resources - flatten - - - clean-flattened-pom - clean - clean - - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${maven.enforcer.version} - - - enforce-build-environment - validate - enforce - - - [25,) - [3.8.6,) - - - - - true - - net.kyori:adventure-api:[0,5.0.0) - net.kyori:adventure-key:[0,5.0.0) - net.kyori:adventure-nbt:[0,5.0.0) - net.kyori:adventure-resource-pack:[0,5.0.0) - net.kyori:adventure-serializer-configurate4:[0,5.0.0) - net.kyori:adventure-text-logger-slf4j:[0,5.0.0) - net.kyori:adventure-text-minimessage:[0,5.0.0) - net.kyori:adventure-text-serializer-ansi:[0,5.0.0) - net.kyori:adventure-text-serializer-commons:[0,5.0.0) - net.kyori:adventure-text-serializer-gson:[0,5.0.0) - net.kyori:adventure-text-serializer-gson-legacy-impl:[0,5.0.0) - net.kyori:adventure-text-serializer-json:[0,5.0.0) - net.kyori:adventure-text-serializer-json-legacy-impl:[0,5.0.0) - net.kyori:adventure-text-serializer-legacy:[0,5.0.0) - net.kyori:adventure-text-serializer-plain:[0,5.0.0) - - Adventure 4.x core modules are not supported. Keep the Adventure core dependency graph on 5.x. - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven.checkstyle.plugin.version} - - ${maven.multiModuleProjectDirectory}/checkstyle.xml - true - true - warning - true - - - - com.puppycrawl.tools - checkstyle - ${checkstyle.version} - - - - - release-style-gate - verify - check - - - org.jacoco jacoco-maven-plugin ${jacoco.version} - - prepare-coverage-agent - prepare-agent - - - generate-coverage-report - verify - report - enforce-coverage-minimum verify @@ -304,7 +145,7 @@ org.basepom.maven duplicate-finder-maven-plugin - 2.0.1 + ${duplicate.finder.version} reject-duplicate-classes @@ -317,13 +158,6 @@ - - - maven-deploy-plugin - - true - -