From d4eeb98996a21fde2317637ea54b944d71f0d93a Mon Sep 17 00:00:00 2001 From: Remy Duijsens Date: Sun, 23 Aug 2026 22:32:52 +0200 Subject: [PATCH 1/4] Build: inherit HauntedPlatform 1.0.0 --- pom.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 8bdf60a7..e8dafc59 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.0.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 From 1984d5e07c60522eed5a8e9c6f8517d97319a020 Mon Sep 17 00:00:00 2001 From: Remy Duijsens Date: Sun, 23 Aug 2026 23:00:38 +0200 Subject: [PATCH 2/4] Configure HauntedPlatform package resolution --- .github/workflows/ci-lint.yml | 41 +++++++++++++---------------------- .mvn/maven.config | 2 ++ .mvn/settings.xml | 2 ++ 3 files changed, 19 insertions(+), 26 deletions(-) create mode 100644 .mvn/maven.config create mode 100644 .mvn/settings.xml diff --git a/.github/workflows/ci-lint.yml b/.github/workflows/ci-lint.yml index 8a8de000..d97f5f93 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.0.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@v4 + - run: shellcheck update_version.sh dataprovider-platform-acceptance/run-platform-acceptance.sh 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..97ad35c7 --- /dev/null +++ b/.mvn/settings.xml @@ -0,0 +1,2 @@ + +github${env.PACKAGES_USER}${env.PACKAGES_TOKEN}hauntedmc-github-packagescentralhttps://repo.maven.apache.org/maven2githubhttps://maven.pkg.github.com/hauntedmc/*truehauntedmc-github-packages From 655ef8d99cbe1d2a7b7b9efa55b4f0511401f78f Mon Sep 17 00:00:00 2001 From: Remy Duijsens Date: Sun, 23 Aug 2026 23:11:27 +0200 Subject: [PATCH 3/4] Resolve shared build rules from GitHub Packages --- .mvn/settings.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.mvn/settings.xml b/.mvn/settings.xml index 97ad35c7..cb9d6e9f 100644 --- a/.mvn/settings.xml +++ b/.mvn/settings.xml @@ -1,2 +1,9 @@ -github${env.PACKAGES_USER}${env.PACKAGES_TOKEN}hauntedmc-github-packagescentralhttps://repo.maven.apache.org/maven2githubhttps://maven.pkg.github.com/hauntedmc/*truehauntedmc-github-packages + + 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 + From ed19bd191ceace21e7281ef8154045c27c899497 Mon Sep 17 00:00:00 2001 From: Remy Duijsens Date: Sun, 23 Aug 2026 23:14:31 +0200 Subject: [PATCH 4/4] Bootstrap shared build-rule plugin resolution --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index e8dafc59..273ba977 100644 --- a/pom.xml +++ b/pom.xml @@ -126,6 +126,10 @@ + + githubhttps://maven.pkg.github.com/HauntedMC/* + +