Skip to content

Commit 13537f4

Browse files
committed
Merge remote-tracking branch 'original/master' into module-2
# Conflicts: # .github/workflows/maven_release.yml # .github/workflows/maven_test.yml
2 parents 2ba06f2 + f377eda commit 13537f4

7 files changed

Lines changed: 1309 additions & 11 deletions

File tree

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ updates:
99
directory: "/"
1010
schedule:
1111
interval: "daily"
12+
ignore:
13+
# Ignore semver-major updates until Java 17+ is used for builds.
14+
- dependency-name: "org.hibernate.validator:hibernate-validator"
15+
update-types: ["version-update:semver-major"]
1216
- package-ecosystem: "github-actions"
1317
directory: "/"
1418
schedule:

.github/workflows/maven_release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@ jobs:
1212
name: Build
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1616
with:
1717
fetch-depth: 0
1818
- name: Set up JDK 11
19-
uses: actions/setup-java@v5
19+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2020
with:
2121
java-version: 11
2222
distribution: 'temurin'
2323
- name: Cache and restore Maven packages on master
24-
uses: actions/cache@v4
24+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
2525
if: ${{ github.ref_name == 'master' }}
2626
with:
2727
path: ~/.m2
2828
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
2929
restore-keys: ${{ runner.os }}-m2
3030
- name: Restore Maven packages on PR
31-
uses: actions/cache/restore@v4
31+
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
3232
if: ${{ github.ref_name != 'master' }}
3333
with:
3434
path: ~/.m2
@@ -46,7 +46,7 @@ jobs:
4646
contents: read
4747
packages: write
4848
steps:
49-
- uses: actions/checkout@v5
49+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5050
with:
5151
fetch-depth: 0
5252

@@ -57,7 +57,7 @@ jobs:
5757
gpg --list-secret-keys --keyid-format LONG
5858
5959
- name: Set up Maven Central Repository
60-
uses: actions/setup-java@v5
60+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
6161
with:
6262
java-version: 11
6363
distribution: 'temurin'

.github/workflows/maven_test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ jobs:
1414
name: Test
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v5
17+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1818
with:
1919
fetch-depth: 0
2020
- name: Set up JDK 11
21-
uses: actions/setup-java@v5
21+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2222
with:
2323
java-version: 11
2424
distribution: 'temurin'
2525
- name: Cache and restore Maven packages on master
26-
uses: actions/cache@v4
26+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
2727
if: ${{ github.ref_name == 'master' }}
2828
with:
2929
path: ~/.m2
3030
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
3131
restore-keys: ${{ runner.os }}-m2
3232
- name: Restore Maven packages on PR
33-
uses: actions/cache/restore@v4
33+
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
3434
if: ${{ github.ref_name != 'master' }}
3535
with:
3636
path: ~/.m2

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,7 @@ target
2121
*.iws
2222
.idea/
2323

24-
*.gpg
24+
# VS Code
25+
.vscode
26+
27+
*.gpg

pom.xml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
<javax-validation-api.version>2.0.1.Final</javax-validation-api.version>
4141
<jakarta-validation-api.version>3.1.1</jakarta-validation-api.version>
4242
<junit.version>5.13.4</junit.version>
43+
<hamcrest.version>1.3</hamcrest.version>
44+
<mockito.version>4.11.0</mockito.version>
4345
<!-- endregion -->
4446

4547
<!-- region Plugin Versions -->
@@ -102,7 +104,25 @@
102104
<artifactId>junit-jupiter-api</artifactId>
103105
<scope>test</scope>
104106
</dependency>
107+
<dependency>
108+
<groupId>org.junit.jupiter</groupId>
109+
<artifactId>junit-jupiter-params</artifactId>
110+
<scope>test</scope>
111+
</dependency>
112+
<dependency>
113+
<groupId>org.hamcrest</groupId>
114+
<artifactId>hamcrest-all</artifactId>
115+
<version>${hamcrest.version}</version>
116+
<scope>test</scope>
117+
</dependency>
118+
<dependency>
119+
<groupId>org.mockito</groupId>
120+
<artifactId>mockito-core</artifactId>
121+
<version>${mockito.version}</version>
122+
<scope>test</scope>
123+
</dependency>
105124
<!-- endregion -->
125+
106126
</dependencies>
107127

108128
<build>
@@ -147,6 +167,32 @@
147167
</execution>
148168
</executions>
149169
</plugin>
170+
<plugin>
171+
<groupId>org.apache.maven.plugins</groupId>
172+
<artifactId>maven-surefire-plugin</artifactId>
173+
<version>3.5.4</version>
174+
<configuration>
175+
<statelessTestsetReporter implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5Xml30StatelessReporter">
176+
<disable>false</disable>
177+
<version>3.0</version>
178+
<usePhrasedFileName>false</usePhrasedFileName>
179+
<usePhrasedTestSuiteClassName>true</usePhrasedTestSuiteClassName>
180+
<usePhrasedTestCaseClassName>true</usePhrasedTestCaseClassName>
181+
<usePhrasedTestCaseMethodName>true</usePhrasedTestCaseMethodName>
182+
</statelessTestsetReporter>
183+
<consoleOutputReporter implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5ConsoleOutputReporter">
184+
<disable>false</disable>
185+
<encoding>UTF-8</encoding>
186+
<usePhrasedFileName>false</usePhrasedFileName>
187+
</consoleOutputReporter>
188+
<statelessTestsetInfoReporter implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5StatelessTestsetInfoReporter">
189+
<disable>false</disable>
190+
<usePhrasedFileName>false</usePhrasedFileName>
191+
<usePhrasedClassNameInRunning>true</usePhrasedClassNameInRunning>
192+
<usePhrasedClassNameInTestCaseSummary>true</usePhrasedClassNameInTestCaseSummary>
193+
</statelessTestsetInfoReporter>
194+
</configuration>
195+
</plugin>
150196
<plugin>
151197
<groupId>org.apache.maven.plugins</groupId>
152198
<artifactId>maven-jar-plugin</artifactId>

0 commit comments

Comments
 (0)