From 674e85b2c6b4bfaa07f10c8ddd55b3c42196ed95 Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 18 Sep 2026 11:41:37 +0200 Subject: [PATCH 01/20] Move poms --- .../template-placeholder-demo}/pom.xml | 0 {template-placeholder => src/template-placeholder}/pom.xml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {template-placeholder-demo => demos/template-placeholder-demo}/pom.xml (100%) rename {template-placeholder => src/template-placeholder}/pom.xml (100%) diff --git a/template-placeholder-demo/pom.xml b/demos/template-placeholder-demo/pom.xml similarity index 100% rename from template-placeholder-demo/pom.xml rename to demos/template-placeholder-demo/pom.xml diff --git a/template-placeholder/pom.xml b/src/template-placeholder/pom.xml similarity index 100% rename from template-placeholder/pom.xml rename to src/template-placeholder/pom.xml From 93e85d1b8f55a032a0b738105747f654e0680c32 Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 18 Sep 2026 11:45:24 +0200 Subject: [PATCH 02/20] Migrate root pom --- pom.xml | 52 +++++++++++++++++++++++++++----- src/template-placeholder/pom.xml | 37 ----------------------- 2 files changed, 44 insertions(+), 45 deletions(-) diff --git a/pom.xml b/pom.xml index a8116cfe..b4ded46f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,25 +5,43 @@ 4.0.0 software.xdev - template-placeholder-root + root 1.0.0-SNAPSHOT pom - - XDEV Software - https://xdev.software - - - template-placeholder - template-placeholder-demo + src + demos + 17 + ${javaVersion} + UTF-8 UTF-8 + + https://github.com/xdev-software/template-placeholder + scm:git:https://github.com/xdev-software/template-placeholder.git + + + 2026 + + + XDEV Software + https://xdev.software + + + + + XDEV Software + XDEV Software + https://xdev.software + + + Apache-2.0 @@ -32,6 +50,24 @@ + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.16.0 + + ${maven.compiler.release} + + -proc:none + + + + + + + checkstyle diff --git a/src/template-placeholder/pom.xml b/src/template-placeholder/pom.xml index f4755caa..d8eb4406 100644 --- a/src/template-placeholder/pom.xml +++ b/src/template-placeholder/pom.xml @@ -11,43 +11,6 @@ template-placeholder template-placeholder - https://github.com/xdev-software/template-placeholder - - - https://github.com/xdev-software/template-placeholder - scm:git:https://github.com/xdev-software/template-placeholder.git - - - 2023 - - - XDEV Software - https://xdev.software - - - - - XDEV Software - XDEV Software - https://xdev.software - - - - - - Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - 17 - ${javaVersion} - - UTF-8 - UTF-8 - From 5d6bf82ed96dc205d770041445771355efe50c1d Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 18 Sep 2026 11:54:32 +0200 Subject: [PATCH 03/20] Create src pom.xml and hand over control to it --- src/pom.xml | 276 +++++++++++++++++++++++++++++++ src/skip-publish.marker | 0 src/template-placeholder/pom.xml | 235 +------------------------- 3 files changed, 282 insertions(+), 229 deletions(-) create mode 100644 src/pom.xml create mode 100644 src/skip-publish.marker diff --git a/src/pom.xml b/src/pom.xml new file mode 100644 index 00000000..f3e85b55 --- /dev/null +++ b/src/pom.xml @@ -0,0 +1,276 @@ + + + 4.0.0 + + + software.xdev + root + 1.0.0-SNAPSHOT + + + src + pom + + + template-placeholder + + + + + + + org.apache.maven.plugins + maven-site-plugin + 4.0.0-M16 + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.9.0 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.12.0 + + + org.apache.maven.plugins + maven-source-plugin + 3.4.0 + + + + org.apache.maven.plugins + maven-install-plugin + 3.1.4 + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.4 + + + + org.codehaus.mojo + flatten-maven-plugin + 1.8.0 + + + org.apache.maven.plugins + maven-gpg-plugin + 3.2.8 + + + org.sonatype.central + central-publishing-maven-plugin + 0.11.0 + + + + + + com.mycila + license-maven-plugin + 5.1.2 + + + ${project.organization.url} + + + +
com/mycila/maven/plugin/license/templates/APACHE-2.txt
+ + src/main/java/** + src/test/java/** + + + + + + + first + + format + + process-sources + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + package + + jar + + + + + true + none + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + package + + jar-no-fork + + + + + + + + + do-not-publish-this + + + skip-publish.marker + + + + + + org.codehaus.mojo + flatten-maven-plugin + + true + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + true + + + + org.apache.maven.plugins + maven-source-plugin + + true + + + + + maven-install-plugin + + true + + + + maven-deploy-plugin + + true + + + + + org.apache.maven.plugins + maven-gpg-plugin + + true + + + + org.sonatype.central + central-publishing-maven-plugin + + true + + + + + + + pmd + + true + + + + publish + + true + true + + + + + org.codehaus.mojo + flatten-maven-plugin + + ossrh + + + + flatten + process-resources + + flatten + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + --pinentry-mode + loopback + + + + + + + + + + publish-sonatype-central-portal + + + + org.sonatype.central + central-publishing-maven-plugin + true + + sonatype-central-portal + true + + + + + + + site + + true + true + + + + diff --git a/src/skip-publish.marker b/src/skip-publish.marker new file mode 100644 index 00000000..e69de29b diff --git a/src/template-placeholder/pom.xml b/src/template-placeholder/pom.xml index d8eb4406..4df605f9 100644 --- a/src/template-placeholder/pom.xml +++ b/src/template-placeholder/pom.xml @@ -4,239 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - software.xdev + + software.xdev + src + 1.0.0-SNAPSHOT + + template-placeholder - 1.0.0-SNAPSHOT jar template-placeholder template-placeholder - - - - - org.apache.maven.plugins - maven-site-plugin - 4.0.0-M16 - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 3.9.0 - - - - - - com.mycila - license-maven-plugin - 5.1.2 - - - ${project.organization.url} - - - -
com/mycila/maven/plugin/license/templates/APACHE-2.txt
- - src/main/java/** - src/test/java/** - - - - - - - first - - format - - process-sources - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.15.0 - - ${maven.compiler.release} - - -proc:none - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.12.0 - - - attach-javadocs - package - - jar - - - - - true - none - - - - org.apache.maven.plugins - maven-source-plugin - 3.4.0 - - - attach-sources - package - - jar-no-fork - - - - - - - - - publish - - - - org.codehaus.mojo - flatten-maven-plugin - 1.8.0 - - ossrh - - - - flatten - process-resources - - flatten - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.2.8 - - - sign-artifacts - verify - - sign - - - - - - --pinentry-mode - loopback - - - - - - - - - - publish-sonatype-central-portal - - - - org.sonatype.central - central-publishing-maven-plugin - 0.11.0 - true - - sonatype-central-portal - true - - - - - - - checkstyle - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.6.0 - - - com.puppycrawl.tools - checkstyle - 14.1.0 - - - - ../.config/checkstyle/checkstyle.xml - true - - - - - check - - - - - - - - - pmd - - - - org.apache.maven.plugins - maven-pmd-plugin - 3.28.0 - - true - true - true - - ../.config/pmd/java/ruleset.xml - - - - - net.sourceforge.pmd - pmd-core - 7.27.0 - - - net.sourceforge.pmd - pmd-java - 7.27.0 - - - - - - - - - - org.apache.maven.plugins - maven-jxr-plugin - 3.6.0 - - - - - From 97244be029541007d28c7d3562344f312ff944b8 Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 18 Sep 2026 11:59:09 +0200 Subject: [PATCH 04/20] Create demos pom.xml and hand over control to it --- demos/pom.xml | 19 +++++++++++++++++++ demos/template-placeholder-demo/pom.xml | 23 ----------------------- 2 files changed, 19 insertions(+), 23 deletions(-) create mode 100644 demos/pom.xml diff --git a/demos/pom.xml b/demos/pom.xml new file mode 100644 index 00000000..f6ea5e80 --- /dev/null +++ b/demos/pom.xml @@ -0,0 +1,19 @@ + + + 4.0.0 + + + software.xdev + root + 1.0.0-SNAPSHOT + + + demos + pom + + + template-placeholder-demo + + diff --git a/demos/template-placeholder-demo/pom.xml b/demos/template-placeholder-demo/pom.xml index 06fc3187..25f46482 100644 --- a/demos/template-placeholder-demo/pom.xml +++ b/demos/template-placeholder-demo/pom.xml @@ -11,21 +11,9 @@ template-placeholder-demo - 1.0.0-SNAPSHOT jar - - XDEV Software - https://xdev.software - - - 17 - ${javaVersion} - - UTF-8 - UTF-8 - software.xdev.Application @@ -41,17 +29,6 @@ ${project.artifactId} - - org.apache.maven.plugins - maven-compiler-plugin - 3.15.0 - - ${maven.compiler.release} - - -proc:none - - - org.apache.maven.plugins maven-assembly-plugin From 09816ec9cd00b868701c6d42aea7fd7d53b24726 Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 18 Sep 2026 12:03:24 +0200 Subject: [PATCH 05/20] Update workflows --- .github/workflows/check-build.yml | 14 +------ .github/workflows/release.yml | 70 ++++++++++++++++++++++--------- .github/workflows/test-deploy.yml | 11 ++--- 3 files changed, 57 insertions(+), 38 deletions(-) diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml index c28c5eac..29ebdae7 100644 --- a/.github/workflows/check-build.yml +++ b/.github/workflows/check-build.yml @@ -19,9 +19,6 @@ on: - '.idea/**' - 'assets/**' -env: - DEMO_MAVEN_MODULE: ${{ github.event.repository.name }}-demo - jobs: build: runs-on: ubuntu-latest @@ -69,13 +66,6 @@ jobs: exit 1 fi - - name: Upload demo files - uses: actions/upload-artifact@v7 - with: - name: demo-files-java-${{ matrix.java }} - path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar - if-no-files-found: error - checkstyle: runs-on: ubuntu-latest if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }} @@ -148,10 +138,10 @@ jobs: ${{ runner.os }}-pmd- - name: Run PMD - run: ./mvnw -B test pmd:aggregate-pmd-no-fork pmd:check -P pmd -DskipTests -T2C + run: ./mvnw -B test pmd:aggregate-pmd-no-fork pmd:check -P pmd -T2C - name: Run CPD (Copy Paste Detector) - run: ./mvnw -B pmd:aggregate-cpd pmd:cpd-check -P pmd -DskipTests -T2C + run: ./mvnw -B pmd:aggregate-cpd pmd:cpd-check -P pmd -T2C - name: Upload report if: ${{ !cancelled() }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 008ec2ca..cbf4d187 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,13 +4,6 @@ on: push: branches: [ master ] -env: - PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }} - -permissions: - contents: write - pull-requests: write - # DO NOT RESTORE CACHE for critical release steps to prevent a (extremely unlikely) scenario # where a supply chain attack could be achieved due to poisoned cache jobs: @@ -37,7 +30,8 @@ jobs: ${{ runner.os }}-mvn-build- - name: Build with Maven - run: ./mvnw -B clean package -T2C + run: ../mvnw -B clean package -T2C + working-directory: src - name: Check for uncommited changes run: | @@ -61,6 +55,8 @@ jobs: runs-on: ubuntu-latest needs: [check-code] timeout-minutes: 10 + permissions: + contents: write outputs: upload_url: ${{ steps.create-release.outputs.upload_url }} steps: @@ -77,10 +73,9 @@ jobs: - name: Get version id: version run: | - version=$(../mvnw help:evaluate -Dexpression=project.version -q -DforceStdout) + version=$(mvnw -B help:evaluate -Dexpression=project.version -q -DforceStdout) echo "release=$version" >> $GITHUB_OUTPUT echo "releasenumber=${version//[!0-9]/}" >> $GITHUB_OUTPUT - working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} - name: Commit and Push run: | @@ -106,7 +101,7 @@ jobs: ```XML software.xdev - ${{ env.PRIMARY_MAVEN_MODULE }} + ${{ github.event.repository.name }} ${{ steps.version.outputs.release }} ``` @@ -135,8 +130,8 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Only import once - name: Publish to GitHub Packages Central - run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central - working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} + run: ../mvnw -B deploy -P publish -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central + working-directory: src env: PACKAGES_CENTRAL_TOKEN: ${{ secrets.PACKAGES_CENTRAL_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} @@ -152,14 +147,14 @@ jobs: gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Publish to Central Portal - run: ../mvnw -B deploy -P publish,publish-sonatype-central-portal -DskipTests + run: ../mvnw -B deploy -P publish,publish-sonatype-central-portal env: MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} + working-directory: src - publish-pages: + build-pages: runs-on: ubuntu-latest needs: [prepare-release] timeout-minutes: 15 @@ -188,20 +183,57 @@ jobs: ${{ runner.os }}-mvn-build- - name: Build site - run: ../mvnw -B compile site -DskipTests -T2C - working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} + run: ../mvnw -B compile site -P site -T2C + working-directory: src + + - name: Aggregate site + run: | + module_dirs=$(../mvnw -B -q --also-make exec:exec -Dexec.executable="pwd") + for m in "${module_dirs[@]}" + do + echo "$m/target/site -> ./target/$m" + mkdir -p ./target/$m + cp -r $m/target/site ./target/$m + done + working-directory: src + + - name: Upload pages artifact + uses: actions/upload-pages-artifact@v5 + with: + path: src/target/site - name: Deploy to Github pages uses: peaceiris/actions-gh-pages@84c30a85c19949d7eee79c4ff27748b70285e453 # v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./${{ env.PRIMARY_MAVEN_MODULE }}/target/site + publish_dir: ./src/target/site force_orphan: true + deploy-pages: + runs-on: ubuntu-latest + needs: [build-pages] + timeout-minutes: 10 + concurrency: + group: 'pages' + cancel-in-progress: false + permissions: + pages: write + id-token: write + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + steps: + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v5 + after-release: runs-on: ubuntu-latest needs: [publish-maven] timeout-minutes: 10 + permissions: + contents: write + pull-requests: write steps: - uses: actions/checkout@v7 diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index 9f665060..e4dae054 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -3,9 +3,6 @@ name: Test Deployment on: workflow_dispatch: -env: - PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }} - jobs: publish-maven: runs-on: ubuntu-latest @@ -24,8 +21,8 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Only import once - name: Publish to GitHub Packages Central - run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central - working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} + run: ../mvnw -B deploy -P publish -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central + working-directory: src env: PACKAGES_CENTRAL_TOKEN: ${{ secrets.PACKAGES_CENTRAL_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} @@ -41,8 +38,8 @@ jobs: gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Publish to Central Portal - run: ../mvnw -B deploy -P publish,publish-sonatype-central-portal -DskipTests - working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} + run: ../mvnw -B deploy -P publish,publish-sonatype-central-portal + working-directory: src env: MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }} From 41d60e63a7ef86e480792d830843594974105684 Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 18 Sep 2026 12:13:34 +0200 Subject: [PATCH 06/20] Correctly prefix --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cbf4d187..6ced36b5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -73,7 +73,7 @@ jobs: - name: Get version id: version run: | - version=$(mvnw -B help:evaluate -Dexpression=project.version -q -DforceStdout) + version=$(./mvnw -B help:evaluate -Dexpression=project.version -q -DforceStdout) echo "release=$version" >> $GITHUB_OUTPUT echo "releasenumber=${version//[!0-9]/}" >> $GITHUB_OUTPUT From 103406f89811d5fbeede580d657130ea65ea5e8f Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 18 Sep 2026 12:15:23 +0200 Subject: [PATCH 07/20] Standardize format --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6ced36b5..eee11fb9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -148,11 +148,11 @@ jobs: - name: Publish to Central Portal run: ../mvnw -B deploy -P publish,publish-sonatype-central-portal + working-directory: src env: MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - working-directory: src build-pages: runs-on: ubuntu-latest From d42728ab05462f801fefce179b0e38dcc00d2325 Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 18 Sep 2026 12:30:43 +0200 Subject: [PATCH 08/20] Correct artifact id --- demos/template-placeholder-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/template-placeholder-demo/pom.xml b/demos/template-placeholder-demo/pom.xml index 25f46482..4699caeb 100644 --- a/demos/template-placeholder-demo/pom.xml +++ b/demos/template-placeholder-demo/pom.xml @@ -6,7 +6,7 @@ software.xdev - template-placeholder-root + demos 1.0.0-SNAPSHOT From a9ecf33a97b4609d1dc013ce65854069dd7fe477 Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 21 Sep 2026 09:22:28 +0200 Subject: [PATCH 09/20] Fix deprecation --- .github/workflows/release.yml | 10 +++++----- .github/workflows/test-deploy.yml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eee11fb9..2f410171 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -125,8 +125,8 @@ jobs: distribution: 'temurin' java-version: '17' server-id: github-central - server-password: PACKAGES_CENTRAL_TOKEN - gpg-passphrase: MAVEN_GPG_PASSPHRASE + server-password-env-var: PACKAGES_CENTRAL_TOKEN + gpg-passphrase-env-var: MAVEN_GPG_PASSPHRASE gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Only import once - name: Publish to GitHub Packages Central @@ -142,9 +142,9 @@ jobs: distribution: 'temurin' java-version: '17' server-id: sonatype-central-portal - server-username: MAVEN_CENTRAL_USERNAME - server-password: MAVEN_CENTRAL_TOKEN - gpg-passphrase: MAVEN_GPG_PASSPHRASE + server-username-env-var: MAVEN_CENTRAL_USERNAME + server-password-env-var: MAVEN_CENTRAL_TOKEN + gpg-passphrase-env-var: MAVEN_GPG_PASSPHRASE - name: Publish to Central Portal run: ../mvnw -B deploy -P publish,publish-sonatype-central-portal diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index e4dae054..382f6567 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -16,8 +16,8 @@ jobs: distribution: 'temurin' java-version: '17' server-id: github-central - server-password: PACKAGES_CENTRAL_TOKEN - gpg-passphrase: MAVEN_GPG_PASSPHRASE + server-password-env-var: PACKAGES_CENTRAL_TOKEN + gpg-passphrase-env-var: MAVEN_GPG_PASSPHRASE gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Only import once - name: Publish to GitHub Packages Central @@ -33,9 +33,9 @@ jobs: distribution: 'temurin' java-version: '17' server-id: sonatype-central-portal - server-username: MAVEN_CENTRAL_USERNAME - server-password: MAVEN_CENTRAL_TOKEN - gpg-passphrase: MAVEN_GPG_PASSPHRASE + server-username-env-var: MAVEN_CENTRAL_USERNAME + server-password-env-var: MAVEN_CENTRAL_TOKEN + gpg-passphrase-env-var: MAVEN_GPG_PASSPHRASE - name: Publish to Central Portal run: ../mvnw -B deploy -P publish,publish-sonatype-central-portal From f962f53699cfd85d441627a880dddbe1c0ac9639 Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 21 Sep 2026 13:35:55 +0200 Subject: [PATCH 10/20] Correctly ignore in renovate --- renovate.json5 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/renovate.json5 b/renovate.json5 index 1e1f3c05..d5dd7dd9 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -14,8 +14,13 @@ }, { "description": "Ignore project internal dependencies", - "packagePattern": "^software.xdev:template-placeholder", - "datasources": [ + "matchPackagePatterns": [ + "^software.xdev.*:template-placeholder", + "^software.xdev.*:demos", + "^software.xdev.*:src", + "^software.xdev.*:root" + ], + "matchDatasources": [ "maven" ], "enabled": false @@ -25,7 +30,7 @@ "matchPackagePatterns": [ "^net.sourceforge.pmd" ], - "datasources": [ + "matchDatasources": [ "maven" ], "groupName": "net.sourceforge.pmd" From 32da74502b0edd23f4328582e21b43c9552e9d92 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 21 Sep 2026 11:37:06 +0000 Subject: [PATCH 11/20] Update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.2.0 --- src/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pom.xml b/src/pom.xml index f3e85b55..18a8c721 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -50,7 +50,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.4 + 3.2.0 From bc0ee5821bd422ffb36bd47ea4715d611946da80 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 21 Sep 2026 11:37:09 +0000 Subject: [PATCH 12/20] Update dependency org.apache.maven.plugins:maven-install-plugin to v3.2.0 --- src/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pom.xml b/src/pom.xml index f3e85b55..ec8978d8 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -45,7 +45,7 @@ org.apache.maven.plugins maven-install-plugin - 3.1.4 + 3.2.0 org.apache.maven.plugins From c46e008b50130f9ac7ea1a0833259728ff72f8c6 Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 21 Sep 2026 14:32:07 +0200 Subject: [PATCH 13/20] Fix site aggregation --- .github/workflows/release.yml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2f410171..4aed8680 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -188,9 +188,28 @@ jobs: - name: Aggregate site run: | - module_dirs=$(../mvnw -B -q --also-make exec:exec -Dexec.executable="pwd") - for m in "${module_dirs[@]}" + # Compile is required, otherwise dep resolution failure + echo "Looking up modules" + module_dirs=($(../mvnw -B -q --also-make compile exec:exec -Dexec.executable="pwd" -Dmaven.main.skip)) + base_module_full="${module_dirs[0]}" + + echo "Found modules - Src: $base_module_full" + + base_cut_away_length=$((${#base_module_full}+1)) + + echo "BasePathLengthToCutAway: $base_cut_away_length" + + is_first=true + for full_module_path in "${module_dirs[@]}" do + if [ $is_first ]; then + echo "Skipping initial/base module" + is_first=false + continue + fi + + m=${full_module_path:$base_cut_away_length} + echo "$m/target/site -> ./target/$m" mkdir -p ./target/$m cp -r $m/target/site ./target/$m From 4014d504bed7304952574e000663bd1f20dc160d Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 21 Sep 2026 14:42:53 +0200 Subject: [PATCH 14/20] Fix release problems due to incorrect urls See also https://redirect.github.com/mojohaus/flatten-maven-plugin/issues/197 --- pom.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b4ded46f..57ce9268 100644 --- a/pom.xml +++ b/pom.xml @@ -1,13 +1,15 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + child.project.url.inherit.append.path="false"> 4.0.0 software.xdev root 1.0.0-SNAPSHOT pom + https://github.com/xdev-software/template-placeholder src @@ -22,7 +24,10 @@ UTF-8 - + https://github.com/xdev-software/template-placeholder scm:git:https://github.com/xdev-software/template-placeholder.git From 0419f3239f475c8b201498c072c6348fa3823c28 Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 21 Sep 2026 15:16:54 +0200 Subject: [PATCH 15/20] Remove deploy to gh pages duplicated step --- .github/workflows/release.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4aed8680..669ecacb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -221,13 +221,6 @@ jobs: with: path: src/target/site - - name: Deploy to Github pages - uses: peaceiris/actions-gh-pages@84c30a85c19949d7eee79c4ff27748b70285e453 # v4 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./src/target/site - force_orphan: true - deploy-pages: runs-on: ubuntu-latest needs: [build-pages] From 242736287263e782dd2bbbf388f20a97428b0fa0 Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 21 Sep 2026 15:43:12 +0200 Subject: [PATCH 16/20] Fix if statement --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 669ecacb..7f9ada7b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -202,7 +202,7 @@ jobs: is_first=true for full_module_path in "${module_dirs[@]}" do - if [ $is_first ]; then + if [ $is_first = true ]; then echo "Skipping initial/base module" is_first=false continue From b0f46f27b20fcf2150f8f79e9eb99db4177a4755 Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 22 Sep 2026 09:33:09 +0200 Subject: [PATCH 17/20] Fix launcher --- .run/Run Demo.run.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/.run/Run Demo.run.xml b/.run/Run Demo.run.xml index 5fb2bc27..c2f79ef5 100644 --- a/.run/Run Demo.run.xml +++ b/.run/Run Demo.run.xml @@ -2,7 +2,6 @@