Merge branch 'main' of https://git.griefed.de/prosper/docker-template-repo

# Conflicts:
#	build.gradle

build.gradle

@@ -16,7 +16,7 @@ plugins {
     id 'edu.sc.seis.launch4j' version '2.5.1'
     id 'org.siouan.frontend-jdk8' version '6.0.0'
 
-    id 'org.springframework.boot' version '2.6.1'
+    id 'org.springframework.boot' version '2.6.2'
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 }
 
@@ -89,10 +89,17 @@ dependencies {
 
     // WEB
     //embed 'org.springframework.boot:spring-boot-starter-security:2.5.6'
+<<<<<<< HEAD
     //embed 'org.springframework.boot:spring-boot-starter-validation:2.6.1'
     embed 'org.springframework.boot:spring-boot-starter-web:2.6.1'
     embed 'org.springframework.boot:spring-boot-starter-log4j2:2.6.1'
     embed 'org.springframework.boot:spring-boot-starter-quartz:2.6.1'
+=======
+    //embed 'org.springframework.boot:spring-boot-starter-validation:2.5.6'
+    embed 'org.springframework.boot:spring-boot-starter-web:2.6.2'
+    embed 'org.springframework.boot:spring-boot-starter-log4j2:2.6.2'
+    embed 'org.springframework.boot:spring-boot-starter-quartz:2.6.2'
+>>>>>>> 10c80b19948733d97095adf36c06f8b1d8d68383
     //embed 'org.springframework.boot:spring-boot-starter-data-jpa:2.6.1'
     //embed 'org.springframework.boot:spring-boot-starter-artemis:2.6.1'
     //embed 'org.apache.activemq:artemis-jms-server:2.19.0'
@@ -105,12 +112,12 @@ dependencies {
     embed 'org.apache.logging.log4j:log4j-jul:2.17.0'
 
     // Dev tools
-    developmentOnly 'org.springframework.boot:spring-boot-devtools:2.6.1'
+    developmentOnly 'org.springframework.boot:spring-boot-devtools:2.6.2'
 
     // Testing
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
-    testImplementation 'org.springframework.boot:spring-boot-starter-test:2.6.1'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test:2.6.2'
     testImplementation 'org.junit.platform:junit-platform-commons:1.8.2'
 }