Merge branch 'develop' into wicket-10

# Conflicts:
#	pom.xml
This commit is contained in:
Andreas Svanberg 2024-04-22 12:31:07 +02:00
commit c376554530

@ -36,10 +36,10 @@
<hsqldb.version>2.7.1</hsqldb.version>
<mockito.version>5.3.1</mockito.version>
<flyway.version>9.19.1</flyway.version>
<jersey.version>3.1.1</jersey.version>
<jersey.version>3.1.6</jersey.version>
<guice.version>7.0.0</guice.version>
<poi.version>5.2.5</poi.version>
<jackson.version>2.15.0</jackson.version>
<jackson.version>2.17.0</jackson.version>
<!-- Database stuff -->
<database.showSql>false</database.showSql>