Skip to content
Snippets Groups Projects
Commit 07bd1350 authored by Griefed's avatar Griefed :joystick:
Browse files

Merge branch 'main' into 'renovate-org.apache.logging.log4j-log4j-web-2.x' 

# Conflicts:
#   build.gradle
parents a40a85bb 5150e55c
No related branches found
No related tags found
1 merge request!105Update dependency org.apache.logging.log4j:log4j-web to v2.17.2
This commit is part of merge request !105. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
.github/workflows/test.yml
+ 2
− 2
View file @ 07bd1350
......@@ -26,14 +26,14 @@ jobs:
run: ./gradlew about installQuasar cleanFrontend assembleFrontend copyDist build --info
- name: List files in libs
run: ls -ahl build/libs
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: build-artifacts-gradle
path: |
build/libs/
!build/libs/libraries/
if-no-files-found: warn # 'warn' or 'ignore' are also available, defaults to `warn`
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
if: failure()
with:
name: gradle-report
......
build.gradle
+ 2
− 2
View file @ 07bd1350
......@@ -80,10 +80,10 @@ dependencies {
embed 'org.apache.logging.log4j:log4j-api:2.17.1'
embed 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1'
embed 'org.apache.logging.log4j:log4j-core:2.17.1'
embed 'org.apache.logging.log4j:log4j-core:2.17.2'
embed 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1'
embed 'org.apache.logging.log4j:log4j-web:2.17.2'
embed 'org.apache.logging.log4j:log4j-jul:2.17.1'
embed 'org.apache.logging.log4j:log4j-jul:2.17.2'
// Dev tools
developmentOnly 'org.springframework.boot:spring-boot-devtools:2.6.4'
......
frontend/package-lock.json
+ 21
− 21
View file @ 07bd1350
......@@ -9,10 +9,10 @@
"version": "0.0.1",
"dependencies": {
"@quasar/extras": "1.12.5",
"axios": "0.26.0",
"axios": "0.26.1",
"core-js": "3.21.1",
"quasar": "2.5.5",
"tsparticles": "1.41.5"
"tsparticles": "1.42.4"
},
"devDependencies": {
"@babel/eslint-parser": "7.17.0",
......@@ -20,7 +20,7 @@
"electron": "17.1.0",
"electron-packager": "15.4.0",
"eslint": "8.10.0",
"eslint-config-prettier": "8.4.0",
"eslint-config-prettier": "8.5.0",
"eslint-plugin-vue": "8.5.0",
"eslint-webpack-plugin": "3.1.1"
},
......@@ -3080,9 +3080,9 @@
}
},
"node_modules/axios": {
"version": "0.26.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.26.0.tgz",
"integrity": "sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==",
"version": "0.26.1",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
"integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
"dependencies": {
"follow-redirects": "^1.14.8"
}
......@@ -5386,9 +5386,9 @@
}
},
"node_modules/eslint-config-prettier": {
"version": "8.4.0",
"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.4.0.tgz",
"integrity": "sha512-CFotdUcMY18nGRo5KGsnNxpznzhkopOcOo0InID+sgQssPrzjvsyKZPvOgymTFeHrFuC3Tzdf2YndhXtULK9Iw==",
"version": "8.5.0",
"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
"integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
"dev": true,
"bin": {
"eslint-config-prettier": "bin/cli.js"
......@@ -11925,9 +11925,9 @@
"dev": true
},
"node_modules/tsparticles": {
"version": "1.41.5",
"resolved": "https://registry.npmjs.org/tsparticles/-/tsparticles-1.41.5.tgz",
"integrity": "sha512-USK4VZsr5HxiSyCvMuC6F7+SwOrM0zJDkPNlZXLBnf++d8xJ6P+jafEKr89JVUeYCWuDyAfS2GtYaXgOC1+bOA==",
"version": "1.42.4",
"resolved": "https://registry.npmjs.org/tsparticles/-/tsparticles-1.42.4.tgz",
"integrity": "sha512-tfjh6hZFID+5mIdqIvAvmpGymG5kFIxB2k1fs0SIDemo7iL9qnQyvI3HankxfRtCblcwRoEYj/g5phdIhqY8vA==",
"funding": [
{
"type": "github",
......@@ -15360,9 +15360,9 @@
}
},
"axios": {
"version": "0.26.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.26.0.tgz",
"integrity": "sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==",
"version": "0.26.1",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
"integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
"requires": {
"follow-redirects": "^1.14.8"
}
......@@ -17258,9 +17258,9 @@
}
},
"eslint-config-prettier": {
"version": "8.4.0",
"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.4.0.tgz",
"integrity": "sha512-CFotdUcMY18nGRo5KGsnNxpznzhkopOcOo0InID+sgQssPrzjvsyKZPvOgymTFeHrFuC3Tzdf2YndhXtULK9Iw==",
"version": "8.5.0",
"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
"integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
"dev": true,
"requires": {}
},
......@@ -21986,9 +21986,9 @@
"dev": true
},
"tsparticles": {
"version": "1.41.5",
"resolved": "https://registry.npmjs.org/tsparticles/-/tsparticles-1.41.5.tgz",
"integrity": "sha512-USK4VZsr5HxiSyCvMuC6F7+SwOrM0zJDkPNlZXLBnf++d8xJ6P+jafEKr89JVUeYCWuDyAfS2GtYaXgOC1+bOA=="
"version": "1.42.4",
"resolved": "https://registry.npmjs.org/tsparticles/-/tsparticles-1.42.4.tgz",
"integrity": "sha512-tfjh6hZFID+5mIdqIvAvmpGymG5kFIxB2k1fs0SIDemo7iL9qnQyvI3HankxfRtCblcwRoEYj/g5phdIhqY8vA=="
},
"tunnel": {
"version": "0.0.6",
......
frontend/package.json
+ 3
− 3
View file @ 07bd1350
......@@ -27,10 +27,10 @@
},
"dependencies": {
"@quasar/extras": "1.12.5",
"axios": "0.26.0",
"axios": "0.26.1",
"quasar": "2.5.5",
"core-js": "3.21.1",
"tsparticles": "1.41.5"
"tsparticles": "1.42.4"
},
"devDependencies": {
"@babel/eslint-parser": "7.17.0",
......@@ -38,7 +38,7 @@
"@quasar/app": "3.3.3",
"electron-packager": "15.4.0",
"eslint": "8.10.0",
"eslint-config-prettier": "8.4.0",
"eslint-config-prettier": "8.5.0",
"eslint-plugin-vue": "8.5.0",
"eslint-webpack-plugin": "3.1.1"
},
......
gradle/wrapper/gradle-wrapper.properties
+ 1
− 1
View file @ 07bd1350
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Me haz all ze repositoriiiiiiiiiiiiiiiiiies