Skip to content

Commit 215e6fa

Browse files
committed
Merge branch 'main' into java-25
# Conflicts: # pom.xml
2 parents 37ca8e0 + 8fc0e7c commit 215e6fa

15 files changed

+265
-229
lines changed

app/package-lock.json

Lines changed: 35 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

db/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

integration-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<plugin>
109109
<groupId>org.codehaus.mojo</groupId>
110110
<artifactId>exec-maven-plugin</artifactId>
111-
<version>3.5.1</version>
111+
<version>3.6.2</version>
112112
<executions>
113113
<execution>
114114
<phase>pre-integration-test</phase>

0 commit comments

Comments
 (0)