Merge branch 'main' into 'renovate/spring-boot'

# Conflicts:
#   build.gradle

Dockerfile.quasar

-FROM node:16.12.0-alpine3.13 AS builder
+FROM node:16.13.1-alpine3.13 AS builder
 
 RUN \
   apk add \
@@ -13,7 +13,7 @@ RUN \
   npm install && \
   quasar build
 
-FROM lsiobase/nginx:3.14
+FROM lsiobase/nginx:3.15
 
 LABEL maintainer="Griefed <griefed@griefed.de>"
 LABEL description="DESCRIPTION"

Dockerfile.quasar.develop

-FROM node:16.12.0-alpine3.13 AS builder
+FROM node:16.13.1-alpine3.13 AS builder
 
 RUN \
   apk add \
@@ -14,7 +14,7 @@ RUN \
   npm install && \
   quasar build
 
-FROM lsiobase/nginx:3.14
+FROM lsiobase/nginx:3.15
 
 LABEL maintainer="Griefed <griefed@griefed.de>"
 LABEL description="DESCRIPTION"

build.gradle

@@ -86,7 +86,7 @@ dependencies {
     //embed 'org.springframework.boot:spring-boot-starter-data-jpa:2.6.1'
     //embed 'org.springframework.boot:spring-boot-starter-artemis:2.5.6'
     //embed 'org.apache.activemq:artemis-jms-server:2.19.0'
-    embed 'org.apache.logging.log4j:log4j-web:2.14.1'
+    embed 'org.apache.logging.log4j:log4j-web:2.15.0'
 
     // Dev tools
     developmentOnly 'org.springframework.boot:spring-boot-devtools:2.6.1'
@@ -95,7 +95,7 @@ dependencies {
     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.junit.platform:junit-platform-commons:1.8.1'
+    testImplementation 'org.junit.platform:junit-platform-commons:1.8.2'
 }
 
 test {

frontend/package.json

@@ -25,10 +25,10 @@
     "test": "echo \"No test specified\" && exit 0"
   },
   "dependencies": {
-    "@quasar/extras": "1.12.1",
+    "@quasar/extras": "1.12.2",
     "axios": "0.24.0",
-    "core-js": "3.19.1",
-    "quasar": "2.3.3",
+    "quasar": "2.3.4",
+    "core-js": "3.19.3",
     "tsparticles": "1.37.5"
   },
   "devDependencies": {
@@ -36,9 +36,9 @@
     "@babel/eslint-parser": "7.16.3",
     "@quasar/app": "3.2.5",
     "electron-packager": "15.4.0",
-    "eslint": "8.2.0",
+    "eslint": "8.4.1",
     "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-vue": "8.1.1",
+    "eslint-plugin-vue": "8.2.0",
     "eslint-webpack-plugin": "3.1.1"
   },
   "browserslist": [

gradle/wrapper/gradle-wrapper.properties

 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists