Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
41 changes: 15 additions & 26 deletions .github/workflows/ci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions .github/workflows/ci-tests-and-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions .mvn/maven.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--settings
.mvn/settings.xml
9 changes: 9 additions & 0 deletions .mvn/settings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0">
<servers><server><id>github</id><username>${env.PACKAGES_USER}</username><password>${env.PACKAGES_TOKEN}</password></server></servers>
<profiles><profile><id>hauntedmc-github-packages</id>
<repositories><repository><id>central</id><url>https://repo.maven.apache.org/maven2</url></repository><repository><id>github</id><url>https://maven.pkg.github.com/hauntedmc/*</url><snapshots><enabled>true</enabled></snapshots></repository></repositories>
<pluginRepositories><pluginRepository><id>central</id><url>https://repo.maven.apache.org/maven2</url></pluginRepository><pluginRepository><id>github</id><url>https://maven.pkg.github.com/hauntedmc/*</url><snapshots><enabled>true</enabled></snapshots></pluginRepository></pluginRepositories>
</profile></profiles>
<activeProfiles><activeProfile>hauntedmc-github-packages</activeProfile></activeProfiles>
</settings>
10 changes: 0 additions & 10 deletions checkstyle.xml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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<String, Object>. Document values may include null,
* Each "document" is represented as a {@code Map<String, Object>}. 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).
Expand Down
9 changes: 0 additions & 9 deletions dataprovider-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
<artifactId>dataprovider-core</artifactId>
<name>DataProvider Core</name>

<properties>
<!-- Kept here because these dependencies are used only by this module. -->
<testcontainers.version>1.21.4</testcontainers.version>
<maven.failsafe.version>3.5.6</maven.failsafe.version>
</properties>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down Expand Up @@ -96,19 +90,16 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mysql</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mongodb</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion dataprovider-platform-acceptance/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>${exec.maven.plugin.version}</version>
<version>${maven.exec.version}</version>
<executions>
<execution>
<id>boot-packaged-platform-artifacts</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading
Loading