From 6cb43b927722a904127680e8730d17769fa6960a Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Wed, 25 Oct 2023 08:28:08 +0200 Subject: [PATCH 01/26] Fix syntax for edit --- .github/workflows/update-from-template.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml index 2b41fdd..26814a6 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -86,9 +86,8 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | gh_pr_up() { - gh pr create "$@" || gh pr edit "$@" + gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || gh pr edit "$@" } gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \ - -H "${{ env.UPDATE_BRANCH }}" \ --title "Update from template" \ --body "An automated PR to sync changes from the template into this repo" From 7f6fd295c5bc7c91ff015dbe0d540aa4159c7ad5 Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Wed, 25 Oct 2023 08:46:46 +0200 Subject: [PATCH 02/26] Update update-from-template.yml --- .github/workflows/update-from-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml index 26814a6..a02a834 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -86,7 +86,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | gh_pr_up() { - gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || gh pr edit "$@" + gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@" } gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \ --title "Update from template" \ From 6c3628b57cbc523a5128b54d8cd207912410d363 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 26 Oct 2023 16:18:21 +0200 Subject: [PATCH 03/26] Compile with Java 21 --- .github/workflows/checkBuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml index c23ac42..2e93229 100644 --- a/.github/workflows/checkBuild.yml +++ b/.github/workflows/checkBuild.yml @@ -21,7 +21,7 @@ jobs: strategy: matrix: - java: [17] + java: [17, 21] distribution: [temurin] steps: From 36b201e9c37a935cc1d209d8427b847a6f81da1f Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 26 Oct 2023 16:18:36 +0200 Subject: [PATCH 04/26] Recommend Java 21 for development --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8468781..2f8dd90 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,7 @@ We also encourage you to read the [contribution instructions by GitHub](https:// ### Software Requirements You should have the following things installed: * Git -* Java 17 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/)) +* Java 21 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/)) * Maven ### Recommended setup From 77bcbb30915b41cb0597d05c960ac185c9a2c8b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 00:54:24 +0000 Subject: [PATCH 05/26] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.0 to 3.6.2 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.0 to 3.6.2. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.6.0...maven-javadoc-plugin-3.6.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- standard-maven-template/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml index 4cf308c..7884169 100644 --- a/standard-maven-template/pom.xml +++ b/standard-maven-template/pom.xml @@ -129,7 +129,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.0 + 3.6.2 attach-javadocs From 0cf81c0b1532c36ec5ea25e391858617f33c463d Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Tue, 7 Nov 2023 09:24:28 +0100 Subject: [PATCH 06/26] Place bracket correctly --- .github/workflows/update-from-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml index a02a834..3d35a5c 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -86,7 +86,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | gh_pr_up() { - gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@" + gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || (git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@") } gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \ --title "Update from template" \ From e458faaeec9cb3285a9a40e9311fc02fb8f7590a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 00:50:59 +0000 Subject: [PATCH 07/26] Bump actions/setup-java from 3 to 4 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/checkBuild.yml | 2 +- .github/workflows/release.yml | 6 +++--- .github/workflows/sonar.yml | 2 +- .github/workflows/test-deploy.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml index 2e93229..8d2a0bb 100644 --- a/.github/workflows/checkBuild.yml +++ b/.github/workflows/checkBuild.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b2ae4d2..b370373 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'temurin' @@ -120,7 +120,7 @@ jobs: git pull - name: Set up JDK Apache Maven Central - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: # running setup-java again overwrites the settings.xml java-version: '17' distribution: 'temurin' @@ -152,7 +152,7 @@ jobs: git pull - name: Setup - Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'temurin' diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index f7c82af..7c3e344 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -31,7 +31,7 @@ jobs: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index d2a8e2f..0bf5779 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up JDK OSSRH - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: # running setup-java again overwrites the settings.xml distribution: 'temurin' java-version: '17' From 4efe636afe4cea99efc0bd8fa196326c2f0a093c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 00:42:14 +0000 Subject: [PATCH 08/26] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.2 to 3.6.3. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.6.2...maven-javadoc-plugin-3.6.3) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- standard-maven-template/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml index 7884169..1c8d796 100644 --- a/standard-maven-template/pom.xml +++ b/standard-maven-template/pom.xml @@ -129,7 +129,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.2 + 3.6.3 attach-javadocs From 4cd258eadde8f86f32e03e96466d3adc2b46bda8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 00:09:07 +0000 Subject: [PATCH 09/26] Bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/checkBuild.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml index 8d2a0bb..cf1783a 100644 --- a/.github/workflows/checkBuild.yml +++ b/.github/workflows/checkBuild.yml @@ -56,7 +56,7 @@ jobs: fi - name: Upload demo files - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: demo-files-java-${{ matrix.java }} path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b370373..67e08a5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -163,7 +163,7 @@ jobs: working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} - name: Upload licenses - Upload Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dependencies-licenses path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/site From d200d7ecb3d452bd52db43271b5988112964f27d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 00:49:03 +0000 Subject: [PATCH 10/26] Bump org.apache.maven.plugins:maven-compiler-plugin Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.11.0 to 3.12.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.11.0...maven-compiler-plugin-3.12.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- standard-maven-template-demo/pom.xml | 2 +- standard-maven-template/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/standard-maven-template-demo/pom.xml b/standard-maven-template-demo/pom.xml index 018a999..420499a 100644 --- a/standard-maven-template-demo/pom.xml +++ b/standard-maven-template-demo/pom.xml @@ -41,7 +41,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.12.1 ${maven.compiler.release} diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml index 1c8d796..be62129 100644 --- a/standard-maven-template/pom.xml +++ b/standard-maven-template/pom.xml @@ -118,7 +118,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.12.1 ${maven.compiler.release} From cd1c9a47ce02cab0640facfe2d8576883fee0028 Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Thu, 11 Jan 2024 10:20:36 +0100 Subject: [PATCH 11/26] Include jakarta in import order Fixes #5 --- .idea/codeStyles/Project.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index ffd40bd..65b8cb4 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -17,6 +17,8 @@ + + From c630864a8f117d64272e54dc97100ae7051df870 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 11 Jan 2024 15:10:49 +0100 Subject: [PATCH 12/26] Rework checkstyle * Update IntelliJ Checkstyle version * Move to non obstructing folder ``.config`` * Rework checkstyle file * Remove default values if possible * Remove outdated and non working checks * Remove exclusion for ``software.xdev`` which made this checkstyle useless * Create suppression file for individual projects https://github.com/xdev-software/github/issues/18 --- .config/checkstyle/checkstyle.xml | 137 ++++++++++++ .config/checkstyle/suppressions.xml | 6 + .idea/checkstyle-idea.xml | 4 +- config/checkstyle/checkstyle.xml | 311 ---------------------------- 4 files changed, 145 insertions(+), 313 deletions(-) create mode 100644 .config/checkstyle/checkstyle.xml create mode 100644 .config/checkstyle/suppressions.xml delete mode 100644 config/checkstyle/checkstyle.xml diff --git a/.config/checkstyle/checkstyle.xml b/.config/checkstyle/checkstyle.xml new file mode 100644 index 0000000..cbda6d4 --- /dev/null +++ b/.config/checkstyle/checkstyle.xml @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.config/checkstyle/suppressions.xml b/.config/checkstyle/suppressions.xml new file mode 100644 index 0000000..16d385e --- /dev/null +++ b/.config/checkstyle/suppressions.xml @@ -0,0 +1,6 @@ + + + + diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml index f68c212..9a5d4ff 100644 --- a/.idea/checkstyle-idea.xml +++ b/.idea/checkstyle-idea.xml @@ -1,7 +1,7 @@ - 10.1 + 10.12.5 JavaOnlyWithTests true true @@ -13,7 +13,7 @@ (bundled) (bundled) - $PROJECT_DIR$/config/checkstyle/checkstyle.xml + $PROJECT_DIR$/.config/checkstyle/checkstyle.xml diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml deleted file mode 100644 index 710e3e6..0000000 --- a/config/checkstyle/checkstyle.xml +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 09d20ce213c2948b3c95671f2246458ad265225e Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 11 Jan 2024 15:38:37 +0100 Subject: [PATCH 13/26] Checkstyle + Maven --- pom.xml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pom.xml b/pom.xml index ada9282..e3f6ed1 100644 --- a/pom.xml +++ b/pom.xml @@ -26,4 +26,36 @@ repo + + + + checkstyle + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.3.1 + + + com.puppycrawl.tools + checkstyle + 10.12.7 + + + + .config/checkstyle/checkstyle.xml + + + + + check + + + + + + + + From ff92e4a6ac31dfa48bc2eccd625da0732ad409d2 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 11 Jan 2024 15:40:46 +0100 Subject: [PATCH 14/26] Run Checkstyle in workflow --- .github/workflows/checkBuild.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml index cf1783a..9b50dad 100644 --- a/.github/workflows/checkBuild.yml +++ b/.github/workflows/checkBuild.yml @@ -61,3 +61,24 @@ jobs: name: demo-files-java-${{ matrix.java }} path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar if-no-files-found: error + + code-style: + runs-on: ubuntu-latest + + strategy: + matrix: + java: [17] + distribution: [temurin] + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK + uses: actions/setup-java@v4 + with: + distribution: ${{ matrix.distribution }} + java-version: ${{ matrix.java }} + cache: 'maven' + + - name: Run Checkstyle + run: mvn -B checkstyle:check -P checkstyle -T2C From 39be7170d94de7c655da8cca0caf5701aad419ec Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 11 Jan 2024 15:41:13 +0100 Subject: [PATCH 15/26] Adjust ignored workflow paths --- .github/workflows/checkBuild.yml | 6 ++++++ .github/workflows/sonar.yml | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml index 9b50dad..c7b324d 100644 --- a/.github/workflows/checkBuild.yml +++ b/.github/workflows/checkBuild.yml @@ -6,10 +6,16 @@ on: branches: [ develop ] paths-ignore: - '**.md' + - '.config/**' + - '.idea/**' + - 'assets/**' pull_request: branches: [ develop ] paths-ignore: - '**.md' + - '.config/**' + - '.idea/**' + - 'assets/**' env: PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }} diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 7c3e344..7600223 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -6,14 +6,16 @@ on: branches: [ develop ] paths-ignore: - '**.md' + - '.config/**' + - '.idea/**' - 'assets/**' - - 'config/**' pull_request: types: [opened, synchronize, reopened] paths-ignore: - '**.md' + - '.config/**' + - '.idea/**' - 'assets/**' - - 'config/**' env: SONARCLOUD_ORG: ${{ github.event.organization.login }} From eabda82c489e4d6d985b50f4c7fdf065d7b99691 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 11 Jan 2024 16:15:57 +0100 Subject: [PATCH 16/26] Fix maven checkstyle As root module is just there to track the independent child modules, they don't get the plugin's configuration --- pom.xml | 18 ++-------------- standard-maven-template-demo/pom.xml | 31 ++++++++++++++++++++++++++++ standard-maven-template/pom.xml | 29 ++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index e3f6ed1..aeeadbc 100644 --- a/pom.xml +++ b/pom.xml @@ -29,30 +29,16 @@ + checkstyle org.apache.maven.plugins maven-checkstyle-plugin - 3.3.1 - - - com.puppycrawl.tools - checkstyle - 10.12.7 - - - .config/checkstyle/checkstyle.xml + true - - - - check - - - diff --git a/standard-maven-template-demo/pom.xml b/standard-maven-template-demo/pom.xml index 420499a..d006d08 100644 --- a/standard-maven-template-demo/pom.xml +++ b/standard-maven-template-demo/pom.xml @@ -79,4 +79,35 @@ + + + checkstyle + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.3.1 + + + com.puppycrawl.tools + checkstyle + 10.12.7 + + + + ../.config/checkstyle/checkstyle.xml + + + + + check + + + + + + + + diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml index be62129..2efde83 100644 --- a/standard-maven-template/pom.xml +++ b/standard-maven-template/pom.xml @@ -204,5 +204,34 @@ + + checkstyle + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.3.1 + + + com.puppycrawl.tools + checkstyle + 10.12.7 + + + + ../.config/checkstyle/checkstyle.xml + + + + + check + + + + + + + From c10c778467d19c30a8d246bef43bf8e507c34728 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 11 Jan 2024 16:23:29 +0100 Subject: [PATCH 17/26] Fix maven warning --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index aeeadbc..966e945 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,7 @@ org.apache.maven.plugins maven-checkstyle-plugin + 3.3.1 true From 1714a0e71ccb58bad0acf04a9c698b8c01906699 Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 16 Jan 2024 13:55:42 +0100 Subject: [PATCH 18/26] Ignore src/gen(erated) files --- .config/checkstyle/checkstyle.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.config/checkstyle/checkstyle.xml b/.config/checkstyle/checkstyle.xml index cbda6d4..506f37c 100644 --- a/.config/checkstyle/checkstyle.xml +++ b/.config/checkstyle/checkstyle.xml @@ -34,6 +34,10 @@ + + + + From 6fdcf4683a7eed094918cbd97565e130e3cb82c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 01:01:08 +0000 Subject: [PATCH 19/26] Bump actions/cache from 3 to 4 Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/sonar.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 7600223..a255e87 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -39,14 +39,14 @@ jobs: java-version: 17 - name: Cache SonarCloud packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar - name: Cache Maven packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} From 85dfdc94c644594838aab1bc51e66f2df5d2224e Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 18 Jan 2024 13:03:35 +0100 Subject: [PATCH 20/26] ``com.xdev-software`` -> ``software.xdev`` https://github.com/xdev-software/github/issues/5 --- .github/workflows/release.yml | 6 +++--- .github/workflows/test-deploy.yml | 4 ++-- README.md | 2 +- pom.xml | 2 +- standard-maven-template-demo/pom.xml | 4 ++-- standard-maven-template/pom.xml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 67e08a5..e03a52d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -101,7 +101,7 @@ jobs: Add the following lines to your pom: ```XML - com.xdev-software + software.xdev ${{ env.PRIMARY_MAVEN_MODULE }} ${{ steps.version.outputs.release }} @@ -133,8 +133,8 @@ jobs: - name: Publish to Apache Maven Central run: mvn -B deploy -Possrh env: - MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} - MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} + MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index 0bf5779..4e883f8 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -27,6 +27,6 @@ jobs: run: mvn -B deploy -Possrh working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} env: - MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} - MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} + MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} diff --git a/README.md b/README.md index e288929..b90c3eb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/standard-maven-template?logo=apache%20maven)](https://mvnrepository.com/artifact/com.xdev-software/standard-maven-template) +[![Latest version](https://img.shields.io/maven-central/v/software.xdev/standard-maven-template?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/standard-maven-template) [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/standard-maven-template/checkBuild.yml?branch=develop)](https://github.com/xdev-software/standard-maven-template/actions/workflows/checkBuild.yml?query=branch%3Adevelop) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_standard-maven-template&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_standard-maven-template) diff --git a/pom.xml b/pom.xml index 966e945..4e48f7a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.xdev-software + software.xdev standard-maven-template-root 1.0.0-SNAPSHOT pom diff --git a/standard-maven-template-demo/pom.xml b/standard-maven-template-demo/pom.xml index d006d08..c612333 100644 --- a/standard-maven-template-demo/pom.xml +++ b/standard-maven-template-demo/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.xdev-software + software.xdev standard-maven-template-demo 1.0.0-SNAPSHOT jar @@ -28,7 +28,7 @@ - com.xdev-software + software.xdev standard-maven-template ${project.version} diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml index 2efde83..3f871ce 100644 --- a/standard-maven-template/pom.xml +++ b/standard-maven-template/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.xdev-software + software.xdev standard-maven-template 1.0.0-SNAPSHOT jar From 4cfb4dcfa28c88ae4b62b182df8acc0fde1015b1 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 18 Jan 2024 13:33:46 +0100 Subject: [PATCH 21/26] Use new sonatype server https://github.com/xdev-software/github/issues/5 --- standard-maven-template/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml index 3f871ce..6b14131 100644 --- a/standard-maven-template/pom.xml +++ b/standard-maven-template/pom.xml @@ -76,11 +76,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://s01.oss.sonatype.org/content/repositories/snapshots ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ @@ -195,7 +195,7 @@ true ossrh - https://oss.sonatype.org/ + https://s01.oss.sonatype.org/ 30 true From 240d287e3eeede0f05882b0fb1795d27f01ae9bd Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 19 Jan 2024 10:02:49 +0100 Subject: [PATCH 22/26] Rename --- .../pom.xml | 0 {standard-maven-template => microstream-afs-ibm-cos}/pom.xml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {standard-maven-template-demo => microstream-afs-ibm-cos-demo}/pom.xml (100%) rename {standard-maven-template => microstream-afs-ibm-cos}/pom.xml (100%) diff --git a/standard-maven-template-demo/pom.xml b/microstream-afs-ibm-cos-demo/pom.xml similarity index 100% rename from standard-maven-template-demo/pom.xml rename to microstream-afs-ibm-cos-demo/pom.xml diff --git a/standard-maven-template/pom.xml b/microstream-afs-ibm-cos/pom.xml similarity index 100% rename from standard-maven-template/pom.xml rename to microstream-afs-ibm-cos/pom.xml From a4498d682a27e8b1a34c2ea30596b22dfb280fb2 Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 19 Jan 2024 10:36:28 +0100 Subject: [PATCH 23/26] Restore defaults so that they can be kept in sync --- .run/Run Demo.run.xml | 4 +--- .../src/main/java/software/xdev/{microstream => }/App.java | 0 2 files changed, 1 insertion(+), 3 deletions(-) rename microstream-afs-ibm-cos-demo/src/main/java/software/xdev/{microstream => }/App.java (100%) diff --git a/.run/Run Demo.run.xml b/.run/Run Demo.run.xml index 3289074..5b584b3 100644 --- a/.run/Run Demo.run.xml +++ b/.run/Run Demo.run.xml @@ -1,8 +1,6 @@ -