Skip to content
This repository has been archived by the owner on Aug 12, 2024. It is now read-only.

Update from template #263

Open
wants to merge 135 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
97034e8
Slight rewording
AB-xdev May 17, 2024
6960457
Update dependency maven to v3.9.7
xdev-renovate May 26, 2024
f22a35b
Update dependency com.puppycrawl.tools:checkstyle to v10.17.0
xdev-renovate May 27, 2024
ea4e5c3
Merge pull request #56 from xdev-software/renovate/com.puppycrawl.too…
AB-xdev May 27, 2024
2f2221e
Merge remote-tracking branch 'origin/renovate/maven-3.x'
AB-xdev May 27, 2024
4575336
Only run sonar workflow when secret is present
AB-xdev May 27, 2024
403faee
Secrets are not available in if
AB-xdev May 27, 2024
d562e83
Update dependency org.sonatype.plugins:nexus-staging-maven-plugin to …
xdev-renovate May 28, 2024
bef3a77
Don't run sonar token check when not required
AB-xdev May 28, 2024
8385277
Merge pull request #59 from xdev-software/renovate/org.sonatype.plugi…
AB-xdev May 28, 2024
8d48e75
Compact/Flatten pom on release
AB-xdev May 28, 2024
439d244
Merge branch 'master' of https://github.com/xdev-software/standard-ma…
AB-xdev May 28, 2024
a16ac06
Standardize job names
AB-xdev May 28, 2024
4de451f
Substitute using repo name
AB-xdev May 28, 2024
21769fc
Normalize workflow names
AB-xdev May 28, 2024
7ab8666
Update dependency org.apache.maven.plugins:maven-site-plugin to v4.0.…
xdev-renovate Jun 1, 2024
3b682e8
Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3…
xdev-renovate Jun 1, 2024
f597d1e
Merge pull request #61 from xdev-software/renovate/org.apache.maven.p…
AB-xdev Jun 3, 2024
087eead
Merge pull request #60 from xdev-software/renovate/org.apache.maven.p…
AB-xdev Jun 3, 2024
0a48eee
Update update-from-template.yml
AB-xdev Jun 3, 2024
b68fe41
Ignore github pages
AB-xdev Jun 3, 2024
dbbac68
Update update-from-template.yml
AB-xdev Jun 3, 2024
100b498
Merge remote-tracking branch 'origin/update-from-template'
AB-xdev Jun 3, 2024
8eed875
Merge remote-tracking branch 'origin/update-from-template'
AB-xdev Jun 3, 2024
1e7be5b
Update org.springframework.boot.version to v3.3.0
xdev-renovate Jun 3, 2024
2848c53
Merge pull request #160 from xdev-software/renovate/org.springframewo…
AB-xdev Jun 3, 2024
a96e946
Update update-from-template.yml
AB-xdev Jun 3, 2024
756b2bc
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 3, 2024
8aef498
Update update-from-template.yml
AB-xdev Jun 3, 2024
61f3be3
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 3, 2024
95142bb
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 3, 2024
25b18c4
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 3, 2024
e48734d
Update update-from-template.yml
AB-xdev Jun 4, 2024
acd6b4a
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 4, 2024
14abd7f
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 5, 2024
3feccd2
Update dependency org.apache.maven.plugins:maven-checkstyle-plugin to…
xdev-renovate Jun 6, 2024
543132b
Merge pull request #66 from xdev-software/renovate/org.apache.maven.p…
AB-xdev Jun 10, 2024
9befd99
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 11, 2024
3db8045
Update vaadin.version to v24.3.13
xdev-renovate Jun 11, 2024
544753b
Fix rev-parse not working
AB-xdev Jun 11, 2024
a042b63
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 11, 2024
49f82a1
Fix problem with fetch depth of 0
AB-xdev Jun 11, 2024
653bb82
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 11, 2024
e73d714
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 11, 2024
ed4713c
Merge pull request #168 from xdev-software/renovate/vaadin.version
AB-xdev Jun 11, 2024
efba25a
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 11, 2024
1b8b6b2
Fully unshallow every as ls-remote also fails
AB-xdev Jun 11, 2024
de9071b
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 11, 2024
17e9934
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 11, 2024
538caf1
Revert "Fully unshallow every as ls-remote also fails"
AB-xdev Jun 11, 2024
ca909f1
Revert "Fix problem with fetch depth of 0"
AB-xdev Jun 11, 2024
38e37eb
Revert "Fix rev-parse not working"
AB-xdev Jun 11, 2024
56ef08a
Correct if
AB-xdev Jun 11, 2024
f9d8378
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 11, 2024
a9e125e
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 11, 2024
03dd571
Update dependency org.apache.maven.plugins:maven-project-info-reports…
xdev-renovate Jun 17, 2024
8446899
Merge pull request #71 from xdev-software/renovate/org.apache.maven.p…
AB-xdev Jun 17, 2024
bab1092
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 18, 2024
7313ce9
Update dependency maven to v3.9.8
xdev-renovate Jun 18, 2024
5854083
Merge pull request #72 from xdev-software/renovate/maven-3.x
AB-xdev Jun 18, 2024
3e41f58
Add default PMD ruleset
AB-xdev Jun 18, 2024
f440a41
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 18, 2024
f697749
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 18, 2024
43ddc48
Attach demo to parent
AB-xdev Jun 18, 2024
3bc085a
Reconfigure root and add pmd
AB-xdev Jun 18, 2024
f5240c0
Add pmd to published module
AB-xdev Jun 18, 2024
11c6f7e
Add pmd to check-build workflow
AB-xdev Jun 18, 2024
217ac87
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 19, 2024
a22d20d
Merge pull request #74 from xdev-software/pmd
AB-xdev Jun 19, 2024
d979ab9
PMD: printFailingErrors
AB-xdev Jun 19, 2024
b970c46
Merge remote-tracking branch 'origin/update-from-template'
AB-xdev Jun 19, 2024
eed3d8a
Update ruleset.xml
AB-xdev Jun 19, 2024
2b01eda
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 19, 2024
d797403
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 19, 2024
6a258c7
Remove duplicate in .gitignore
AB-xdev Jun 20, 2024
359cece
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 21, 2024
8c96631
Update dependency org.apache.maven.plugins:maven-jar-plugin to v3.4.2
xdev-renovate Jun 21, 2024
1209954
Update org.springframework.boot.version to v3.3.1
xdev-renovate Jun 21, 2024
f2290e6
Ignore project internal depenedencies
AB-xdev Jun 24, 2024
abbfaf4
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 24, 2024
23f06e6
Merge pull request #187 from xdev-software/renovate/org.springframewo…
AB-xdev Jun 24, 2024
c993b2c
Merge pull request #185 from xdev-software/renovate/org.apache.maven.…
AB-xdev Jun 24, 2024
1cec0e0
Update dependency org.apache.maven.plugins:maven-project-info-reports…
xdev-renovate Jun 27, 2024
98b2e91
Merge pull request #76 from xdev-software/renovate/org.apache.maven.p…
AB-xdev Jun 27, 2024
27730d2
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 27, 2024
e26126f
[Save Actions] Allow batch activation
AB-xdev Jun 27, 2024
e817320
Don't run tests when publishing in final phase
AB-xdev Jun 27, 2024
241ceb2
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 27, 2024
a497c4b
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 27, 2024
551f14a
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 27, 2024
283794c
Remove unwanted EOL
AB-xdev Jun 27, 2024
3b1cdd0
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 27, 2024
477fc2f
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 27, 2024
8949700
Fix some module versions being bumped twice after a release
AB-xdev Jun 27, 2024
034ee38
Merge branch 'master' of https://github.com/xdev-software/standard-ma…
AB-xdev Jun 27, 2024
5ef8bd4
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 27, 2024
178fa6d
Update vaadin.version to v24.4.4
xdev-renovate Jun 27, 2024
d9d6964
New path for frontend folder
AB-xdev Jun 28, 2024
249af1a
Ignore copilot exclusion as it's shipped now
AB-xdev Jun 28, 2024
0f40b18
Merge pull request #195 from xdev-software/vaadin24
AB-xdev Jun 28, 2024
f6ffd61
Update dependency net.sourceforge.pmd:pmd-core to v7.3.0
xdev-renovate Jun 28, 2024
62aed9a
Update dependency net.sourceforge.pmd:pmd-java to v7.3.0
xdev-renovate Jun 28, 2024
f528016
Merge pull request #79 from xdev-software/renovate/net.sourceforge.pm…
AB-xdev Jun 28, 2024
4d22d20
Merge pull request #80 from xdev-software/renovate/net.sourceforge.pm…
AB-xdev Jun 28, 2024
beba5ca
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 28, 2024
3543796
Group pmd
AB-xdev Jul 1, 2024
77296fc
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jul 2, 2024
501c04d
Fix site failing to find deps
AB-xdev Jul 4, 2024
01a3d1f
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jul 5, 2024
4619bd3
Update vaadin.version to v24.4.6
xdev-renovate Jul 10, 2024
dc7774e
Update dependency org.apache.maven.plugins:maven-pmd-plugin to v3.24.0
xdev-renovate Jul 14, 2024
33122d4
Update dependency org.apache.maven.plugins:maven-project-info-reports…
xdev-renovate Jul 15, 2024
1959ce0
Merge pull request #82 from xdev-software/renovate/org.apache.maven.p…
AB-xdev Jul 17, 2024
db4fd11
Merge pull request #81 from xdev-software/renovate/org.apache.maven.p…
AB-xdev Jul 17, 2024
91e5e71
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jul 17, 2024
e31ae54
Merge pull request #201 from xdev-software/renovate/vaadin.version
AB-xdev Jul 17, 2024
aca0e64
Also skip tests on test deploy
AB-xdev Jul 18, 2024
99f469b
Add release failure docs
AB-xdev Jul 18, 2024
8de8501
Merge pull request #83 from xdev-software/release-failure-docs
AB-xdev Jul 18, 2024
5852553
Update org.springframework.boot.version to v3.3.2
xdev-renovate Jul 19, 2024
6d55944
Merge remote-tracking branch 'origin/update-from-template'
AB-xdev Jul 19, 2024
5f1bf29
Merge pull request #206 from xdev-software/renovate/org.springframewo…
AB-xdev Jul 19, 2024
24d9ce1
Ignore Ncss Count as it does the same as Checkstyle
AB-xdev Jul 19, 2024
0828d5c
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jul 20, 2024
c032590
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jul 20, 2024
9aeed07
Update dependency org.apache.maven.plugins:maven-site-plugin to v4.0.…
xdev-renovate Jul 21, 2024
b9f8a59
Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3…
xdev-renovate Jul 21, 2024
36ce21f
Merge pull request #85 from xdev-software/renovate/org.apache.maven.p…
AB-xdev Jul 23, 2024
0dcfe5a
Merge pull request #86 from xdev-software/renovate/org.apache.maven.p…
AB-xdev Jul 23, 2024
0fe66c2
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jul 24, 2024
0635abd
Update net.sourceforge.pmd to v7.4.0
xdev-renovate Jul 27, 2024
8a03acb
Merge pull request #87 from xdev-software/renovate/net.sourceforge.pmd
AB-xdev Jul 29, 2024
b41de9a
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jul 30, 2024
1052b62
Update vaadin.version to v24.4.7
xdev-renovate Jul 30, 2024
144c0a6
Merge pull request #210 from xdev-software/renovate/vaadin.version
AB-xdev Aug 5, 2024
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
155 changes: 155 additions & 0 deletions .config/pmd/ruleset.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
<?xml version="1.0" encoding="UTF-8"?>
<ruleset name="Default"
xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">

<description>
This ruleset checks the code for discouraged programming constructs.
</description>

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

<rule ref="category/java/bestpractices.xml/AvoidUsingHardCodedIP"/>
<rule ref="category/java/bestpractices.xml/PreserveStackTrace"/>
<rule ref="category/java/bestpractices.xml/UseCollectionIsEmpty"/>
<rule ref="category/java/bestpractices.xml/UseStandardCharsets"/>

<!-- 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/NoPackage"/>
<rule ref="category/java/codestyle.xml/PrematureDeclaration"/>

<rule ref="category/java/design.xml">
<!-- Sometimes abstract classes have just fields -->
<exclude name="AbstractClassWithoutAnyMethod"/>

<!-- Using RuntimeExceptions is ok -->
<exclude name="AvoidCatchingGenericException"/>
<exclude name="AvoidThrowingRawExceptionTypes"/>

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

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

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

<!-- Makes entity classes impossible -->
<exclude name="DataClass"/>

<!-- Used commonly particular in bigger methods with upstream throws -->
<exclude name="ExceptionAsFlowControl"/>

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

<!-- Handled by TooManyFields/TooManyMethods -->
<exclude name="ExcessivePublicCount"/>

<!-- Prohibits accessing members using multiple depths -->
<exclude name="LawOfDemeter"/>

