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

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

# Conflicts:
#   build.gradle
parents faf6948f fc541cce
No related branches found
No related tags found
1 merge request!140Update dependency org.apache.logging.log4j:log4j-slf4j-impl to v2.18.0
......@@ -48,7 +48,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Setup Node.js environment
uses: actions/setup-node@v3.1.1
uses: actions/setup-node@v3.3.0
with:
# Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0
node-version: '>= 16.13.1'
......@@ -126,7 +126,7 @@ jobs:
# 2. ubuntu-latest
# 3. windows-latest
- name: Setup Node.js environment
uses: actions/setup-node@v3.1.1
uses: actions/setup-node@v3.3.0
with:
# Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0
node-version: '>= 16.9.1'
......
......@@ -78,10 +78,10 @@ dependencies {
//embed 'org.apache.activemq:artemis-jms-server:2.19.0'
embed 'org.apache.logging.log4j:log4j-slf4j-impl:2.18.0'
embed 'org.apache.logging.log4j:log4j-api:2.17.2'
embed 'org.apache.logging.log4j:log4j-api:2.18.0'
embed 'org.apache.logging.log4j:log4j-core:2.17.2'
embed 'org.apache.logging.log4j:log4j-web:2.17.2'
embed 'org.apache.logging.log4j:log4j-jul:2.17.2'
embed 'org.apache.logging.log4j:log4j-jul:2.18.0'
// Dev tools
developmentOnly 'org.springframework.boot:spring-boot-devtools:2.6.7'
......
This diff is collapsed.
......@@ -26,21 +26,21 @@
"test": "echo \"No test specified\" && exit 0"
},
"dependencies": {
"@quasar/extras": "1.13.6",
"@quasar/extras": "1.14.2",
"axios": "0.27.2",
"quasar": "2.6.6",
"core-js": "3.22.8",
"core-js": "3.23.3",
"tsparticles": "2.0.6"
},
"devDependencies": {
"@babel/eslint-parser": "7.17.0",
"@babel/eslint-parser": "7.18.2",
"electron": "18.2.0",
"@quasar/app": "3.3.3",
"electron-packager": "15.5.1",
"eslint": "8.14.0",
"eslint": "8.19.0",
"eslint-config-prettier": "8.5.0",
"eslint-plugin-vue": "8.7.1",
"eslint-webpack-plugin": "3.1.1"
"eslint-webpack-plugin": "3.2.0"
},
"browserslist": [
"last 10 Chrome versions",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment