Skip to content

Commit e45b229

Browse files
authored
Merge pull request #602 from xdev-software/develop
Release
2 parents 47ae853 + cf69808 commit e45b229

25 files changed

Lines changed: 71 additions & 384 deletions

File tree

.config/checkstyle/checkstyle.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
<property name="tokens" value=" CLASS_DEF"/>
8686
</module>
8787
<module name="IllegalImport"/>
88+
<module name="IllegalSymbol"/>
8889
<module name="InterfaceIsType"/>
8990
<module name="JavadocStyle">
9091
<property name="checkFirstSentence" value="false"/>

.config/topo/upstream.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- url: https://github.com/xdev-software/standard-maven-template.git
2+
branch: master

.github/workflows/check-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ jobs:
144144
run: ./mvnw -B pmd:aggregate-cpd pmd:cpd-check -P pmd -DskipTests -T2C
145145

146146
- name: Upload report
147-
if: always()
147+
if: ${{ !cancelled() }}
148148
uses: actions/upload-artifact@v7
149149
with:
150150
name: pmd-report

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
8888
- name: Create Release
8989
id: create-release
90-
uses: shogo82148/actions-create-release@559c27ce7eb834825e2b55927c64f6d1bd1db716 # v1
90+
uses: shogo82148/actions-create-release@6a396031bc74c57403da1018fec74d24c6aa03cd # v1
9191
with:
9292
tag_name: v${{ steps.version.outputs.release }}
9393
release_name: v${{ steps.version.outputs.release }}

.github/workflows/run-integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
- name: WebApp JaCoCo Code Coverage Report
100100
if: ${{ matrix.jacoco && success() }}
101101
id: jacoco_reporter
102-
uses: PavanMudigonda/jacoco-reporter@4fc6bf270fe893e8dda5467e432253a6961345b8 # v5.0
102+
uses: PavanMudigonda/jacoco-reporter@e8b54bfea6a667d1a68624dae8a06ba31670667d # v5.1
103103
with:
104104
coverage_results_path: advanced-demo/target/site/jacoco-aggregate/jacoco.xml
105105
coverage_report_name: WebApp Coverage (${{matrix.parallel}}, ${{matrix.pre-start}}, ${{matrix.java}})

.github/workflows/update-from-template.yml

Lines changed: 0 additions & 320 deletions
This file was deleted.

.idea/checkstyle-idea.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/externalDependencies.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
wrapperVersion=3.3.4
22
distributionType=only-script
3-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
3+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.14/apache-maven-3.9.14-bin.zip

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 3.3.1
2+
* Updated dependencies
3+
14
# 3.3.0
25
* Updated [`testcontainers-selenium`](https://github.com/xdev-software/testcontainers-selenium) to v2
36
* Files are now recorded BY DEFAULT as `.mkv` (was `.mp4`)

0 commit comments

Comments
 (0)