<!-- No effect -->
<exclude name="LoosePackageCoupling"/>

<!-- Prohibits singleton pattern -->
<exclude name="MutableStaticState"/>

<!-- Checks LoC, already handled by Checkstyle -->
<exclude name="NcssCount"/>

<!-- Some override methods or Junit require this -->
<exclude name="SignatureDeclareThrowsException"/>

<!-- Reports FP for equals methods -->
<exclude name="SimplifyBooleanReturns"/>

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

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

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

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

<rule ref="category/java/design.xml/AvoidDeeplyNestedIfStmts">
<properties>
<property name="problemDepth" value="4"/>
</properties>
</rule>
<rule ref="category/java/design.xml/CouplingBetweenObjects">
<properties>
<property name="threshold" value="100"/>
</properties>
</rule>
<rule ref="category/java/design.xml/CyclomaticComplexity">
<properties>
<property name="classReportLevel" value="150"/>
<property name="methodReportLevel" value="25"/>
<property name="cycloOptions" value=""/>
</properties>
</rule>
<rule ref="category/java/design.xml/ExcessiveImports">
<properties>
<property name="minimum" value="200"/>
</properties>
</rule>
<rule ref="category/java/design.xml/TooManyFields">
<properties>
<property name="maxfields" value="50"/>
</properties>
</rule>
<rule ref="category/java/design.xml/TooManyMethods">
<properties>
<property name="maxmethods" value="100"/>
</properties>
</rule>

<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/MisplacedNullCheck"/>
<rule ref="category/java/errorprone.xml/UnnecessaryCaseChange"/>


<rule ref="category/java/multithreading.xml">
<!-- Just bloats code -->
<exclude name="AvoidSynchronizedAtMethodLevel"/>

<!-- NOPE -->
<exclude name="DoNotUseThreads"/>

<!-- Doesn't detect nested thread safe singleton pattern -->
<exclude name="NonThreadSafeSingleton"/>

<!-- Should relevant for fields that use multithreading which is rare -->
<exclude name="UseConcurrentHashMap"/>
</rule>

<rule ref="category/java/performance.xml">
<!-- This was fixed in Java 10 -->
<exclude name="AvoidFileStream"/>

<!-- Used everywhere and has neglectable performance impact -->
<exclude name="AvoidInstantiatingObjectsInLoops"/>

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

<!-- Nowadays optimized by compiler; No code bloating needed -->
<exclude name="UseStringBufferForStringAppends"/>
</rule>

<rule ref="category/java/security.xml"/>
</ruleset>
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar
if-no-files-found: error

code-style:
checkstyle:
runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}

Expand All @@ -91,3 +91,40 @@ jobs:

- name: Run Checkstyle
run: ./mvnw -B checkstyle:check -P checkstyle -T2C

pmd:
runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}

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 PMD
run: ./mvnw -B test pmd:aggregate-pmd-no-fork pmd:check -P pmd -DskipTests -T2C

- name: Run CPD (Copy Paste Detector)
run: ./mvnw -B pmd:aggregate-cpd pmd:cpd-check -P pmd -DskipTests -T2C

- name: Upload report
if: always()
uses: actions/upload-artifact@v4
with:
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
26 changes: 13 additions & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:
pull-requests: write

