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

Merge branch 'main' into 'renovate-tsparticles-1.x' 

# Conflicts:
#   frontend/package.json
parents 389d0b20 0d554b93
No related branches found
No related tags found
1 merge request!60Update dependency tsparticles to v1.39.0
Hide whitespace changes
Inline Side-by-side
build.gradle
+ 6
− 6
View file @ b0af6c36
...@@ -16,7 +16,7 @@ plugins { ...@@ -16,7 +16,7 @@ plugins {
id 'edu.sc.seis.launch4j' version '2.5.1' id 'edu.sc.seis.launch4j' version '2.5.1'
id 'org.siouan.frontend-jdk8' version '6.0.0' id 'org.siouan.frontend-jdk8' version '6.0.0'
id 'org.springframework.boot' version '2.6.2' id 'org.springframework.boot' version '2.6.3'
id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'io.spring.dependency-management' version '1.0.11.RELEASE'
} }
...@@ -90,9 +90,9 @@ dependencies { ...@@ -90,9 +90,9 @@ dependencies {
// WEB // WEB
//embed 'org.springframework.boot:spring-boot-starter-security:2.5.6' //embed 'org.springframework.boot:spring-boot-starter-security:2.5.6'
//embed 'org.springframework.boot:spring-boot-starter-validation:2.6.2' //embed 'org.springframework.boot:spring-boot-starter-validation:2.6.2'
embed 'org.springframework.boot:spring-boot-starter-web:2.6.2' embed 'org.springframework.boot:spring-boot-starter-web:2.6.3'
embed 'org.springframework.boot:spring-boot-starter-log4j2:2.6.2' embed 'org.springframework.boot:spring-boot-starter-log4j2:2.6.3'
embed 'org.springframework.boot:spring-boot-starter-quartz:2.6.2' embed 'org.springframework.boot:spring-boot-starter-quartz:2.6.3'
//embed 'org.springframework.boot:spring-boot-starter-data-jpa:2.6.2' //embed 'org.springframework.boot:spring-boot-starter-data-jpa:2.6.2'
//embed 'org.springframework.boot:spring-boot-starter-artemis:2.6.2' //embed 'org.springframework.boot:spring-boot-starter-artemis:2.6.2'
//embed 'org.apache.activemq:artemis-jms-server:2.19.0' //embed 'org.apache.activemq:artemis-jms-server:2.19.0'
...@@ -106,12 +106,12 @@ dependencies { ...@@ -106,12 +106,12 @@ dependencies {
embed 'org.apache.logging.log4j:log4j-jul:2.17.1' embed 'org.apache.logging.log4j:log4j-jul:2.17.1'
// Dev tools // Dev tools
developmentOnly 'org.springframework.boot:spring-boot-devtools:2.6.2' developmentOnly 'org.springframework.boot:spring-boot-devtools:2.6.3'
// Testing // Testing
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
testImplementation 'org.springframework.boot:spring-boot-starter-test:2.6.2' testImplementation 'org.springframework.boot:spring-boot-starter-test:2.6.3'
testImplementation 'org.junit.platform:junit-platform-commons:1.8.2' testImplementation 'org.junit.platform:junit-platform-commons:1.8.2'
} }
......
frontend/package-lock.json
+ 34
− 85
View file @ b0af6c36
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"dependencies": { "dependencies": {
"@quasar/extras": "1.12.4", "@quasar/extras": "1.12.4",
"axios": "0.24.0", "axios": "0.24.0",
"core-js": "3.20.2", "core-js": "3.20.3",
"quasar": "2.4.9", "quasar": "2.4.9",
"tsparticles": "1.39.0" "tsparticles": "1.39.0"
}, },
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
"@quasar/app": "3.2.9", "@quasar/app": "3.2.9",
"electron": "16.0.7", "electron": "16.0.7",
"electron-packager": "15.4.0", "electron-packager": "15.4.0",
"eslint": "8.6.0", "eslint": "8.7.0",
"eslint-config-prettier": "8.3.0", "eslint-config-prettier": "8.3.0",
"eslint-plugin-vue": "8.3.0", "eslint-plugin-vue": "8.3.0",
"eslint-webpack-plugin": "3.1.1" "eslint-webpack-plugin": "3.1.1"
...@@ -2834,15 +2834,6 @@ ...@@ -2834,15 +2834,6 @@
"integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
"dev": true "dev": true
}, },
"node_modules/ansi-colors": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
"dev": true,
"engines": {
"node": ">=6"
}
},
"node_modules/ansi-escapes": { "node_modules/ansi-escapes": {
"version": "4.3.2", "version": "4.3.2",
"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
...@@ -4169,9 +4160,9 @@ ...@@ -4169,9 +4160,9 @@
} }
}, },
"node_modules/core-js": { "node_modules/core-js": {
"version": "3.20.2", "version": "3.20.3",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.2.tgz", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz",
"integrity": "sha512-nuqhq11DcOAbFBV4zCbKeGbKQsUDRqTX0oqx7AttUBuqe3h20ixsE039QHelbL6P4h+9kytVqyEtyZ6gsiwEYw==", "integrity": "sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag==",
"hasInstallScript": true, "hasInstallScript": true,
"funding": { "funding": {
"type": "opencollective", "type": "opencollective",
...@@ -5243,18 +5234,6 @@ ...@@ -5243,18 +5234,6 @@
"node": ">=10.13.0" "node": ">=10.13.0"
} }
}, },
"node_modules/enquirer": {
"version": "2.3.6",
"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
"dev": true,
"dependencies": {
"ansi-colors": "^4.1.1"
},
"engines": {
"node": ">=8.6"
}
},
"node_modules/entities": { "node_modules/entities": {
"version": "2.2.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
...@@ -5341,9 +5320,9 @@ ...@@ -5341,9 +5320,9 @@
} }
}, },
"node_modules/eslint": { "node_modules/eslint": {
"version": "8.6.0", "version": "8.7.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.6.0.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.7.0.tgz",
"integrity": "sha512-UvxdOJ7mXFlw7iuHZA4jmzPaUqIw54mZrv+XPYKNbKdLR0et4rf60lIZUU9kiNtnzzMzGWxMV+tQ7uG7JG8DPw==", "integrity": "sha512-ifHYzkBGrzS2iDU7KjhCAVMGCvF6M3Xfs8X8b37cgrUlDt6bWRTpRh6T/gtSXv1HJ/BUGgmjvNvOEGu85Iif7w==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@eslint/eslintrc": "^1.0.5", "@eslint/eslintrc": "^1.0.5",
...@@ -5353,11 +5332,10 @@ ...@@ -5353,11 +5332,10 @@
"cross-spawn": "^7.0.2", "cross-spawn": "^7.0.2",
"debug": "^4.3.2", "debug": "^4.3.2",
"doctrine": "^3.0.0", "doctrine": "^3.0.0",
"enquirer": "^2.3.5",
"escape-string-regexp": "^4.0.0", "escape-string-regexp": "^4.0.0",
"eslint-scope": "^7.1.0", "eslint-scope": "^7.1.0",
"eslint-utils": "^3.0.0", "eslint-utils": "^3.0.0",
"eslint-visitor-keys": "^3.1.0", "eslint-visitor-keys": "^3.2.0",
"espree": "^9.3.0", "espree": "^9.3.0",
"esquery": "^1.4.0", "esquery": "^1.4.0",
"esutils": "^2.0.2", "esutils": "^2.0.2",
...@@ -5366,7 +5344,7 @@ ...@@ -5366,7 +5344,7 @@
"functional-red-black-tree": "^1.0.1", "functional-red-black-tree": "^1.0.1",
"glob-parent": "^6.0.1", "glob-parent": "^6.0.1",
"globals": "^13.6.0", "globals": "^13.6.0",
"ignore": "^4.0.6", "ignore": "^5.2.0",
"import-fresh": "^3.0.0", "import-fresh": "^3.0.0",
"imurmurhash": "^0.1.4", "imurmurhash": "^0.1.4",
"is-glob": "^4.0.0", "is-glob": "^4.0.0",
...@@ -5377,9 +5355,7 @@ ...@@ -5377,9 +5355,7 @@
"minimatch": "^3.0.4", "minimatch": "^3.0.4",
"natural-compare": "^1.4.0", "natural-compare": "^1.4.0",
"optionator": "^0.9.1", "optionator": "^0.9.1",
"progress": "^2.0.0",
"regexpp": "^3.2.0", "regexpp": "^3.2.0",
"semver": "^7.2.1",
"strip-ansi": "^6.0.1", "strip-ansi": "^6.0.1",
"strip-json-comments": "^3.1.0", "strip-json-comments": "^3.1.0",
"text-table": "^0.2.0", "text-table": "^0.2.0",
...@@ -5597,9 +5573,9 @@ ...@@ -5597,9 +5573,9 @@
} }
}, },
"node_modules/eslint/node_modules/eslint-visitor-keys": { "node_modules/eslint/node_modules/eslint-visitor-keys": {
"version": "3.1.0", "version": "3.2.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz",
"integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==", "integrity": "sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0" "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
...@@ -5650,19 +5626,13 @@ ...@@ -5650,19 +5626,13 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/eslint/node_modules/semver": { "node_modules/eslint/node_modules/ignore": {
"version": "7.3.5", "version": "5.2.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
"dev": true, "dev": true,
"dependencies": {
"lru-cache": "^6.0.0"
},
"bin": {
"semver": "bin/semver.js"
},
"engines": { "engines": {
"node": ">=10" "node": ">= 4"
} }
}, },
"node_modules/eslint/node_modules/supports-color": { "node_modules/eslint/node_modules/supports-color": {
...@@ -15179,12 +15149,6 @@ ...@@ -15179,12 +15149,6 @@
"integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
"dev": true "dev": true
}, },
"ansi-colors": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
"dev": true
},
"ansi-escapes": { "ansi-escapes": {
"version": "4.3.2", "version": "4.3.2",
"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
...@@ -16216,9 +16180,9 @@ ...@@ -16216,9 +16180,9 @@
} }
}, },
"core-js": { "core-js": {
"version": "3.20.2", "version": "3.20.3",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.2.tgz", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz",
"integrity": "sha512-nuqhq11DcOAbFBV4zCbKeGbKQsUDRqTX0oqx7AttUBuqe3h20ixsE039QHelbL6P4h+9kytVqyEtyZ6gsiwEYw==" "integrity": "sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag=="
}, },
"core-js-compat": { "core-js-compat": {
"version": "3.19.2", "version": "3.19.2",
...@@ -17017,15 +16981,6 @@ ...@@ -17017,15 +16981,6 @@
"tapable": "^2.2.0" "tapable": "^2.2.0"
} }
}, },
"enquirer": {
"version": "2.3.6",
"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
"dev": true,
"requires": {
"ansi-colors": "^4.1.1"
}
},
"entities": { "entities": {
"version": "2.2.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
...@@ -17097,9 +17052,9 @@ ...@@ -17097,9 +17052,9 @@
"dev": true "dev": true
}, },
"eslint": { "eslint": {
"version": "8.6.0", "version": "8.7.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.6.0.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.7.0.tgz",
"integrity": "sha512-UvxdOJ7mXFlw7iuHZA4jmzPaUqIw54mZrv+XPYKNbKdLR0et4rf60lIZUU9kiNtnzzMzGWxMV+tQ7uG7JG8DPw==", "integrity": "sha512-ifHYzkBGrzS2iDU7KjhCAVMGCvF6M3Xfs8X8b37cgrUlDt6bWRTpRh6T/gtSXv1HJ/BUGgmjvNvOEGu85Iif7w==",
"dev": true, "dev": true,
"requires": { "requires": {
"@eslint/eslintrc": "^1.0.5", "@eslint/eslintrc": "^1.0.5",
...@@ -17109,11 +17064,10 @@ ...@@ -17109,11 +17064,10 @@
"cross-spawn": "^7.0.2", "cross-spawn": "^7.0.2",
"debug": "^4.3.2", "debug": "^4.3.2",
"doctrine": "^3.0.0", "doctrine": "^3.0.0",
"enquirer": "^2.3.5",
"escape-string-regexp": "^4.0.0", "escape-string-regexp": "^4.0.0",
"eslint-scope": "^7.1.0", "eslint-scope": "^7.1.0",
"eslint-utils": "^3.0.0", "eslint-utils": "^3.0.0",
"eslint-visitor-keys": "^3.1.0", "eslint-visitor-keys": "^3.2.0",
"espree": "^9.3.0", "espree": "^9.3.0",
"esquery": "^1.4.0", "esquery": "^1.4.0",
"esutils": "^2.0.2", "esutils": "^2.0.2",
...@@ -17122,7 +17076,7 @@ ...@@ -17122,7 +17076,7 @@
"functional-red-black-tree": "^1.0.1", "functional-red-black-tree": "^1.0.1",
"glob-parent": "^6.0.1", "glob-parent": "^6.0.1",
"globals": "^13.6.0", "globals": "^13.6.0",
"ignore": "^4.0.6", "ignore": "^5.2.0",
"import-fresh": "^3.0.0", "import-fresh": "^3.0.0",
"imurmurhash": "^0.1.4", "imurmurhash": "^0.1.4",
"is-glob": "^4.0.0", "is-glob": "^4.0.0",
...@@ -17133,9 +17087,7 @@ ...@@ -17133,9 +17087,7 @@
"minimatch": "^3.0.4", "minimatch": "^3.0.4",
"natural-compare": "^1.4.0", "natural-compare": "^1.4.0",
"optionator": "^0.9.1", "optionator": "^0.9.1",
"progress": "^2.0.0",
"regexpp": "^3.2.0", "regexpp": "^3.2.0",
"semver": "^7.2.1",
"strip-ansi": "^6.0.1", "strip-ansi": "^6.0.1",
"strip-json-comments": "^3.1.0", "strip-json-comments": "^3.1.0",
"text-table": "^0.2.0", "text-table": "^0.2.0",
...@@ -17193,9 +17145,9 @@ ...@@ -17193,9 +17145,9 @@
} }
}, },
"eslint-visitor-keys": { "eslint-visitor-keys": {
"version": "3.1.0", "version": "3.2.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz",
"integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==", "integrity": "sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==",
"dev": true "dev": true
}, },
"estraverse": { "estraverse": {
...@@ -17228,14 +17180,11 @@ ...@@ -17228,14 +17180,11 @@
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true "dev": true
}, },
"semver": { "ignore": {
"version": "7.3.5", "version": "5.2.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
"dev": true, "dev": true
"requires": {
"lru-cache": "^6.0.0"
}
}, },
"supports-color": { "supports-color": {
"version": "7.2.0", "version": "7.2.0",
......
frontend/package.json
+ 3
− 3
View file @ b0af6c36
...@@ -29,15 +29,15 @@ ...@@ -29,15 +29,15 @@
"@quasar/extras": "1.12.4", "@quasar/extras": "1.12.4",
"axios": "0.24.0", "axios": "0.24.0",
"quasar": "2.4.9", "quasar": "2.4.9",
"core-js": "3.20.2", "tsparticles": "1.39.0",
"tsparticles": "1.39.0" "core-js": "3.20.3"
}, },
"devDependencies": { "devDependencies": {
"@babel/eslint-parser": "7.16.5", "@babel/eslint-parser": "7.16.5",
"electron": "16.0.7", "electron": "16.0.7",
"@quasar/app": "3.2.9", "@quasar/app": "3.2.9",
"electron-packager": "15.4.0", "electron-packager": "15.4.0",
"eslint": "8.6.0", "eslint": "8.7.0",
"eslint-config-prettier": "8.3.0", "eslint-config-prettier": "8.3.0",
"eslint-plugin-vue": "8.3.0", "eslint-plugin-vue": "8.3.0",
"eslint-webpack-plugin": "3.1.1" "eslint-webpack-plugin": "3.1.1"
......
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