Skip to content

Update from template #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 46 commits into from
May 15, 2025
Merged
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
febb982
Update dependency org.apache.maven.plugins:maven-compiler-plugin to v…
xdev-renovate Feb 22, 2025
0d53a9b
Update dependency com.puppycrawl.tools:checkstyle to v10.21.3
xdev-renovate Feb 24, 2025
15a053a
Update dependency org.codehaus.mojo:flatten-maven-plugin to v1.7.0
xdev-renovate Feb 26, 2025
eacac5a
Update dependency org.apache.maven.plugins:maven-project-info-reports…
xdev-renovate Feb 27, 2025
a3c85c1
Update net.sourceforge.pmd to v7.11.0
xdev-renovate Mar 1, 2025
2a74a51
Merge pull request #139 from xdev-software/renovate/net.sourceforge.pmd
AB-xdev Mar 3, 2025
cbd32f0
Merge pull request #137 from xdev-software/renovate/org.codehaus.mojo…
AB-xdev Mar 3, 2025
2ec54bb
Merge pull request #136 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Mar 3, 2025
390c4a1
Merge pull request #135 from xdev-software/renovate/org.apache.maven.…
AB-xdev Mar 3, 2025
b1b8bf9
Merge pull request #138 from xdev-software/renovate/org.apache.maven.…
AB-xdev Mar 3, 2025
378beb5
Update dependency com.puppycrawl.tools:checkstyle to v10.21.4
xdev-renovate Mar 5, 2025
c6cda5b
Merge pull request #140 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Mar 10, 2025
0a57f91
Use correct directory for PMD
AB-xdev Mar 13, 2025
188e420
Use correct directory for PMD
AB-xdev Mar 13, 2025
7d97305
Naming
AB-xdev Mar 14, 2025
53829e0
Simplify module extraction
AB-xdev Mar 14, 2025
cf59a66
Speed up check code
AB-xdev Mar 14, 2025
bb022ad
Use SPDX identifier for license name
AB-xdev Mar 17, 2025
da9442e
Update dependency com.mycila:license-maven-plugin to v5
xdev-renovate Mar 20, 2025
f1d643f
Merge pull request #141 from xdev-software/renovate/com.mycila-licens…
AB-xdev Mar 20, 2025
2e7b1b6
sonarcloud was renamed to sonarqubecloud
AB-xdev Mar 21, 2025
888b4ce
Fix branch deletion being not detected
AB-xdev Mar 21, 2025
8f154b7
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Mar 21, 2025
530ed04
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Mar 21, 2025
c021044
Pin unofficial actions versions
AB-xdev Mar 26, 2025
8f6df23
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Mar 26, 2025
2dc1e86
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Mar 26, 2025
581b7fb
Pin unofficial actions versions
AB-xdev Mar 26, 2025
5ced1cc
Update net.sourceforge.pmd to v7.12.0
xdev-renovate Mar 29, 2025
49db248
Update dependency com.puppycrawl.tools:checkstyle to v10.22.0
xdev-renovate Mar 31, 2025
4eef9ec
Improve Code Analysis
AB-xdev Mar 31, 2025
48291c2
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Mar 31, 2025
bc3f53c
Merge pull request #144 from xdev-software/renovate/net.sourceforge.pmd
AB-xdev Mar 31, 2025
97a4b0e
Merge pull request #145 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Mar 31, 2025
e5152dc
Update lycheeverse/lychee-action digest to 1d97d84
xdev-renovate Apr 1, 2025
42ebbfd
Merge pull request #2 from xdev-software/renovate/lycheeverse-lychee-…
AB-xdev Apr 2, 2025
27fddce
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Apr 3, 2025
7091b70
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Apr 3, 2025
4ff7c84
Update dependency com.puppycrawl.tools:checkstyle to v10.23.0
xdev-renovate Apr 3, 2025
887e323
Merge pull request #149 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Apr 3, 2025
9f5cab5
Enforce IDEA plugins
AB-xdev Apr 22, 2025
e67bdaa
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Apr 22, 2025
855c40a
Update net.sourceforge.pmd to v7.13.0
xdev-renovate Apr 26, 2025
7c3c850
Update dependency com.puppycrawl.tools:checkstyle to v10.23.1
xdev-renovate Apr 28, 2025
7d38031
Merge pull request #152 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Apr 28, 2025
5ba23c7
Merge pull request #151 from xdev-software/renovate/net.sourceforge.pmd
AB-xdev Apr 28, 2025
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
13 changes: 12 additions & 1 deletion .config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
@@ -52,6 +52,7 @@
<module name="TreeWalker">
<!-- Checks - sorted alphabetically -->
<module name="ArrayTypeStyle"/>
<module name="AvoidDoubleBraceInitialization"/>
<module name="AvoidStarImport"/>
<module name="ConstantName"/>
<module name="DefaultComesLast"/>
@@ -68,6 +69,11 @@
<module name="FinalParameters"/>
<module name="GenericWhitespace"/>
<module name="HideUtilityClassConstructor"/>
<module name="IllegalCatch">
<!-- https://docs.pmd-code.org/pmd-doc-7.11.0/pmd_rules_java_errorprone.html#avoidcatchingnpe -->
<!-- https://docs.pmd-code.org/pmd-doc-7.11.0/pmd_rules_java_errorprone.html#avoidcatchingthrowable -->
<property name="illegalClassNames" value="Error,Throwable,NullPointerException,java.lang.Error,java.lang.Throwable,java.lang.NullPointerException"/>
</module>
<module name="IllegalImport"/>
<module name="InterfaceIsType"/>
<module name="JavadocStyle">
@@ -93,7 +99,6 @@
<module name="MethodParamPad"/>
<module name="MissingDeprecated"/>
<module name="MissingOverride"/>
<module name="MissingSwitchDefault"/>
<module name="ModifierOrder"/>
<module name="NeedBraces"/>
<module name="NoClone"/>
@@ -122,7 +127,13 @@
</module>
<module name="TypecastParenPad"/>
<module name="TypeName"/>
<module name="UnnecessaryParentheses"/>
<module name="UnnecessarySemicolonAfterOuterTypeDeclaration"/>
<module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
<module name="UnnecessarySemicolonInEnumeration"/>
<module name="UnnecessarySemicolonInTryWithResources"/>
<module name="UnusedImports"/>
<module name="UnusedLocalVariable"/>
<module name="UpperEll"/>
<module name="VisibilityModifier">
<property name="packageAllowed" value="true"/>
43 changes: 39 additions & 4 deletions .config/pmd/ruleset.xml
Original file line number Diff line number Diff line change
@@ -10,16 +10,38 @@

<!-- Only rules that don't overlap with CheckStyle! -->

<rule ref="category/java/bestpractices.xml/AvoidPrintStackTrace"/>
<rule ref="category/java/bestpractices.xml/AvoidStringBufferField"/>
<rule ref="category/java/bestpractices.xml/AvoidUsingHardCodedIP"/>
<rule ref="category/java/bestpractices.xml/ConstantsInInterface"/>
<rule ref="category/java/bestpractices.xml/ExhaustiveSwitchHasDefault"/>
<rule ref="category/java/bestpractices.xml/LiteralsFirstInComparisons"/>
<!-- CheckStyle can't handle this switch behavior -> delegated to PMD -->
<rule ref="category/java/bestpractices.xml/NonExhaustiveSwitch"/>
<rule ref="category/java/bestpractices.xml/OneDeclarationPerLine">
<properties>
<property name="strictMode" value="true"/>
</properties>
</rule>
<rule ref="category/java/bestpractices.xml/PreserveStackTrace"/>
<rule ref="category/java/bestpractices.xml/SimplifiableTestAssertion"/>
<rule ref="category/java/bestpractices.xml/SystemPrintln"/>
<rule ref="category/java/bestpractices.xml/UnusedAssignment"/>
<rule ref="category/java/bestpractices.xml/UnusedFormalParameter"/>
<rule ref="category/java/bestpractices.xml/UnusedPrivateField"/>
<rule ref="category/java/bestpractices.xml/UnusedPrivateMethod"/>
<rule ref="category/java/bestpractices.xml/UseCollectionIsEmpty"/>
<rule ref="category/java/bestpractices.xml/UseEnumCollections"/>
<rule ref="category/java/bestpractices.xml/UseStandardCharsets"/>
<rule ref="category/java/bestpractices.xml/UseTryWithResources"/>

<!-- Native code is platform dependent; Loading external native libs might pose a security threat -->
<rule ref="category/java/codestyle.xml/AvoidUsingNativeCode"/>
<rule ref="category/java/codestyle.xml/IdenticalCatchBranches"/>
<rule ref="category/java/codestyle.xml/LambdaCanBeMethodReference"/>
<rule ref="category/java/codestyle.xml/NoPackage"/>
<rule ref="category/java/codestyle.xml/PrematureDeclaration"/>
<rule ref="category/java/codestyle.xml/UnnecessarySemicolon"/>

<rule ref="category/java/design.xml">
<!-- Sometimes abstract classes have just fields -->
@@ -76,9 +98,6 @@

<!-- Limit too low -->
<exclude name="UseObjectForClearerAPI"/>

<!-- Handled by checkstyle -->
<exclude name="UseUtilityClass"/>
</rule>

<rule ref="category/java/design.xml/AvoidDeeplyNestedIfStmts">
@@ -114,17 +133,33 @@
</properties>
</rule>

<rule ref="category/java/errorprone.xml/AssignmentToNonFinalStatic"/>
<rule ref="category/java/errorprone.xml/AvoidDecimalLiteralsInBigDecimalConstructor"/>
<rule ref="category/java/errorprone.xml/AvoidMultipleUnaryOperators"/>
<rule ref="category/java/errorprone.xml/AvoidUsingOctalValues"/>
<rule ref="category/java/errorprone.xml/BrokenNullCheck"/>
<rule ref="category/java/errorprone.xml/ComparisonWithNaN"/>
<rule ref="category/java/errorprone.xml/DoNotCallGarbageCollectionExplicitly"/>
<rule ref="category/java/errorprone.xml/DontImportSun"/>
<rule ref="category/java/errorprone.xml/DontUseFloatTypeForLoopIndices"/>
<rule ref="category/java/errorprone.xml/EqualsNull"/>
<rule ref="category/java/errorprone.xml/IdempotentOperations"/>
<rule ref="category/java/errorprone.xml/ImplicitSwitchFallThrough"/>
<rule ref="category/java/errorprone.xml/InstantiationToGetClass"/>
<rule ref="category/java/errorprone.xml/InvalidLogMessageFormat"/>
<rule ref="category/java/errorprone.xml/JumbledIncrementer"/>
<rule ref="category/java/errorprone.xml/MisplacedNullCheck"/>
<rule ref="category/java/errorprone.xml/MoreThanOneLogger"/>
<rule ref="category/java/errorprone.xml/NonStaticInitializer"/>
<rule ref="category/java/errorprone.xml/ReturnFromFinallyBlock"/>
<rule ref="category/java/errorprone.xml/SingletonClassReturningNewInstance"/>
<rule ref="category/java/errorprone.xml/UnconditionalIfStatement"/>
<rule ref="category/java/errorprone.xml/UnnecessaryCaseChange"/>
<rule ref="category/java/errorprone.xml/UselessOperationOnImmutable"/>


<rule ref="category/java/multithreading.xml">
<!-- Just bloats code -->
<!-- Just bloats code; improved in JEP-491/Java 24+ -->
<exclude name="AvoidSynchronizedAtMethodLevel"/>

<!-- NOPE -->
4 changes: 2 additions & 2 deletions .github/workflows/broken-links.yml
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ jobs:

- name: Link Checker
id: lychee
uses: lycheeverse/lychee-action@v2
uses: lycheeverse/lychee-action@1d97d84f0bc547f7b25f4c2170d87d810dc2fb2c # v2
with:
fail: false # Don't fail on broken links, create an issue instead

@@ -38,7 +38,7 @@ jobs:

- name: Create Issue From File
if: env.lychee_exit_code != 0
uses: peter-evans/create-issue-from-file@v5
uses: peter-evans/create-issue-from-file@e8ef132d6df98ed982188e460ebb3b5d4ef3a9cd # v5
with:
issue-number: ${{ steps.find-issue.outputs.number }}
title: Link Checker Report
5 changes: 1 addition & 4 deletions .github/workflows/check-build.yml
Original file line number Diff line number Diff line change
@@ -127,7 +127,4 @@ jobs:
name: pmd-report
if-no-files-found: ignore
path: |
target/site/*.html
target/site/css/**
target/site/images/logos/maven-feather.png
target/site/images/external.png
target/reports/**
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ jobs:
cache: 'maven'

- name: Build with Maven
run: ./mvnw -B clean package
run: ./mvnw -B clean package -T2C

- name: Check for uncommited changes
run: |
@@ -64,7 +64,7 @@ jobs:
run: |
mvnwPath=$(readlink -f ./mvnw)
modules=("") # root
modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
modules+=($(grep -oP '(?<=<module>)[^<]+' 'pom.xml'))
for i in "${modules[@]}"
do
echo "Processing $i/pom.xml"
@@ -89,7 +89,7 @@ jobs:

- name: Create Release
id: create_release
uses: shogo82148/actions-create-release@v1
uses: shogo82148/actions-create-release@e5f206451d4ace2da9916d01f1aef279997f8659 # v1
with:
tag_name: v${{ steps.version.outputs.release }}
release_name: v${{ steps.version.outputs.release }}
@@ -121,7 +121,7 @@ jobs:
git config --global user.name "GitHub Actions"
git pull

- name: Set up JDK Apache Maven Central
- name: Set up JDK OSSRH
uses: actions/setup-java@v4
with: # running setup-java again overwrites the settings.xml
java-version: '17'
@@ -132,7 +132,7 @@ jobs:
gpg-passphrase: MAVEN_GPG_PASSPHRASE
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}

- name: Publish to Apache Maven Central
- name: Publish to OSSRH
run: ../mvnw -B deploy -Possrh -DskipTests
env:
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
@@ -165,7 +165,7 @@ jobs:
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}

- name: Deploy to Github pages
uses: peaceiris/actions-gh-pages@v4
uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./${{ env.PRIMARY_MAVEN_MODULE }}/target/site
@@ -188,7 +188,7 @@ jobs:
run: |
mvnwPath=$(readlink -f ./mvnw)
modules=("") # root
modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
modules+=($(grep -oP '(?<=<module>)[^<]+' 'pom.xml'))
for i in "${modules[@]}"
do
echo "Processing $i/pom.xml"
2 changes: 1 addition & 1 deletion .github/workflows/sync-labels.yml
Original file line number Diff line number Diff line change
@@ -20,6 +20,6 @@ jobs:
with:
sparse-checkout: .github/labels.yml

- uses: EndBug/label-sync@v2
- uses: EndBug/label-sync@52074158190acb45f3077f9099fea818aa43f97a # v2
with:
config-file: .github/labels.yml
4 changes: 2 additions & 2 deletions .github/workflows/update-from-template.yml
Original file line number Diff line number Diff line change
@@ -202,7 +202,7 @@ jobs:
GH_TOKEN: ${{ secrets.UPDATE_FROM_TEMPLATE_PAT }}
run: |
not_failed_conclusion="skipped|neutral|success"
not_relevant_app_slug="dependabot|github-pages|sonarcloud"
not_relevant_app_slug="dependabot|github-pages|sonarqubecloud"

echo "Waiting for checks to start..."
sleep 40s
@@ -212,7 +212,7 @@ jobs:

echo "Checking if update-branch-merged exists"
git fetch
if [[ $(git rev-parse origin/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
if [[ $(git ls-remote --heads origin refs/heads/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
echo "Branch still exists; Continuing..."
else
echo "Branch origin/${{ env.UPDATE_BRANCH_MERGED }} is missing"
7 changes: 7 additions & 0 deletions .idea/externalDependencies.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@

<licenses>
<license>
<name>Apache License, Version 2.0</name>
<name>Apache-2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
@@ -45,7 +45,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.21.2</version>
<version>10.23.1</version>
</dependency>
</dependencies>
<configuration>
@@ -82,12 +82,12 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
<version>7.10.0</version>
<version>7.13.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>7.10.0</version>
<version>7.13.0</version>
</dependency>
</dependencies>
</plugin>
2 changes: 1 addition & 1 deletion template-placeholder-demo/pom.xml
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<version>3.14.0</version>
<configuration>
<release>${maven.compiler.release}</release>
<compilerArgs>
16 changes: 8 additions & 8 deletions template-placeholder/pom.xml
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@

<licenses>
<license>
<name>Apache License, Version 2.0</name>
<name>Apache-2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
@@ -95,15 +95,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.8.0</version>
<version>3.9.0</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>4.6</version>
<version>5.0.0</version>
<configuration>
<properties>
<email>${project.organization.url}</email>
@@ -132,7 +132,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<version>3.14.0</version>
<configuration>
<release>${maven.compiler.release}</release>
<compilerArgs>
@@ -182,7 +182,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.6.0</version>
<version>1.7.0</version>
<configuration>
<flattenMode>ossrh</flattenMode>
</configuration>
@@ -247,7 +247,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.21.2</version>
<version>10.23.1</version>
</dependency>
</dependencies>
<configuration>
@@ -284,12 +284,12 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
<version>7.10.0</version>
<version>7.13.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>7.10.0</version>
<version>7.13.0</version>
</dependency>
</dependencies>
</plugin>