5
0
mirror of https://github.com/AJMicke/KickerELO.git synced 2026-03-12 05:51:05 +01:00

Merge remote-tracking branch 'origin/master' into sso

I hate large merges!
This commit is contained in:
2025-05-31 18:47:38 +02:00
32 changed files with 639 additions and 211 deletions

11
pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.4.4</version>
<version>3.5.0</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -19,7 +19,7 @@
<maven.compiler.source>23</maven.compiler.source>
<maven.compiler.target>23</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vaadin.version>24.7.1</vaadin.version>
<vaadin.version>24.7.5</vaadin.version>
<spring.profiles.active>test</spring.profiles.active>
</properties>
@@ -46,11 +46,6 @@
<groupId>com.vaadin</groupId>
<artifactId>vaadin-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.github.appreciated</groupId>
<artifactId>apexcharts</artifactId>
<version>24.0.2</version>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
@@ -151,4 +146,4 @@
</profile>
</profiles>
</project>
</project>