jobs:
check_code: # Validates the code
check-code:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -45,9 +45,9 @@ jobs:
exit 1
fi

prepare_release:
prepare-release:
runs-on: ubuntu-latest
needs: [check_code]
needs: [check-code]
outputs:
upload_url: ${{ steps.create_release.outputs.upload_url }}
steps:
Expand Down Expand Up @@ -93,8 +93,8 @@ jobs:
release_name: v${{ steps.version.outputs.release }}
commitish: master
body: |
## [Changelog](https://github.com/xdev-software/${{ env.PRIMARY_MAVEN_MODULE }}/blob/develop/CHANGELOG.md#${{ steps.version.outputs.releasenumber }})
See [Changelog#v${{ steps.version.outputs.release }}](https://github.com/xdev-software/${{ env.PRIMARY_MAVEN_MODULE }}/blob/develop/CHANGELOG.md#${{ steps.version.outputs.releasenumber }}) for more information.
## [Changelog](https://github.com/${{ github.repository }}/blob/develop/CHANGELOG.md#${{ steps.version.outputs.releasenumber }})
See [Changelog#v${{ steps.version.outputs.release }}](https://github.com/${{ github.repository }}/blob/develop/CHANGELOG.md#${{ steps.version.outputs.releasenumber }}) for more information.

## Installation
Add the following lines to your pom:
Expand All @@ -109,9 +109,9 @@ jobs:
### Additional notes
* [Spring-Boot] You may have to include ``software/xdev`` inside [``vaadin.allowed-packages``](https://vaadin.com/docs/latest/integrations/spring/configuration#configure-the-scanning-of-packages)

publish_central: # Publish the code to central
publish-maven:
runs-on: ubuntu-latest
needs: [prepare_release]
needs: [prepare-release]
steps:
- uses: actions/checkout@v4

Expand All @@ -133,7 +133,7 @@ jobs:
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}

- name: Publish to Apache Maven Central
run: ../mvnw -B deploy -Possrh
run: ../mvnw -B deploy -Possrh -DskipTests
env:
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
Expand All @@ -142,7 +142,7 @@ jobs:

publish-pages:
runs-on: ubuntu-latest
needs: [prepare_release]
needs: [prepare-release]
steps:
- uses: actions/checkout@v4

Expand All @@ -160,7 +160,7 @@ jobs:
cache: 'maven'

- name: Build site
run: ../mvnw -B site
run: ../mvnw -B compile site -DskipTests -T2C
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}

- name: Deploy to Github pages
Expand All @@ -169,9 +169,9 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./${{ env.PRIMARY_MAVEN_MODULE }}/target/site

after_release:
after-release:
runs-on: ubuntu-latest
needs: [publish_central]
needs: [publish-maven]
steps:
- uses: actions/checkout@v4

Expand All @@ -189,7 +189,7 @@ jobs:
for i in "${modules[@]}"
do
echo "Processing $i/pom.xml"
(cd "$i" && $mvnwPath -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true)
(cd "$i" && $mvnwPath -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true -DupdateMatchingVersions=false)
done

- name: Git Commit and Push
Expand Down
18 changes: 15 additions & 3 deletions .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,22 @@ env:
SONARCLOUD_HOST: https://sonarcloud.io

jobs:
sonar:
name: SonarCloud Scan
token-check:
runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
if: ${{ !(github.event_name == 'pull_request' && startsWith(github.head_ref, 'renovate/')) }}
outputs:
hasToken: ${{ steps.check-token.outputs.has }}
steps:
- id: check-token
run: |
[ -z $SONAR_TOKEN ] && echo "has=false" || echo "has=true" >> "$GITHUB_OUTPUT"
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

sonar-scan:
runs-on: ubuntu-latest
needs: token-check
if: ${{ needs.token-check.outputs.hasToken }}
steps:
- uses: actions/checkout@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ env:
PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}

jobs:
publish_central: # Publish the code to central
publish-maven:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -24,7 +24,7 @@ jobs:
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}

- name: Publish to OSSRH
run: ../mvnw -B deploy -Possrh
run: ../mvnw -B deploy -Possrh -DskipTests
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
env:
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
Expand Down
Loading